From 393e9c844d7163d6c5545996d1fb27c057003bb2 Mon Sep 17 00:00:00 2001
From: Ambulance Clerc <ambulance.clerc@outlook.com>
Date: Mon, 6 Jun 2022 13:46:06 +0200
Subject: [PATCH] =?UTF-8?q?Am=C3=A9lioration=20syst=C3=A8me=20auto-update?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 auto_update.py | 42 ++++++++++++++++++++++--------------------
 main.py        |  4 +++-
 version.py     |  2 +-
 3 files changed, 26 insertions(+), 22 deletions(-)

diff --git a/auto_update.py b/auto_update.py
index 3398eba..2b0b8a6 100644
--- a/auto_update.py
+++ b/auto_update.py
@@ -3,30 +3,32 @@ import urllib.request
 import ssl
 import io
 
+class auto_updater:
+    dl_version = 0
 
-def clean(str):
-    str = str.replace('/','')
-    str = str.replace(':', '')
-    str = str.replace('{', '')
-    str = str.replace('(', '')
-    str = str.replace("\\", '')
-    return str
+    def clean(self, str):
+        str = str.replace('/','')
+        str = str.replace(':', '')
+        str = str.replace('{', '')
+        str = str.replace('(', '')
+        str = str.replace("\\", '')
+        return str
 
-def new_update_available():
-    ret = False
-    ctx = ssl.create_default_context()
-    ctx.check_hostname = False
-    ctx.verify_mode = ssl.CERT_NONE
+    def new_update_available(self):
+        ret = False
+        ctx = ssl.create_default_context()
+        ctx.check_hostname = False
+        ctx.verify_mode = ssl.CERT_NONE
 
-    data = urllib.request.urlopen("https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/raw/branch/master/dl_version", context=ctx)
-    dl_version = str(data.read()).replace('b', '').replace("'", "")
+        data = urllib.request.urlopen("https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/raw/branch/master/dl_version", context=ctx)
+        self.dl_version = str(data.read()).replace('b', '').replace("'", "")
 
-    ssl._create_default_https_context = ssl._create_unverified_context
-    if dl_version != VERSION:
-        print(f"Version différente trouvée {dl_version} téléchargement en cours")
-        urllib.request.urlretrieve(url=f"https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/releases/download/{clean(dl_version)}/Clercattrib2Biz_setup.exe", filename="update.exe")
-        ret = True
-    return ret
+        ssl._create_default_https_context = ssl._create_unverified_context
+        if self.dl_version != VERSION:
+            print(f"Version différente trouvée {self.dl_version} téléchargement en cours")
+            urllib.request.urlretrieve(url=f"https://gitea.prod.resk-u.ch/CLERC/AttribWinbiz/releases/download/{self.clean(self.dl_version)}/Clercattrib2Biz_setup.exe", filename="update.exe")
+            ret = True
+        return ret
 
 
 
diff --git a/main.py b/main.py
index 44c6413..c98a88d 100644
--- a/main.py
+++ b/main.py
@@ -252,7 +252,9 @@ class ClercAttrib2Biz():
 
         self.thread = Thread(target=self.start_parsing)
 
-        if new_update_available():
+        auto_update = auto_updater()
+        if auto_update.new_update_available():
+            self.logger.warning(f"Nouvelle version du script disponible. {auto_update.dl_version}")
             if messagebox.askyesno(title="Nouvelle version trouvée", message=f"Une nouvelle version a été trouvée, vous pouvez l'installer dès maintenant !", ):
                 subprocess.call("update.exe")
                 self.fenetre.destroy()
diff --git a/version.py b/version.py
index 0b55b17..467e13f 100644
--- a/version.py
+++ b/version.py
@@ -1 +1 @@
-VERSION = "20220606-1330"
\ No newline at end of file
+VERSION = "20220606-1331"
\ No newline at end of file