Merge pull request #13 from adator85/dev

patch V4.0.4

core/base.py

@@ -77,32 +77,34 @@ class Base:
             self.logs.warning(f'Github not available to fetch latest version')
 
     def check_for_new_version(self) -> bool:
+        try:
+            # Assigner la version actuelle de Defender
+            self.__set_current_defender_version() 
+            # Récuperer la dernier version disponible dans github
+            self.__get_latest_defender_version()
 
-        # Assigner la version actuelle de Defender
-        self.__set_current_defender_version() 
-        # Récuperer la dernier version disponible dans github
-        self.__get_latest_defender_version()
-
-        isNewVersion = False
-        latest_version = self.LATEST_DEFENDER_VERSION
-        current_version = self.DEFENDER_VERSION
-        
-        curr_major, curr_minor, curr_patch = current_version.split('.')
-        last_major, last_minor, last_patch = latest_version.split('.')
-
-        if last_major > curr_major:
-            self.logs.info(f'New version available: {current_version} >>> {latest_version}')
-            isNewVersion = True
-        elif last_major == curr_major and last_minor > curr_minor:
-            self.logs.info(f'New version available: {current_version} >>> {latest_version}')
-            isNewVersion = True
-        elif last_major == curr_major and last_minor == curr_minor and last_patch > curr_patch:
-            self.logs.info(f'New version available: {current_version} >>> {latest_version}')
-            isNewVersion = True
-        else:
             isNewVersion = False
+            latest_version = self.LATEST_DEFENDER_VERSION
+            current_version = self.DEFENDER_VERSION
 
-        return isNewVersion
+            curr_major , curr_minor, curr_patch = current_version.split('.')
+            last_major, last_minor, last_patch = latest_version.split('.')
+
+            if int(last_major) > int(curr_major):
+                self.logs.info(f'New version available: {current_version} >>> {latest_version}')
+                isNewVersion = True
+            elif int(last_major) == int(curr_major) and int(last_minor) > int(curr_minor):
+                self.logs.info(f'New version available: {current_version} >>> {latest_version}')
+                isNewVersion = True
+            elif int(last_major) == int(curr_major) and int(last_minor) == int(curr_minor) and int(last_patch) > int(curr_patch):
+                self.logs.info(f'New version available: {current_version} >>> {latest_version}')
+                isNewVersion = True
+            else:
+                isNewVersion = False
+
+            return isNewVersion
+        except ValueError as ve:
+            self.logs.error(f'Impossible to convert in version number : {ve}')
 
     def get_unixtime(self) -> int:
         """

core/irc.py

@@ -28,8 +28,8 @@ class Irc:
 
         # Liste des commandes internes du bot
         self.commands_level = {
-            0: ['help', 'auth', 'copyright','checkversion'],
-            1: ['load','reload','unload', 'deauth', 'uptime'],
+            0: ['help', 'auth', 'copyright'],
+            1: ['load','reload','unload', 'deauth', 'uptime', 'checkversion'],
             2: ['show_modules', 'show_timers', 'show_threads', 'sentinel'],
             3: ['quit', 'restart','addaccess','editaccess', 'delaccess']
         }
@@ -759,6 +759,9 @@ class Irc:
                             self.Base.logs.info(f"# VERSION  :    {version}                       ")
                             self.Base.logs.info(f"################################################")
                             
+                            if self.Base.check_for_new_version():
+                                self.send2socket(f":{self.Config.SERVICE_NICKNAME} PRIVMSG {self.Config.SERVICE_CHANLOG} : New Version available {version}")
+
                         # Initialisation terminé aprés le premier PING
                         self.INIT = 0
                         # self.send2socket(f':{self.Config.SERVICE_ID} PING :{hsid}')
@@ -1267,6 +1270,7 @@ class Irc:
 
                 if self.Base.check_for_new_version():
                     self.send2socket(f':{dnickname} NOTICE {fromuser} : New Version available : {self.Base.DEFENDER_VERSION} >>> {self.Base.LATEST_DEFENDER_VERSION}')
+                    self.send2socket(f':{dnickname} NOTICE {fromuser} : Please run (git pull origin main) in the current folder')
                 else:
                     self.send2socket(f':{dnickname} NOTICE {fromuser} : You have the latest version of defender')
                 pass

version.json

@@ -1,3 +1,3 @@
 {
-    "version": "4.0.0"
+    "version": "4.0.4"
 }