diff --git a/Furious/QtFramework/UpdatesManager.py b/Furious/QtFramework/UpdatesManager.py index ebddfe2..2e2e8a8 100644 --- a/Furious/QtFramework/UpdatesManager.py +++ b/Furious/QtFramework/UpdatesManager.py @@ -40,22 +40,6 @@ logger = logging.getLogger(__name__) needTrans = functools.partial(needTransFn, source=__name__) -def versionToNumber(version): - major_weight = 10000 - minor_weight = 100 - patch_weight = 1 - - return functools.reduce( - operator.add, - list( - int(ver) * weight - for ver, weight in zip( - version.split('.'), [major_weight, minor_weight, patch_weight] - ) - ), - ) - - needTrans('New version available') @@ -116,7 +100,7 @@ class UpdatesManager(AppQNetworkAccessManager): # Unchecked? info = UJSONEncoder.decode(networkReply.readAll().data()) - if versionToNumber(info['tag_name']) > versionToNumber(APPLICATION_VERSION): + if versionToValue(info['tag_name']) > versionToValue(APPLICATION_VERSION): def handleResultCode(code): if code == PySide6LegacyEnumValueWrapper( diff --git a/Furious/Utility/PySide6Legacy.py b/Furious/Utility/PySide6Legacy.py index df00dc3..3d5e305 100644 --- a/Furious/Utility/PySide6Legacy.py +++ b/Furious/Utility/PySide6Legacy.py @@ -16,6 +16,7 @@ # along with this program. If not, see . from Furious.Utility.Constants import * +from Furious.Utility.Utility import * import time @@ -24,7 +25,7 @@ __all__ = ['PySide6LegacyEnumValueWrapper', 'PySide6LegacyEventLoopWait'] def PySide6LegacyEnumValueWrapper(enum): # Protect PySide6 enum wrapper behavior changes - if PYSIDE6_VERSION < '6.2.2': + if versionToValue(PYSIDE6_VERSION) < versionToValue('6.2.2'): return enum else: return enum.value @@ -33,7 +34,7 @@ def PySide6LegacyEnumValueWrapper(enum): def PySide6LegacyEventLoopWait(ms): # Protect qWait method does not exist in some # old PySide6 version - if PYSIDE6_VERSION < '6.3.1': + if versionToValue(PYSIDE6_VERSION) < versionToValue('6.3.1'): for counter in range(0, ms, 10): time.sleep(10 / 1000)