From 5099f255d6b1613bce65c4776d5f390fbc3d6c6a Mon Sep 17 00:00:00 2001
From: Sven Sager <akira@narux.de>
Date: Sun, 12 Apr 2020 08:35:39 +0200
Subject: [PATCH] Cleanup and new version number

---
 data/etc/revpipyload/revpipyload.conf |  1 +
 revpipyload/revpipyload.py            | 12 ++++++++----
 setup.py                              |  4 ++--
 stdeb.cfg                             |  2 +-
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/data/etc/revpipyload/revpipyload.conf b/data/etc/revpipyload/revpipyload.conf
index 603af70..186cfd0 100644
--- a/data/etc/revpipyload/revpipyload.conf
+++ b/data/etc/revpipyload/revpipyload.conf
@@ -19,6 +19,7 @@ plcslave = 0
 aclfile = /etc/revpipyload/aclplcslave.conf
 bindip = *
 port = 55234
+watchdog = 1
 
 [XMLRPC]
 xmlrpc = 0
diff --git a/revpipyload/revpipyload.py b/revpipyload/revpipyload.py
index c70a4e8..23524bb 100755
--- a/revpipyload/revpipyload.py
+++ b/revpipyload/revpipyload.py
@@ -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):
diff --git a/setup.py b/setup.py
index 50a2878..bb32d59 100644
--- a/setup.py
+++ b/setup.py
@@ -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=[
diff --git a/stdeb.cfg b/stdeb.cfg
index 1cb55bd..ac90a34 100644
--- a/stdeb.cfg
+++ b/stdeb.cfg
@@ -1,5 +1,5 @@
 [DEFAULT]
 Debian-Version: 1
-Depends3: python3-revpimodio2 (>= 2.4.1)
+Depends3: python3-revpimodio2 (>= 2.4.5)
 Package: revpipyload
 Suite: stable