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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gshock_api
-Version: 2.0.3
+Version: 2.0.4
 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.4}/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.4"
 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.4}/setup.py

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

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

@@ -5,14 +5,17 @@ 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 gshock_api.device import Device
 
 class Connection:
-    def __init__(self, device):
+    def __init__(self, device: Device):
         self.handles_map = self.init_handles_map()
         self.device = device
-        self.client = BleakClient(device)
+        self.client = BleakClient(device.address)
         self.characteristics_map = {}
 
+
     def notification_handler(
         self, characteristic: BleakGATTCharacteristic, data: bytearray
     ):
@@ -35,7 +38,10 @@ class Connection:
                 CasioConstants.CASIO_ALL_FEATURES_CHARACTERISTIC_UUID,
                 self.notification_handler,
             )
+            
+            watch_info.set_name_and_model(self.device.name)
             return True
+        
         except Exception as e:
             logger.debug(f"Cannot connect: {e}")
             return False

gshock_api-2.0.4/src/gshock_api/device.py

@@ -0,0 +1,6 @@
+from dataclasses import dataclass
+
+@dataclass
+class Device:
+    name: str
+    address: str

{gshock_api-2.0.3 → gshock_api-2.0.4}/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.4}/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 gshock_api.device import Device 
 
 class Scanner:
     CASIO_SERVICE_UUID = "00001804-0000-1000-8000-00805f9b34fb"
 
-    async def scan(self, device_address=None):
+    async def scan(self, device_address=None) -> Device:
         scanner = BleakScanner()
         logger.info("Scanning for devices...")
 
@@ -22,10 +22,9 @@ 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)
+                
+                # This is now set after connection in Connection class
+                # watch_info.set_name_and_model(device.name)
 
                 conf.put("device.address", device.address)
                 conf.put("device.name", device.name)
@@ -35,8 +34,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
-
+        return Device(device.name, device.address)
 
 scanner = Scanner()

{gshock_api-2.0.3 → gshock_api-2.0.4/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.4
 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.4}/src/gshock_api.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ src/gshock_api/cancelable_result.py
 src/gshock_api/casio_constants.py
 src/gshock_api/configurator.py
 src/gshock_api/connection.py
+src/gshock_api/device.py
 src/gshock_api/event.py
 src/gshock_api/gshock_api.py
 src/gshock_api/logger.py