Cleanup and new version number

This commit is contained in:
2020-04-12 08:35:39 +02:00
parent 86aed08870
commit 5099f255d6
4 changed files with 12 additions and 7 deletions

View File

@@ -19,6 +19,7 @@ plcslave = 0
aclfile = /etc/revpipyload/aclplcslave.conf
bindip = *
port = 55234
watchdog = 1
[XMLRPC]
xmlrpc = 0

View File

@@ -28,7 +28,7 @@ begrenzt werden!
__author__ = "Sven Sager"
__copyright__ = "Copyright (C) 2018 Sven Sager"
__license__ = "GPLv3"
__version__ = "0.8.2"
__version__ = "0.8.5"
import gzip
import logsystem
import picontrolserver
@@ -50,7 +50,7 @@ from time import asctime
from xmlrpc.client import Binary
from xrpcserver import SaveXMLRPCServer
min_revpimodio = "2.4.1"
min_revpimodio = "2.4.5"
class RevPiPyLoad():
@@ -619,7 +619,7 @@ class RevPiPyLoad():
return False
self.pictorymtime = mtime
# TODO: Nur "Devices" list vergleich da HASH immer neu wegen timestmap
# TODO: Nur "Devices" list vergleich da HASH immer neu wegen timestamp
with open(proginit.pargs.configrsc, "rb") as fh:
file_hash = md5(fh.read()).digest()
@@ -690,6 +690,8 @@ class RevPiPyLoad():
wd = os.walk("./")
try:
for tup_dir in wd:
if tup_dir[0].find("__pycache__") != -1:
continue
for file in tup_dir[2]:
arcname = os.path.join(
os.path.basename(self.plcworkdir),
@@ -932,6 +934,8 @@ class RevPiPyLoad():
lst_file = []
wd = os.walk("./")
for tup_dir in wd:
if tup_dir[0].find("__pycache__") != -1:
continue
for file in tup_dir[2]:
lst_file.append(os.path.join(tup_dir[0], file)[2:])
return lst_file
@@ -998,7 +1002,7 @@ class RevPiPyLoad():
"""
proginit.logger.debug("xmlrpc call plcdownload")
# TODO: Daten blockweise übertragen
# TODO: Daten einzeln übertragen
file = self.packapp(mode, pictory)
if os.path.exists(file):

View File

@@ -27,11 +27,11 @@ setup(
license="LGPLv3",
name="revpipyload",
version="0.8.2",
version="0.8.5",
scripts=["data/revpipyload"],
install_requires=["revpimodio2 >= 2.4.1"],
install_requires=["revpimodio2 >= 2.4.5"],
python_requires=">=3.2",
data_files=[

View File

@@ -1,5 +1,5 @@
[DEFAULT]
Debian-Version: 1
Depends3: python3-revpimodio2 (>= 2.4.1)
Depends3: python3-revpimodio2 (>= 2.4.5)
Package: revpipyload
Suite: stable