gshock-api 2.0.7__tar.gz → 2.0.9__tar.gz

{gshock_api-2.0.7/src/gshock_api.egg-info → gshock_api-2.0.9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gshock_api
-Version: 2.0.7
+Version: 2.0.9
 Summary: Pythgon API for GShock Watches using BLE
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: Ivo Zivkov

{gshock_api-2.0.7 → gshock_api-2.0.9}/pyproject.toml

@@ -5,7 +5,7 @@ requires = ["setuptools>=61.0"]
 
 [project]
 name = "gshock_api"  # Change to your project name
-version = "2.0.7"
+version = "2.0.9"
 description = "Pythgon API for GShock Watches using BLE"
 readme = "README.rst"
 authors = [{ name = "Ivo Zivkov", email = "izivkov@gmail.com" }]

{gshock_api-2.0.7 → gshock_api-2.0.9}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name='gshock_api',
-    version='2.0.7',
+    version='2.0.9',
     package_dir={'': 'src'},
     packages=find_packages(where='src'),
     install_requires=[

{gshock_api-2.0.7 → gshock_api-2.0.9}/src/gshock_api/connection.py

@@ -1,6 +1,7 @@
 import asyncio, time
 from tracemalloc import start
 from bleak import BleakClient
+from bleak.exc import BleakDBusError
 from bleak.backends.characteristic import BleakGATTCharacteristic
 from gshock_api.casio_constants import CasioConstants
 from gshock_api import message_dispatcher
@@ -9,7 +10,7 @@ from gshock_api.logger import logger
 from gshock_api.watch_info import watch_info
 from bleak.backends.device import BLEDevice
 from gshock_api.scanner import scanner
-from gshock_api.exceptions import GShockConnectionError
+from gshock_api.exceptions import GShockIgnorableException, GShockConnectionError
 
 class Connection:
     def __init__(self, address = None):
@@ -81,8 +82,11 @@ class Connection:
             )
 
         except Exception as e:
-            print("Exception type:", type(e))
-            raise GShockConnectionError(f"Unable to write to G-Shock device: {e}") from e
+            e.args = (type(e).__name__,)
+            if isinstance(e, (BleakDBusError, EOFError)):
+                raise GShockIgnorableException(e)
+            else:
+                raise GShockConnectionError(f"Unable to send time to watch: {e}") 
 
     async def request(self, request):
         await self.write(0xC, request)

gshock_api-2.0.9/src/gshock_api/exceptions.py

@@ -0,0 +1,13 @@
+# gshock_api/exceptions.py
+
+class GShockError(Exception):
+    """Base exception for all G-Shock errors."""
+    pass
+
+class GShockConnectionError(GShockError):
+    """Raised when BLE connection to G-Shock device fails."""    
+    pass
+
+class GShockIgnorableException(GShockConnectionError):
+    """Raised when BLE connection to G-Shock device fails."""    
+    pass

{gshock_api-2.0.7 → gshock_api-2.0.9}/src/gshock_api/iolib/time_io.py

@@ -7,7 +7,7 @@ from gshock_api.logger import logger
 
 from gshock_api.utils import to_compact_string, to_hex_string
 from gshock_api.casio_constants import CasioConstants
-import bleak
+from gshock_api.exceptions import GShockIgnorableException
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS
 
@@ -38,12 +38,11 @@ class TimeIO:
         )
         try:
             await TimeIO.connection.write(0xE, to_compact_string(time_command))
-        except (Exception) as e:
+        except (GShockIgnorableException) as e:
             # Ignore this exception if the LOWER-RIGHT button is pressed.
             # In this case, the connection will be closed before the call completes with a response, and we get an EOFError.
             # The call actually works, though.
-            
-            logger.info(f"Error {e} ignored due to timeout limitation")
+            logger.info(f"Ignoring {e}")
 
 class TimeEncoder:
     def prepare_current_time(date: datetime.datetime):

{gshock_api-2.0.7 → gshock_api-2.0.9/src/gshock_api.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gshock_api
-Version: 2.0.7
+Version: 2.0.9
 Summary: Pythgon API for GShock Watches using BLE
 Home-page: https://github.com/pyscaffold/pyscaffold/
 Author: Ivo Zivkov

gshock_api-2.0.7/src/gshock_api/exceptions.py

@@ -1,9 +0,0 @@
-# gshock_api/exceptions.py
-
-class GShockError(Exception):
-    """Base exception for all G-Shock errors."""
-    pass
-
-class GShockConnectionError(GShockError):
-    """Raised when BLE connection to G-Shock device fails."""
-    pass