gshock-api 2.0.3__tar.gz → 2.0.5__tar.gz

{gshock_api-2.0.3/src/gshock_api.egg-info → gshock_api-2.0.5}/PKG-INFO

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

{gshock_api-2.0.3 → gshock_api-2.0.5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "gshock_api"  # Change to your project name
-version = "2.0.3"
+version = "2.0.5"
 description = "Pythgon API for GShock Watches using BLE"
 readme = "README.rst"
 authors = [{ name = "Ivo Zivkov", email = "izivkov@gmail.com" }]

{gshock_api-2.0.3 → gshock_api-2.0.5}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
-name = GShockTimeServer
-description = Add a short description here!
+name = gshock-api
+description = API for G-Shock watches via Bluetooth Low Energy (BLE)
 author = Ivo Zivkov
 author_email = izivkov@gmail.com
 license = MIT

{gshock_api-2.0.3 → gshock_api-2.0.5}/setup.py

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

{gshock_api-2.0.3 → gshock_api-2.0.5}/src/gshock_api/connection.py

@@ -5,12 +5,15 @@ from gshock_api.casio_constants import CasioConstants
 from gshock_api import message_dispatcher
 from gshock_api.utils import to_casio_cmd
 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
 
 class Connection:
-    def __init__(self, device):
+    def __init__(self, address = None):
         self.handles_map = self.init_handles_map()
-        self.device = device
-        self.client = BleakClient(device)
+        self.address = address
+        self.client: BleakClient = None
         self.characteristics_map = {}
 
     def notification_handler(
@@ -27,17 +30,27 @@ class Connection:
             for char in service.characteristics:
                 self.characteristics_map[char.uuid] = char.uuid  # Store in map
 
-    async def connect(self):
+    async def connect(self) -> bool:
         try:
+            # Scan for device if address not provided
+            device = await scanner.scan(device_address=self.address if self.address else None)
+            self.address = device.address  # Always update with actual device found
+            logger.info(f"Found device: {device.name} ({self.address})")
+
+            self.client = BleakClient(self.address)
             await self.client.connect()
+
             await self.init_characteristics_map()
+
             await self.client.start_notify(
                 CasioConstants.CASIO_ALL_FEATURES_CHARACTERISTIC_UUID,
                 self.notification_handler,
             )
+
             return True
+
         except Exception as e:
-            logger.debug(f"Cannot connect: {e}")
+            logger.warning(f"[GShock Connect] Connection failed: {e}")
             return False
 
     async def disconnect(self):

{gshock_api-2.0.3 → gshock_api-2.0.5}/src/gshock_api/message_dispatcher.py

@@ -75,7 +75,6 @@ class MessageDispatcher:
             logger.info(f"Found key: {MessageDispatcher.data_received_messages[key]}")
             MessageDispatcher.data_received_messages[key](data)
 
-
 # Usage example
 if __name__ == "__main__":
     # Simulated messages

{gshock_api-2.0.3 → gshock_api-2.0.5}/src/gshock_api/scanner.py

@@ -4,12 +4,12 @@ from bleak import BleakScanner
 from gshock_api.configurator import conf
 from gshock_api.watch_info import watch_info
 from gshock_api.logger import logger
-
+from bleak.backends.device import BLEDevice
 
 class Scanner:
     CASIO_SERVICE_UUID = "00001804-0000-1000-8000-00805f9b34fb"
 
-    async def scan(self, device_address=None):
+    async def scan(self, device_address=None) -> BLEDevice:
         scanner = BleakScanner()
         logger.info("Scanning for devices...")
 
@@ -22,9 +22,7 @@ class Scanner:
                 logger.info(f"device: {device}")
                 if device is None:
                     continue
-
-                # watch_info.set_name(device.name)
-                # watch_info.set_address(device.address)
+                
                 watch_info.set_name_and_model(device.name)
 
                 conf.put("device.address", device.address)
@@ -35,8 +33,8 @@ class Scanner:
             device = await scanner.find_device_by_address(
                 device_address, sys.float_info.max
             )
+            watch_info.set_name_and_model(device.name)
 
         return device
 
-
 scanner = Scanner()

{gshock_api-2.0.3 → gshock_api-2.0.5/src/gshock_api.egg-info}/PKG-INFO

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