From 743069f8e0f98bc074b493cea481978f8bf5f2b2 Mon Sep 17 00:00:00 2001 From: adator <85586985+adator85@users.noreply.github.com> Date: Sat, 3 Aug 2024 20:24:58 +0200 Subject: [PATCH] convert version string to int --- core/base.py | 48 +++++++++++++++++++++++++----------------------- version.json | 2 +- 2 files changed, 26 insertions(+), 24 deletions(-) diff --git a/core/base.py b/core/base.py index 5b5ab8f..79efef6 100644 --- a/core/base.py +++ b/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: """ diff --git a/version.json b/version.json index a4c8ee9..d48e961 100644 --- a/version.json +++ b/version.json @@ -1,3 +1,3 @@ { - "version": "4.0.1" + "version": "4.0.2" } \ No newline at end of file