gshock-api 2.0.6__tar.gz → 2.0.8__tar.gz

{gshock_api-2.0.6/src/gshock_api.egg-info → gshock_api-2.0.8}/PKG-INFO

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

{gshock_api-2.0.6 → gshock_api-2.0.8}/pyproject.toml

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

{gshock_api-2.0.6 → gshock_api-2.0.8}/setup.py

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

{gshock_api-2.0.6 → gshock_api-2.0.8}/src/gshock_api/cancelable_result.py

@@ -3,7 +3,7 @@ from typing import Any
 from gshock_api.exceptions import GShockConnectionError
 
 class CancelableResult:
-    def __init__(self, timeout: float = 3.0):
+    def __init__(self, timeout: float = 10.0):
         self._timeout = timeout
         self._future: asyncio.Future[Any] = asyncio.Future()
 
@@ -14,7 +14,7 @@ class CancelableResult:
         except asyncio.TimeoutError as e:
             if not self._future.done():
                 self._future.set_result('')  # or raise an exception instead
-            raise GShockConnectionError(f"Timeout occured wait for response from the watch: {e}") from e
+            raise GShockConnectionError(f"Timeout occured waiting for response from the watch: {e}") from e
 
     def set_result(self, result: Any) -> None:
         if not self._future.done():

{gshock_api-2.0.6 → gshock_api-2.0.8}/src/gshock_api/connection.py

@@ -1,5 +1,7 @@
-import asyncio
+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
@@ -8,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):
@@ -71,7 +73,7 @@ class Connection:
                 )
                 if (handle == 13):
                     logger.info(
-                        "Your watch does not suppot notifications..."
+                        "Your watch does not support notifications..."
                     )
                 return
 
@@ -80,8 +82,11 @@ class Connection:
             )
 
         except Exception as e:
-            logger.info("write failed with exception: {}".format(e))
-            raise GShockConnectionError(f"Unable to connect 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.8/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(GShockError):
+    """Raised when BLE connection to G-Shock device fails."""    
+    pass

{gshock_api-2.0.6 → gshock_api-2.0.8}/src/gshock_api/gshock_api.py

@@ -205,8 +205,6 @@ class GshockAPI:
         if current_time == None:
             current_time = time.time()
 
-        self.logger.info(f"=======> passed: ${current_time}, ${time.time()}")
-
         await self.initialize_for_setting_time()
         await self._set_time(current_time)
         current_time = None

{gshock_api-2.0.6 → gshock_api-2.0.8}/src/gshock_api/iolib/time_io.py

@@ -3,17 +3,16 @@ import datetime
 import json
 import time
 from typing import Any
-from gshock_api.cancelable_result import CancelableResult
 from gshock_api.logger import logger
 
 from gshock_api.utils import to_compact_string, to_hex_string
 from gshock_api.casio_constants import CasioConstants
+from gshock_api.exceptions import GShockIgnorableException
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS
 
 
 class TimeIO:
-    result: CancelableResult = None
     connection = None
 
     @staticmethod
@@ -37,8 +36,13 @@ class TimeIO:
         time_command = to_hex_string(
             bytearray([CHARACTERISTICS["CASIO_CURRENT_TIME"]]) + time_data
         )
-        await TimeIO.connection.write(0xE, to_compact_string(time_command))
-
+        try:
+            await TimeIO.connection.write(0xE, to_compact_string(time_command))
+        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"Ignoring {e}")
 
 class TimeEncoder:
     def prepare_current_time(date: datetime.datetime):

{gshock_api-2.0.6 → gshock_api-2.0.8/src/gshock_api.egg-info}/PKG-INFO

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

gshock_api-2.0.6/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