spotifywebapiPython 1.0.157__py3-none-any.whl → 1.0.159__py3-none-any.whl

spotifywebapipython/spotifyconnect/spotifyconnectzeroconfcastlistener.py

@@ -35,7 +35,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
     def __init__(
         self, 
         parentDirectory,
-        zeroconf_Lock:threading.Lock,
+        zeroconf_RLock:threading.RLock,
         ) -> None:
         """
         Initializes a new instance of the class.
@@ -43,7 +43,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
         Args:
             parentDirectory (SpotifyConnectDirectoryTask):
                 Parent SpotifyConnectDirectoryTask instance.
-            zeroconf_Lock (threading.Lock):
+            zeroconf_RLock (threading.RLock):
                 Lock object used to enforce thread-safe updates.
         """
         # invoke base class method.
@@ -51,7 +51,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
 
         # initialize storage.
         self._ParentDirectory = parentDirectory
-        self._Zeroconf_Lock:threading.Lock = zeroconf_Lock
+        self._Zeroconf_RLock:threading.RLock = zeroconf_RLock
 
 
     def _GetZeroconfDiscoveryResult(
@@ -158,7 +158,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
                 First known MDNS service name or host:port.
         """
         # use lock, as multiple threads could be calling this method simultaneously.
-        with self._Zeroconf_Lock:
+        with self._Zeroconf_RLock:
 
             # copy passed parameters to thread-safe storage.
             argsUuid:UUID = uuid
@@ -216,7 +216,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
                 CastInfo for the service to aid cleanup.
         """
         # use lock, as multiple threads could be calling this method simultaneously.
-        with self._Zeroconf_Lock:
+        with self._Zeroconf_RLock:
                 
             # copy passed parameters to thread-safe storage.
             argsUuid:UUID = uuid
@@ -278,7 +278,7 @@ class SpotifyConnectZeroconfCastListener(AbstractCastListener):
                 MDNS service name or host:port.
         """
         # use lock, as multiple threads could be calling this method simultaneously.
-        with self._Zeroconf_Lock:
+        with self._Zeroconf_RLock:
                 
             # copy passed parameters to thread-safe storage.
             argsUuid:UUID = uuid

spotifywebapipython/spotifyconnect/spotifyconnectzeroconflistener.py

@@ -48,7 +48,7 @@ class SpotifyConnectZeroconfListener:
     def __init__(
         self, 
         parentDirectory,
-        zeroconf_Lock:threading.Lock,
+        zeroconf_RLock:threading.RLock,
         ) -> None:
         """
         Initializes a new instance of the class.
@@ -56,7 +56,7 @@ class SpotifyConnectZeroconfListener:
         Args:
             parentDirectory (SpotifyConnectDirectoryTask):
                 Parent SpotifyConnectDirectoryTask instance.
-            zeroconf_Lock (threading.Lock):
+            zeroconf_RLock (threading.RLock):
                 Lock object used to enforce thread-safe updates.
         """
         # invoke base class method.
@@ -64,7 +64,7 @@ class SpotifyConnectZeroconfListener:
 
         # initialize storage.
         self._ParentDirectory = parentDirectory
-        self._Zeroconf_Lock:threading.Lock = zeroconf_Lock
+        self._Zeroconf_RLock:threading.RLock = zeroconf_RLock
 
 
     def _GetZeroconfDiscoveryResult(
@@ -182,7 +182,7 @@ class SpotifyConnectZeroconfListener:
                 The type of service state change (add, remove, update).
         """
         # use lock, as multiple threads could be calling this method simultaneously.
-        with self._Zeroconf_Lock:
+        with self._Zeroconf_RLock:
 
             # copy passed parameters to thread-safe storage.
             serviceType:str = service_type
@@ -248,7 +248,7 @@ class SpotifyConnectZeroconfListener:
                 A description of the type of service state change (add, remove, update).
 
         This method will be called in a thread-safe manner, as the caller is using
-        the `Zeroconf_Lock` object to control access.
+        the `Zeroconf_RLock` object to control access.
         """
         # build discovery result instance from service state information.
         # if nothing returned, then don't bother!
@@ -282,7 +282,7 @@ class SpotifyConnectZeroconfListener:
                 A description of the type of service state change (add, remove, update).
 
         This method will be called in a thread-safe manner, as the caller is using
-        the `Zeroconf_Lock` object to control access.
+        the `Zeroconf_RLock` object to control access.
         """
         # for service removal notifications, there will be no zeroconf service info.
         # build discovery result instance from service state information.
@@ -322,7 +322,7 @@ class SpotifyConnectZeroconfListener:
                 A description of the type of service state change (add, remove, update).
 
         This method will be called in a thread-safe manner, as the caller is using
-        the `Zeroconf_Lock` object to control access.
+        the `Zeroconf_RLock` object to control access.
         """
         # build discovery result instance from service state information.
         # if nothing returned, then don't bother!

spotifywebapipython/spotifydiscovery.py

@@ -67,7 +67,7 @@ class SpotifyDiscovery:
         self._DiscoveryResults:list[ZeroconfDiscoveryResult] = []
         self._PrintToConsole:bool = printToConsole
         self._ZeroconfClient = zeroconfClient
-        self._Zeroconf_Lock = threading.Lock()
+        self._Zeroconf_RLock = threading.RLock()
 
 
     def __getitem__(self, key):
@@ -293,7 +293,7 @@ class SpotifyDiscovery:
         # > the only way to remove an entry is to kill the process the entry was created under!
         
         # enter the following section one thread at a time (threadsafe).
-        with self._Zeroconf_Lock:
+        with self._Zeroconf_RLock:
 
             # copy passed parameters to thread-safe storage.
             serviceType:str = service_type

spotifywebapipython/zeroconfapi/zeroconfconnect.py

@@ -1214,15 +1214,20 @@ class ZeroconfConnect:
             # try connecting to the device until we timeout or there are no more "connection refused" errors.
             loopTotalDelay:float = 0
             LOOP_DELAY:float = 0.25
-            LOOP_TIMEOUT:float = 2.0
+            LOOP_TIMEOUT:float = 1.0  # this is the number of tries (not seconds to wait); 1.0 = 4 tries, 2.0 = 8 tries, etc.
             while True:
 
                 try:
                         
+                    # if device connection was previously delayed, then log the info
+                    # as it may be helpful in debugging other issues.
+                    if (loopTotalDelay > 0):
+                        _logsi.LogVerbose("Re-trying to reach Spotify Connect device (ip=%s:%s) after %f seconds from initial request" % (self._HostIpAddress, self._HostIpPort, loopTotalDelay))
+
                     # execute spotify zeroconf api request.
                     response = requests.get(
                         self._Uri, 
-                        timeout=5,
+                        timeout=4,
                         headers=reqHeaders,
                         params=reqParams
                     )