TonieToolbox 0.4.1__py3-none-any.whl → 0.5.0a1__py3-none-any.whl

TonieToolbox/version_handler.py

@@ -3,9 +3,9 @@ Version handler to check if the latest version of TonieToolbox is being used.
 """
 
 import json
-import logging
 import os
 import time
+from packaging import version
 from urllib import request
 from urllib.error import URLError
 
@@ -90,7 +90,7 @@ def get_pypi_version(force_refresh=False):
 
 def compare_versions(v1, v2):
     """
-    Compare two version strings.
+    Compare two version strings according to PEP 440.
     
     Args:
         v1: First version string
@@ -102,31 +102,35 @@ def compare_versions(v1, v2):
     logger = get_logger("version_handler")
     logger.debug("Comparing versions: '%s' vs '%s'", v1, v2)
     
-    try:
-        v1_parts = [int(x) for x in v1.split('.')]
-        v2_parts = [int(x) for x in v2.split('.')]
+    try:   
+        # Strip leading 'v' if present
+        v1_clean = v1[1:] if v1.startswith('v') else v1
+        v2_clean = v2[1:] if v2.startswith('v') else v2
         
-        logger.debug("Version parts: %s vs %s", v1_parts, v2_parts)
+        parsed_v1 = version.parse(v1_clean)
+        parsed_v2 = version.parse(v2_clean)
         
-        for i in range(max(len(v1_parts), len(v2_parts))):
-            v1_part = v1_parts[i] if i < len(v1_parts) else 0
-            v2_part = v2_parts[i] if i < len(v2_parts) else 0
-            
-            logger.debug("Comparing part %d: %d vs %d", i, v1_part, v2_part)
-            
-            if v1_part < v2_part:
-                logger.debug("Result: '%s' is OLDER than '%s'", v1, v2)
-                return -1
-            elif v1_part > v2_part:
-                logger.debug("Result: '%s' is NEWER than '%s'", v1, v2)
-                return 1
+        logger.debug("Parsed versions: %s vs %s", parsed_v1, parsed_v2)
         
-        logger.debug("Result: versions are EQUAL")
-        return 0
+        if parsed_v1 < parsed_v2:
+            logger.debug("Result: '%s' is OLDER than '%s'", v1, v2)
+            return -1
+        elif parsed_v1 > parsed_v2:
+            logger.debug("Result: '%s' is NEWER than '%s'", v1, v2)
+            return 1
+        else:
+            logger.debug("Result: versions are EQUAL")
+            return 0
     except Exception as e:
         logger.debug("Error comparing versions '%s' and '%s': %s", v1, v2, e)
-        # On error, assume versions are equal
-        return 0
+        # On error, fall back to simple string comparison to avoid crashes
+        logger.debug("Falling back to string comparison")
+        if v1 == v2:
+            return 0
+        elif v1 < v2:
+            return -1
+        else:
+            return 1
 
 
 def check_for_updates(quiet=False, force_refresh=False):

{tonietoolbox-0.4.1.dist-info → tonietoolbox-0.5.0a1.dist-info}/METADATA

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: TonieToolbox
-Version: 0.4.1
-Summary: Convert audio files to Tonie box compatible format
+Version: 0.5.0a1
+Summary: Create files for the Tonie box and interact with TeddyCloud servers
 Home-page: https://github.com/Quentendo64/TonieToolbox
 Author: Quentendo64
 Author-email: Quentendo64 <quentin@wohlfeil.at>
@@ -20,7 +20,12 @@ Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE.md
 Requires-Dist: protobuf<=3.19.0
+Requires-Dist: requests>=2.32.3
 Requires-Dist: mutagen>=1.47.0
+Requires-Dist: packaging>=25.0
+Provides-Extra: test
+Requires-Dist: pytest>=8.3.5; extra == "test"
+Requires-Dist: pytest-cov>=6.1.1; extra == "test"
 Dynamic: author
 Dynamic: home-page
 Dynamic: license-file

tonietoolbox-0.5.0a1.dist-info/RECORD

@@ -0,0 +1,26 @@
+TonieToolbox/__init__.py,sha256=lz0LClHOINLjhHw0cRVZfFszfira4Z3-Z4bnMt-re88,98
+TonieToolbox/__main__.py,sha256=W9bxe32L5nd3bhjdyRySwmr1wG8q-vBGjdGSRmw9hGo,32085
+TonieToolbox/artwork.py,sha256=Q1cwcJu-bmBiDLOzYTIcX1UAh-Bf6vgQY1PqW0KXZlw,4359
+TonieToolbox/audio_conversion.py,sha256=nV87LTzuxeJQughu-esxTq2aZq-BvaTURj-pvBqygQs,13075
+TonieToolbox/constants.py,sha256=BQ6eUNvT3eXgsz8KFYMrqpn5vRPXrp2d6folxP6H03E,4374
+TonieToolbox/dependency_manager.py,sha256=EvVUO4T1CrhUXlrVk9HBgCRDER3b1BRNdgkZLSpCTho,27921
+TonieToolbox/filename_generator.py,sha256=RqQHyGTKakuWR01yMSnFVMU_HfLw3rqFxKhXNIHdTlg,3441
+TonieToolbox/logger.py,sha256=eZoQj4xICKEZ645GhIfZhAPAjgbgjnnfTXZ_soPjyDg,3017
+TonieToolbox/media_tags.py,sha256=PnvdHh_1RV3Fi-Wkqz5DMDjSksLsmWPrApv-6BA82jE,23206
+TonieToolbox/ogg_page.py,sha256=-ViaIRBgh5ayfwmyplL8QmmRr5P36X8W0DdHkSFUYUU,21948
+TonieToolbox/opus_packet.py,sha256=OcHXEe3I_K4mWPUD55prpG42sZxJsEeAxqSbFxBmb0c,7895
+TonieToolbox/recursive_processor.py,sha256=A6HS9xHX3gyLGUA39vcNZqS6qtwE6sLX4uMfdQONE4I,13619
+TonieToolbox/tags.py,sha256=ji9N1b3zX5E3YqOayBqdUiJ99SA0HuR_RrXaRe-q1ok,2682
+TonieToolbox/teddycloud.py,sha256=UwWIT6xVAb06g7vftzU_IxH5ZNtWmjgcHQDXhvuB6u8,13433
+TonieToolbox/tonie_analysis.py,sha256=NdUXiZRVNW8T2C6EhqicgbohmPP9irX4q8hiQxBhc0E,30540
+TonieToolbox/tonie_file.py,sha256=_LyIsUp2NmpkUVViiLY7EhXitrY4S27xKG5lvZdECJE,21031
+TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
+TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
+TonieToolbox/tonies_json.py,sha256=hHnvFMTg1wKkgYsWKY5bNzOFK9k-QnXm8siHhdDTHtQ,25671
+TonieToolbox/version_handler.py,sha256=Uiob27NKvemJUR-SPPdhQLYp07o8eDyCik_KAY4KPDY,9869
+tonietoolbox-0.5.0a1.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
+tonietoolbox-0.5.0a1.dist-info/METADATA,sha256=rNjSilTxeshGEwFmiQogGwy_0rqmh_08Bu3oWQBEEiY,24304
+tonietoolbox-0.5.0a1.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+tonietoolbox-0.5.0a1.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
+tonietoolbox-0.5.0a1.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
+tonietoolbox-0.5.0a1.dist-info/RECORD,,

{tonietoolbox-0.4.1.dist-info → tonietoolbox-0.5.0a1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

tonietoolbox-0.4.1.dist-info/RECORD

@@ -1,24 +0,0 @@
-TonieToolbox/__init__.py,sha256=J5dz_xd-IvgNUuHuz0CdoFGZceDpI0_ESj_3jo_OAKo,96
-TonieToolbox/__main__.py,sha256=71HjJZFNfdflCbwuL28xHpKkwLIKAXW6sVpGX9TQRII,37202
-TonieToolbox/audio_conversion.py,sha256=nV87LTzuxeJQughu-esxTq2aZq-BvaTURj-pvBqygQs,13075
-TonieToolbox/constants.py,sha256=BQ6eUNvT3eXgsz8KFYMrqpn5vRPXrp2d6folxP6H03E,4374
-TonieToolbox/dependency_manager.py,sha256=EvVUO4T1CrhUXlrVk9HBgCRDER3b1BRNdgkZLSpCTho,27921
-TonieToolbox/filename_generator.py,sha256=RqQHyGTKakuWR01yMSnFVMU_HfLw3rqFxKhXNIHdTlg,3441
-TonieToolbox/logger.py,sha256=eZoQj4xICKEZ645GhIfZhAPAjgbgjnnfTXZ_soPjyDg,3017
-TonieToolbox/media_tags.py,sha256=PnvdHh_1RV3Fi-Wkqz5DMDjSksLsmWPrApv-6BA82jE,23206
-TonieToolbox/ogg_page.py,sha256=-ViaIRBgh5ayfwmyplL8QmmRr5P36X8W0DdHkSFUYUU,21948
-TonieToolbox/opus_packet.py,sha256=OcHXEe3I_K4mWPUD55prpG42sZxJsEeAxqSbFxBmb0c,7895
-TonieToolbox/recursive_processor.py,sha256=m70-oJ4MRXvI9OMy14sC9UsQIxwVEnEoA3hhLGdHhL4,13457
-TonieToolbox/teddycloud.py,sha256=ATfCLKecjBZRwIzhPkNcOKELRSbnmIyeQh-1imuTe9A,27281
-TonieToolbox/tonie_analysis.py,sha256=kp4Wx4cTDddtF2AlS6IX4xs1vQ-mpZ0gsAy4-UdRAAM,23287
-TonieToolbox/tonie_file.py,sha256=_LyIsUp2NmpkUVViiLY7EhXitrY4S27xKG5lvZdECJE,21031
-TonieToolbox/tonie_header.proto,sha256=WaWfwO4VrwGtscK2ujfDRKtpeBpaVPoZhI8iMmR-C0U,202
-TonieToolbox/tonie_header_pb2.py,sha256=s5bp4ULTEekgq6T61z9fDkRavyPM-3eREs20f_Pxxe8,3665
-TonieToolbox/tonies_json.py,sha256=AAYPTDTVZg4sm5AAnUKPPAifTM1iLh6Oa96ic84K2m0,20673
-TonieToolbox/version_handler.py,sha256=7Zx-pgzAUhz6jMplvNal1wHyxidodVxaNcAV0EMph5k,9778
-tonietoolbox-0.4.1.dist-info/licenses/LICENSE.md,sha256=rGoga9ZAgNco9fBapVFpWf6ri7HOBp1KRnt1uIruXMk,35190
-tonietoolbox-0.4.1.dist-info/METADATA,sha256=qveJ2gYUaso5-UsLJevMumuiHNsbh75m13piICWknSg,24105
-tonietoolbox-0.4.1.dist-info/WHEEL,sha256=pxyMxgL8-pra_rKaQ4drOZAegBVuX-G_4nRHjjgWbmo,91
-tonietoolbox-0.4.1.dist-info/entry_points.txt,sha256=oqpeyBxel7aScg35Xr4gZKnf486S5KW9okqeBwyJxxc,60
-tonietoolbox-0.4.1.dist-info/top_level.txt,sha256=Wkkm-2p7I3ENfS7ZbYtYUB2g-xwHrXVlERHfonsOPuE,13
-tonietoolbox-0.4.1.dist-info/RECORD,,