Minor modifications

VERSIONS.LST

@@ -1,2 +1,2 @@
 # ver|url|checksum, and | as separator, one version per ||
-3.0.0|https://neoxgroup.eu/ftpaccess/Applicatifs/CNIRevelator/CNIRevelator_2.2.5|1234||
+3.0.0|https://neoxgroup.eu/ftpaccess/Applicatifs/CNIRevelator/CNIRevelator_2.2.5|1234||3.0.0|https://neoxgroup.eu/ftpaccess/Applicatifs/CNIRevelator/CNIRevelator_2.2.5|1234||

make.bat

@@ -1,18 +1,10 @@
 @echo off
-title Compilation de CNIRLauncher
-
-call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\users\adrie\Anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNILauncher src\launcher\CNIRLauncher.py 
-
 title Compilation de CNIRevelator
 
-call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\users\adrie\Anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\analyzer\CNI_Revelator.py 
+call pyinstaller -w -D --exclude-module PyQt5 --bootloader-ignore-signals --add-data "C:\users\adrie\Anaconda3\Lib\site-packages\tld\res\effective_tld_names.dat.txt";"tld\res" --add-data "id-card.ico";"id-card.ico" -i "id-card.ico" -n CNIRevelator src\CNIRevelator.py 
 
 copy LICENSE dist\CNIRevelator\
 copy id-card.ico dist\CNIRevelator\
 
-robocopy dist\CNILauncher dist\CNIRevelator /E /MOVE
-
-rmdir dist\CNILauncher /Q /S
-
 pause
 

src/CNIRevelator.py

@@ -39,7 +39,7 @@ logfile = logger.logCur
 launcherWindow = ihm.launcherWindowCur
 
 ## MAIN FUNCTION OF CNIREVELATOR
-def main(logger):
+def main():
     
     import CNI_pytesseract as pytesseract
     try:

src/launcher.py

@@ -25,7 +25,6 @@
 
 import sys
 import os
-import subprocess
 import threading
 import traceback
 

src/updater.py

@@ -24,10 +24,13 @@
 """
 
 from win32com.client import Dispatch
+import subprocess
 import traceback
 import sys
 import time
 import os
+import shutil
+import zipfile
 
 import logger       # logger.py
 import globs        # globs.py
@@ -125,11 +128,28 @@ def batch():
     getTheUpdate = downloader.newdownload(credentials, finalurl, globs.CNIRFolder + '\\..\\CNIPackage.zip').download()
 
     # And now unzip and launch
+    zip_ref = zipfile.ZipFile(globs.CNIRFolder + '\\..\\CNIPackage.zip', 'r')
+    zip_ref.extractall(globs.CNIRFolder + '\\..\\CNIRevelator' + str(globs.verstring_full))
+    zip_ref.close()
+    
+    args = [globs.CNIRFolder + '\\..\\CNIRevelator' + str(globs.verstring_full) + '\\CNIRevelator.exe', globs.CNIRFolder]
+    subprocess.run(args) 
 
     return True
 
 ## Main Function
 def umain():
+    
+    if len(sys.argv) > 1:
+        logfile.printdbg("Old install detected : {}".format(sys.argv[1]))
+        while os.path.exists(str(sys.argv[1])):
+            try:
+                shutil.rmtree(str(sys.argv[1]), ignore_errors=True)
+            except:
+                pass
+                logfile.printdbg("Fail to delete old install !")
+            
+    
     try:
         # Global Handlers
         logfile = logger.logCur