multiselect for single files, refactor, better checks

Author: 0tii

.gitignore

@@ -4,4 +4,5 @@
 backupsheets/
 __pycache__/
 *.xlsx
-*.xls
+*.xls
+*.zip

resources/checks.py

@@ -7,12 +7,12 @@ def checkpath(path):
     if os.path.isfile(path):
         print(messages.isfile)
         return False
-    count, scount = 0, 0
+    count, hcount = 0, 0
     for file in os.listdir(path):
         if file.endswith('.xlsx'): count += 1
-        if file.endswith('xls'): scount +=1
-        #other formats ...
-    if scount > 0: 
+        split = file.rsplit('.', 1)[-1]
+        if  split.startswith('xl') and not split.endswith('x'): hcount +=1
+    if hcount > 0: 
         print(messages.xlshelp)
     if count == 0:
         print(messages.nofiles)
@@ -27,12 +27,21 @@ def checkfile(path):
     if not os.path.isfile(path):
         print(messages.ispath)
         return False
-    if path.endswith('.xls'):
+    split = path.rsplit('.', 1)[-1]
+    if  split.startswith('xl') and not split.endswith('x'):
         print(messages.oneslx)
         return False
-
     if not path.endswith('.xlsx'): 
         print(messages.wrongfile)
         return False
     print(messages.filegood)
     return True
+
+def checkfiles(paths):
+    for path in paths:
+        if not checkfile(path):
+            return False
+    if len(paths) == 0:
+        print(messages.nopath)
+        return False
+    return True

resources/messages.py

@@ -1,15 +1,15 @@
 xlshelp = '''\033[93m
-You have one or more .xls files in the target directory. That file format is not supported!
+You have one or more unsupported excel files in the target directory. Only .xlsx is supported.
 To use these files with this script, please follow these simple steps:
-1. Open the xls file in Excel
+1. Open the xl* file in Excel
 2. Go to file -> Save as...
 3. Save the file as .xlsx\n\033[0m
 '''
 
 oneslx = '''\033[93m
-Your file is of type xls. That file format is not supported!
+Your file is not supported. Only .xlsx is supported.
 To use this file with this script, please follow these simple steps:
-1. Open the xls file in Excel
+1. Open the xl* file in Excel
 2. Go to file -> Save as...
 3. Save the file as .xlsx\n\033[0m
 '''

unblock.py

@@ -1,17 +1,20 @@
 import zipfile, re, os, sys, resources.checks as checks
 from resources.updatezip import UpdateableZipFile as uzip
-from tkinter.filedialog import askopenfilename, askopenfile, askdirectory
+from tkinter.filedialog import askopenfilenames, askdirectory
 from tkinter import Tk
 
-file = not sys.argv.__contains__('--dir')
+files = not sys.argv.__contains__('--dir')
 cli = sys.argv.__contains__('--cli')
-filepath, folderpath = '',''
+filepaths, folderpath = [],''
 
 if not cli: Tk().withdraw()
 
 # input
-if file:
-    filepath = askopenfilename() if not cli else input('Enter the path to the xlsx file. Both explicit and relative are valid.\n')
+if files:
+    if not cli:
+        filepaths = list(askopenfilenames(filetypes = [('excel files', '.xlsx')]))
+    else:
+        filepaths.append(input('Enter the path to the xlsx file. Both explicit and relative are valid.\n'))
 else:
     folderpath = askdirectory() if not cli else input('Enter the path to the target directory. Both explicit and relative are valid.\n')
 
@@ -20,23 +23,22 @@
 
 def processfile(excelfile):
     sheetfiles = {}
-
     # get all target sheet paths
     with zipfile.ZipFile(excelfile) as zip:
         for filename in zip.namelist():
             if filename.startswith('xl/worksheets/sheet') and filename.endswith('.xml'):
                 ofile = zip.open(filename)
                 sheetfiles[filename] = re.sub(strclean, '', ofile.read().decode('utf-8'))
-
     # alter files
     with uzip(excelfile) as file:
         for fname, fcontent in sheetfiles.items():
             file.writestr(fname, fcontent.encode('utf-8'))
 
 # execute
-if file:
-    if checks.checkfile(filepath):
-        processfile(filepath)
+if files:
+    if checks.checkfiles(filepaths):
+        for filepath in filepaths:
+            processfile(filepath)
         print('\033[92mFinished.\033[0m')
 else:
     if checks.checkpath(folderpath):