fix pyinstaller use zip

Author: haverland

.github/workflows/release.yml

@@ -13,20 +13,28 @@ jobs:
         include:
           - os: ubuntu-latest
             BUILD_CMD: pyinstaller collectmeterdigits.spec
-            OUT_FILE_NAME: collectmeterdigits
-            ASSET_MIME: application/octet-stream
+            POST_BUILD_CMD: >
+              cd dist/ &&
+              ls -Rls &&
+              zip -r9 collectmeterdigits-linux.zip collectmeterdigits
+            OUT_FILE_NAME: collectmeterdigits-linux.zip
+            ASSET_MIME: application/zip
           - os: macos-latest
             BUILD_CMD: pyinstaller collectmeterdigits.spec
             POST_BUILD_CMD: >
               cd dist/ &&
               ls -Rls &&
-              zip -r9 collectmeterdigits collectmeterdigits
-            OUT_FILE_NAME: collectmeterdigits.zip
+              zip -r9 collectmeterdigits-macos.zip collectmeterdigits
+            OUT_FILE_NAME: collectmeterdigits-macos.zip
             ASSET_MIME: application/zip
           - os: windows-latest
             BUILD_CMD: pyinstaller collectmeterdigits.spec
-            OUT_FILE_NAME: collectmeterdigits.exe
-            ASSET_MIME: application/vnd.microsoft.portable-executable
+            POST_BUILD_CMD: >
+              cd dist/ &&
+              ls -Rls &&
+              zip -r9 collectmeterdigits-windows.zip collectmeterdigits
+            OUT_FILE_NAME: collectmeterdigits-windows.zip
+            ASSET_MIME: application/zip
     steps:
       - uses: actions/checkout@v3
       - name: Setup Python

.gitignore

@@ -7,4 +7,5 @@ data/
 .DS_Store
 build/
 __pychache__/
-.idea
+.idea
+dist/

collectmeterdigits.spec

@@ -5,8 +5,8 @@ block_cipher = None
 
 
 a = Analysis(
-    ['collectmeterdigits/__main__.py'],
-    pathex=[],
+    ['collectmeterdigits/__main__.py','collectmeterdigits/glob.py','collectmeterdigits/hash_manual.py','collectmeterdigits/labeling.py','collectmeterdigits/predict.py', ],
+    pathex=['collectmeterdigits/'],
     binaries=[],
     datas=[('collectmeterdigits/models/*.tflite', 'collectmeterdigits/models')],
     hiddenimports=['requests'],

collectmeterdigits/collect.py

@@ -68,14 +68,33 @@ def readimages(servername, output_dir, daysback=15):
                     while countrepeat > 0:
                         if (not os.path.exists(path + "/" + prefix + filename)):
                             try:
-                                img = Image.open(requests.get(serverurl+url, stream=True).raw)
-                                img.save(path + "/" + prefix + filename)
+                                print(serverurl + url)
+                                image = requests.get(serverurl + url, stream=True)
                                 count = count + 1
                                 countrepeat = 0
                             except ConnectionError as h:
-                                print( path + "/" + prefix + filename + " could not be loaded - Retry in 10 s ... " + str(countrepeat))
+                                print(
+                                    path + "/" + prefix + filename + " could not be loaded - Retry in 10 s ... " + str(
+                                        countrepeat))
+                                time.sleep(10)
+                                countrepeat = countrepeat - 1
+                                continue
+                            except TimeoutError as h:
+                                print(
+                                    path + "/" + prefix + filename + " could not be loaded - Retry in 10 s ... " + str(
+                                        countrepeat))
                                 time.sleep(10)
                                 countrepeat = countrepeat - 1
+                                continue
+
+                            try:
+                                img = Image.open(image.raw)
+                                img.save(path + "/" + prefix + filename)
+                            except Exception as e:
+                                print(path + "/" + prefix + filename + " could not be opened as an image: %r!" % e)
+
+                            count = count + 1
+                            countrepeat = 0
     print(f"{count} images are loaded from meter: {servername}")
 
 def save_hash_file(images, hashfilename):

collectmeterdigits/labeling.py

@@ -36,7 +36,12 @@ def label(path, startlabel=0, imageurlsfile=None):
 
     if (imageurlsfile!=None):
         files = pd.read_csv(imageurlsfile, index_col=0).to_numpy().reshape(-1)
-    else: 
+
+        # remove files not exists
+        for file in files:
+            if (not os.path.exists(file)):
+              files = files[~np.isin(files, file)]
+    else:
         files = ziffer_data_files(path)
 
     if (len(files)==0):

collectmeterdigits/models/dig-class100-s2_20220905-213051_q.tflite

@@ -0,0 +1,5 @@
+from collectmeterdigits.__main__ import main
+
+
+main()
+