gshock-api 2.0.26__tar.gz → 2.0.28__tar.gz

{gshock_api-2.0.26/src/gshock_api.egg-info → gshock_api-2.0.28}/PKG-INFO

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

{gshock_api-2.0.26 → gshock_api-2.0.28}/pyproject.toml

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

{gshock_api-2.0.26 → gshock_api-2.0.28}/setup.py

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

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/connection.py

@@ -1,5 +1,3 @@
-import asyncio, time
-from tracemalloc import start
 from bleak import BleakClient
 from bleak.exc import BleakDBusError
 from bleak.backends.characteristic import BleakGATTCharacteristic
@@ -7,8 +5,6 @@ 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
 from gshock_api.exceptions import GShockIgnorableException, GShockConnectionError
 
@@ -36,7 +32,7 @@ class Connection:
     async def connect(self, watch_filter=None) -> bool:
         try:
             # Scan for device if address not provided
-            if self.address == None:
+            if self.address is None:
                 device = await scanner.scan(
                     device_address=self.address if self.address else None,
                     watch_filter=watch_filter

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/gshock_api.py

@@ -1,6 +1,5 @@
 import logging
 import json
-import time
 
 from gshock_api.iolib.dst_watch_state_io import DtsState
 from gshock_api.iolib.button_pressed_io import WatchButton
@@ -12,7 +11,6 @@ from gshock_api.utils import (
     to_compact_string,
 )
 from gshock_api.alarms import alarms_inst
-from gshock_api.event import Event
 from gshock_api.watch_info import watch_info
 
 class GshockAPI:

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/alarms_io.py

@@ -1,6 +1,4 @@
-import asyncio
 import json
-from typing import Any
 from gshock_api.alarms import alarms_inst, alarm_decoder
 
 from gshock_api.cancelable_result import CancelableResult

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/app_info_io.py

@@ -1,7 +1,4 @@
-import asyncio
-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

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/button_pressed_io.py

@@ -1,9 +1,6 @@
-import asyncio
 from enum import IntEnum
-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, to_int_array
+from gshock_api.utils import to_hex_string, to_int_array
 from gshock_api.casio_constants import CasioConstants
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/dst_for_world_cities_io.py

@@ -1,9 +1,5 @@
-import asyncio
-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
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/dst_watch_state_io.py

@@ -1,9 +1,5 @@
-import asyncio
 from enum import IntEnum
-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
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/events_io.py

@@ -1,6 +1,4 @@
-import asyncio
 import json
-from typing import Any
 from gshock_api.cancelable_result import CancelableResult
 from gshock_api.logger import logger
 from gshock_api.casio_constants import CasioConstants

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/settings_io.py

@@ -1,6 +1,4 @@
-import asyncio
 import json
-from typing import Any
 from gshock_api.cancelable_result import CancelableResult
 from gshock_api.settings import settings
 from gshock_api.utils import to_compact_string, to_hex_string, to_int_array

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/time_adjustement_io.py

@@ -1,9 +1,5 @@
-import asyncio
 import json
-import logging
-from typing import Any
 from gshock_api.cancelable_result import CancelableResult
-from gshock_api.settings import settings
 from gshock_api.utils import to_compact_string, to_hex_string, to_int_array
 from gshock_api.casio_constants import CasioConstants
 from gshock_api.iolib.error_io import ErrorIO

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/time_io.py

@@ -1,8 +1,6 @@
 import time
 import datetime
 import json
-import time
-from typing import Any
 from gshock_api.logger import logger
 
 from gshock_api.utils import to_compact_string, to_hex_string

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/timer_io.py

@@ -1,8 +1,5 @@
-import asyncio
 import json
-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

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/watch_condition_io.py

@@ -1,9 +1,6 @@
-import asyncio
-from typing import Any
 from gshock_api.cancelable_result import CancelableResult
 from gshock_api.watch_info import watch_info
 from gshock_api.casio_constants import CasioConstants
-from gshock_api.logger import logger
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS
 

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/watch_name_io.py

@@ -1,7 +1,4 @@
-import asyncio
-from typing import Any
 
-from gshock_api.casio_constants import CasioConstants
 from gshock_api.utils import clean_str, to_ascii_string, to_hex_string
 from gshock_api.cancelable_result import CancelableResult
 

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/iolib/world_cities_io.py

@@ -1,8 +1,5 @@
-import asyncio
-from typing import Any
 from gshock_api.casio_constants import CasioConstants
 from gshock_api.cancelable_result import CancelableResult
-from gshock_api.logger import logger
 
 CHARACTERISTICS = CasioConstants.CHARACTERISTICS
 

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/message_dispatcher.py

@@ -1,7 +1,4 @@
-import sys
-import asyncio
 import json
-from typing import Any
 from gshock_api.logger import logger
 from gshock_api.casio_constants import CasioConstants
 from gshock_api.iolib.app_info_io import AppInfoIO

gshock_api-2.0.28/src/gshock_api/scanner.py

@@ -0,0 +1,60 @@
+import sys
+
+import asyncio
+from gshock_api.watch_info import watch_info
+from gshock_api.logger import logger
+from bleak.backends.device import BLEDevice
+from bleak import BleakScanner, BLEDevice
+from bleak.exc import BleakError
+from typing import Optional
+
+class Scanner:
+    def __init__(self):
+        self._found_device: Optional[BLEDevice] = None
+        self._event = asyncio.Event()
+
+    async def scan(
+        self,
+        device_address: str | None = None,
+        watch_filter=None,
+        max_retries: int = 60
+    ) -> BLEDevice | None:
+        
+        CASIO_SERVICE_UUID = "00001804-0000-1000-8000-00805f9b34fb"
+        found = None
+
+        if not device_address:
+            for _ in range(max_retries):
+                await asyncio.sleep(1)
+                try:
+                    def uuid_filter(d: BLEDevice, ad):
+                        su = ad.service_uuids or []
+                        return CASIO_SERVICE_UUID in su and (watch_filter is None or watch_filter(d.name))
+                    found = await BleakScanner().find_device_by_filter(uuid_filter, timeout=10)
+                    if found:
+                        logger.info(f"✅ Found: {found.name} ({found.address})")
+                        watch_info.set_name_and_model(found.name)
+                        return found
+                    logger.debug("⚠️ No matching device found, retrying...")
+                except BleakError as e:
+                    logger.warning(f"⚠️ BleakError: BLE scan error: {e}")
+                except Exception as e:
+                    logger.warning(f"⚠️ BLE scan error: {e}")
+
+            logger.error("⚠️ Max retries reached. No device found.")
+        else:
+            logger.info(f"⚠️ Waiting for specific device by address: {device_address}...")
+            try:
+                found = await BleakScanner().find_device_by_address(
+                    device_address, timeout=sys.float_info.max
+                )
+            except BleakError as e:
+                logger.error(f"⚠️ Error finding device by address: {e}")
+                return None
+            if not found:
+                logger.warning("⚠️ Device not found by address.")
+                return None
+            watch_info.set_name_and_model(found.name)
+        return found
+    
+scanner = Scanner()

{gshock_api-2.0.26 → gshock_api-2.0.28}/src/gshock_api/watch_info.py

@@ -1,4 +1,3 @@
-from gshock_api.logger import logger
 
 class WATCH_MODEL:
     GA = 1

{gshock_api-2.0.26 → gshock_api-2.0.28/src/gshock_api.egg-info}/PKG-INFO

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

gshock_api-2.0.26/src/gshock_api/scanner.py

@@ -1,128 +0,0 @@
-import sys
-
-import asyncio
-from bleak import BleakScanner
-from gshock_api.watch_info import watch_info
-from gshock_api.logger import logger
-from bleak.backends.device import BLEDevice
-from bleak import BleakScanner, BLEDevice
-from bleak.exc import BleakError
-from typing import Optional
-
-class Scanner:
-    def __init__(self):
-        self._found_device: Optional[BLEDevice] = None
-        self._event = asyncio.Event()
-
-    async def scan(
-        self,
-        device_address: str | None = None,
-        watch_filter = None,
-        max_retries: int = 60,  # Optional: to prevent infinite loops
-    ) -> BLEDevice | None:
-        scanner = BleakScanner()
-
-        retries = 0
-        device = None
-
-        if device_address is None:
-            while retries < max_retries:
-                await asyncio.sleep(1)
-                try:                
-                    def casio_filter(device: BLEDevice, advertisement_data) -> bool:
-                        if not device.name:
-                            return False
-
-                        parts = device.name.split(" ", 1)
-                        if not parts:
-                            return False
-
-                        is_casio = parts[0].lower() == "casio"
-                        passed = is_casio and (watch_filter is None or watch_filter(device.name))
-                        return passed
-                    
-                    device = await scanner.find_device_by_filter(
-                        casio_filter,
-                        timeout=10,
-                    )
-
-                    if device:
-                        logger.info(f"✅ Found: {device.name} ({device.address})")
-                        watch_info.set_name_and_model(device.name)
-                        return device
-                    else:
-                        retries += 1
-                        logger.debug(f"⚠️ No matching device found, retry {retries}...")
-
-                except BleakError as e:
-                    logger.warning(f"⚠️ BLE scan error: {e}")
-                    retries += 1
-
-            logger.error("⚠️ Max retries reached. No device found.")
-            return None
-
-        else:
-            logger.info(f"⚠️ Waiting for specific device by address: {device_address}...")
-            try:
-                device = await scanner.find_device_by_address(
-                    device_address, timeout=sys.float_info.max
-                )
-            except BleakError as e:
-                logger.error(f"⚠️ Error finding device by address: {e}")
-                return None
-
-            if device is None:
-                logger.warning("⚠️ Device not found by address.")
-                return None
-
-            if any(device.name.lower().startswith(p.lower()) for p in excluded_watches):
-                logger.info(f"Excluded device found: {device.name}")
-                return None
-
-            watch_info.set_name_and_model(device.name)
-            return device
-
-    async def scan_with_discover(self, device_address: Optional[str] = None, excluded_watches: Optional[list[str]] = None) -> Optional[BLEDevice]:
-        if excluded_watches is None:
-            excluded_watches = []
-
-        logger.info("🔍 Scanning for CASIO device...")
-
-        try:
-            while True:
-                try:
-                    devices = await BleakScanner.discover(timeout=5.0)
-                except Exception as e:
-                    logger.warning(f"⚠️ Scan error: {e}")
-                    await asyncio.sleep(1)
-                    continue
-
-                if not devices:
-                    logger.debug("No BLE devices found.")
-                    await asyncio.sleep(1)
-                    continue
-
-                for device in devices:
-                    name = device.name or ""
-                    parts = name.split(" ", 1)
-                    is_casio = parts[0].lower() == "casio"
-                    is_excluded = len(parts) > 1 and parts[1] in excluded_watches
-                    if is_excluded:
-                        logger.info(f"{name} excluded!")
-
-                    if is_casio and not is_excluded:
-                        logger.info(f"✅ Found: {name} ({device.address})")
-                        watch_info.set_name_and_model(device.name)
-                        return device
-
-                await asyncio.sleep(1)  # ✅ Wait before next loop
-
-        except asyncio.CancelledError:
-            logger.info("🔁 Scan loop cancelled.")
-            raise
-
-        except Exception as e:
-            logger.exception(f"❌ Unexpected scan error: {e}")
-            return None
-    
-scanner = Scanner()