spotifywebapiPython 1.0.271__py3-none-any.whl → 1.0.273__py3-none-any.whl

spotifywebapipython/spotifyclient.py

@@ -224,6 +224,7 @@ class SpotifyClient:
         self._AuthClient:AuthClient = None
         self._ConfigurationCache:dict = {}
         self._ConfigurationDataPath:str = None
+        self._ConfigurationData_RLock:threading.RLock = threading.RLock()
         self._DefaultDeviceId:str = None
         self._HasSpotifyWebPlayerCredentials:bool = False
         self._IsDisposed:bool = False
@@ -964,27 +965,30 @@ class SpotifyClient:
             _logsi.LogVerbose("Config data storage key: \"%s\"" % (dataKey))           
             _logsi.LogVerbose("Config data storage file path: \"%s\"" % (self._ConfigurationDataPath))
             
-            # does the config data file exist?
-            if os.path.exists(self._ConfigurationDataPath):
+            # make the following thread-safe, so we don't read / write the config at the same time.
+            with self._ConfigurationData_RLock:
 
-                # open the config data storage file, and load it's contents.
-                _logsi.LogVerbose("Opening config data storage file")
-                with open(self._ConfigurationDataPath, 'r') as f:
+                # does the config data file exist?
+                if os.path.exists(self._ConfigurationDataPath):
+
+                    # open the config data storage file, and load it's contents.
+                    _logsi.LogVerbose("Opening config data storage file")
+                    with open(self._ConfigurationDataPath, 'r') as f:
                     
-                    dataKeys = json.load(f)
+                        dataKeys = json.load(f)
 
-                    # if config data key exists then return its data; otherwise, return the default.
-                    if dataKey in dataKeys:
-                        _logsi.LogDictionary(SILevel.Verbose, "Data was loaded from config data storage file for key: \"%s\"" % (dataKey), dataKeys[dataKey], prettyPrint=True)
-                        return dataKeys[dataKey]
-                    else:
-                        _logsi.LogVerbose("DataKey was not found in config data storage file for key: \"%s\"" % (dataKey))           
-                        return defaultValue
+                        # if config data key exists then return its data; otherwise, return the default.
+                        if dataKey in dataKeys:
+                            _logsi.LogDictionary(SILevel.Verbose, "Data was loaded from config data storage file for key: \"%s\"" % (dataKey), dataKeys[dataKey], prettyPrint=True)
+                            return dataKeys[dataKey]
+                        else:
+                            _logsi.LogVerbose("DataKey was not found in config data storage file for key: \"%s\"" % (dataKey))           
+                            return defaultValue
 
-            else:
+                else:
 
-                _logsi.LogVerbose("Config data storage file was not found: \"%s\"" % (self._ConfigurationDataPath))           
-                return defaultValue
+                    _logsi.LogVerbose("Config data storage file was not found: \"%s\"" % (self._ConfigurationDataPath))           
+                    return defaultValue
 
         except Exception as ex:
             
@@ -1027,26 +1031,29 @@ class SpotifyClient:
             else:
                 _logsi.LogValue(SILevel.Verbose, "Config data storage value (non-dict)", dataValue)
 
-            dataKeys:dict = {}
+            # make the following thread-safe, so we don't read / write the config at the same time.
+            with self._ConfigurationData_RLock:
+
+                dataKeys:dict = {}
         
-            # does the config data storage file exist?
-            if os.path.exists(self._ConfigurationDataPath):
+                # does the config data storage file exist?
+                if os.path.exists(self._ConfigurationDataPath):
                 
-                # open the config data storage file, and load it's contents.
-                #_logsi.LogVerbose("Loading config data storage file contents")
-                with open(self._ConfigurationDataPath, 'r') as f:
-                    dataKeys = json.load(f)
+                    # open the config data storage file, and load it's contents.
+                    #_logsi.LogVerbose("Loading config data storage file contents")
+                    with open(self._ConfigurationDataPath, 'r') as f:
+                        dataKeys = json.load(f)
                     
-            if dataValue is not None:
+                if dataValue is not None:
                                
-                # store the config data for the key.
-                #_logsi.LogVerbose("Updating config key value in config data storage")
-                dataKeys[dataKey] = dataValue
-
-            # save the config data storage file changes.
-            _logsi.LogVerbose("Saving config key data to disk: \"%s\"" % (dataKey))
-            with open(self._ConfigurationDataPath, 'w') as f:
-                json.dump(dataKeys, f, indent=4, sort_keys=True)
+                    # store the config data for the key.
+                    #_logsi.LogVerbose("Updating config key value in config data storage")
+                    dataKeys[dataKey] = dataValue
+
+                # save the config data storage file changes.
+                _logsi.LogVerbose("Saving config key data to disk: \"%s\"" % (dataKey))
+                with open(self._ConfigurationDataPath, 'w') as f:
+                    json.dump(dataKeys, f, indent=4, sort_keys=True)
 
         except Exception as ex:
             

spotifywebapipython/spotifyconnect/spotifyconnectzeroconflistener.py

@@ -4,6 +4,7 @@ from zeroconf import Zeroconf, ServiceInfo, ServiceStateChange, IPVersion
 
 # our package imports.
 from spotifywebapipython.models import ZeroconfProperty, ZeroconfDiscoveryResult
+from spotifywebapipython.sautils import get_source_ip
 # note - cannot reference `SpotifyConnectDirectoryTask` due to circular import!
 # from .SpotifyConnectDirectoryTask import SpotifyConnectDirectoryTask
 
@@ -109,6 +110,24 @@ class SpotifyConnectZeroconfListener:
             
             # trace.
             _logsi.LogObject(SILevel.Debug, "Spotify Connect Zeroconf service details: \"%s\" (%s) (serviceinfo object)" % (deviceName, serviceInfo.name), serviceInfo) 
+
+            # get originating source ip address for each discovered address.
+            # this will determine if a discovered address is on the same subnet or not.
+            # we will not use the address if it's not on the same subnet, as Spotify Connect
+            # requires discovered devices to be on the same subnet.
+            # Spotify Connect Zeroconf discovery IP Address Name for ipAddr "172.30.32.1" = "192.168.1.1"
+            ipAddressVerified:str = None
+            for ipAddr in ipAddressList:
+                ipAddrSource = get_source_ip(ipAddr)
+                _logsi.LogVerbose("Spotify Connect Zeroconf discovery is verifying IP Address \"%s\" from Source IP \"%s\" for device name \"%s\"" % (ipAddr, ipAddrSource, deviceName))
+                if ipAddrSource is not None:
+                    if ipAddrSource.count(".") == 3:
+                        lastDotIdx = ipAddrSource.rfind(".")
+                        if (lastDotIdx > -1) and (len(ipAddr) >= lastDotIdx):
+                            if ipAddrSource[0:lastDotIdx] == ipAddr[0:lastDotIdx]:
+                                ipAddressVerified = ipAddr
+                                _logsi.LogVerbose("Spotify Connect Zeroconf discovery will use device IP Address \"%s\" for device name \"%s\"" % (ipAddressVerified, deviceName))
+                                break    # use the first one that matches the same subnet.
             
             # create new discovery result instance.
             result:ZeroconfDiscoveryResult = ZeroconfDiscoveryResult()
@@ -116,6 +135,8 @@ class SpotifyConnectZeroconfListener:
             result.Domain = '.local'
             for item in ipAddressList:
                 result.HostIpAddresses.append(item)
+            if (len(result.HostIpAddresses) > 1): # only use verified address if more than 1 address discovered.
+                result.HostIpAddress = ipAddressVerified
             result.HostIpPort = serviceInfo.port
             result.HostTTL = serviceInfo.host_ttl
             result.Key = serviceInfo.key

{spotifywebapipython-1.0.271.dist-info → spotifywebapipython-1.0.273.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: spotifywebapipython
-Version: 1.0.271
+Version: 1.0.273
 Summary: Spotify Web API Python3 Library
 Author: Todd Lucas
 Author-email: <thlucas@yahoo.com>

{spotifywebapipython-1.0.271.dist-info → spotifywebapipython-1.0.273.dist-info}/RECORD

@@ -1,36 +1,36 @@
 spotifywebapipython/__init__.py,sha256=ka7F2AsT-UU7KSYKBnfgl5Trojcep5aQspLutg8D-2k,1306
-spotifywebapipython/const.py,sha256=uzm50WWdO10aWSjv7JIVs7snQXQnakWCnigBhMbkLbw,4100
+spotifywebapipython/const.py,sha256=8oP375Os1hsmY31bHb1SiCfs6zxd6WVe0wlth3B6ZdQ,4100
 spotifywebapipython/saappmessages.py,sha256=mVprjpd5CdD8kYeAkLzRvMvIQPmaYtH4UCP5my3QhSk,5065
-spotifywebapipython/sautils.py,sha256=j3f_Lu3Tb5D7-Gd2rJ2Ep901W-4XDp6Vq6XXVl8DX5I,8098
+spotifywebapipython/sautils.py,sha256=LZF3UvxaBK35WIg1hO37nbW8j1y-M-oOxRbi1dPR39w,8746
 spotifywebapipython/spotifyapierror.py,sha256=23_CYlxWN0BceYYCLpBpunl55vEwPr_wFf34l74xzeA,1855
 spotifywebapipython/spotifyapimessage.py,sha256=wCnW8jYMLS3x9kjyXPgXXZqaf1HeMTTXzU8u_Dm5pfA,8447
 spotifywebapipython/spotifyauthtoken.py,sha256=iVg2Pa5mfMqYe4qgc5H8td6JzJlaDqk4vMEhH5LmtfI,9289
-spotifywebapipython/spotifyclient.py,sha256=edXzv4wvu2pEfAxdfXAMlS8-28c0mTjGWxV0WnKRrKI,900532
+spotifywebapipython/spotifyclient.py,sha256=5F1so7SdO8iYVl45El7GxK2r55dtJMlurHZmHXLQgmc,901035
 spotifywebapipython/spotifydiscovery.py,sha256=cyysxl8PQj9yGHVbaqhSF3SStlrp-NvfGAudM-dDmg0,20290
 spotifywebapipython/spotifymediatypes.py,sha256=hMjkxhbfTtks0_P8BKmY7qg3EmB2zhH3RT0DbEpb_2s,1628
 spotifywebapipython/spotifytypeprefixes.py,sha256=3yfpxKF7jF694qBuo-PbKYvm70YwwdBoGj9enOpWsAg,1375
 spotifywebapipython/spotifywebapiauthenticationerror.py,sha256=5A0MKvYo3Ypv0ZeSSfLHuFLwzoUUu044bBoUgMfNXNw,3940
 spotifywebapipython/spotifywebapierror.py,sha256=5cga9213J_nFQ0UX4vSn3dpyinASKTRiH0wAR4nLjvs,3147
 spotifywebapipython/spotifywebplayertoken.py,sha256=axj1j1lM7COiiZfpElkJRdnk4AmE6bAQcjKshUIz1Nk,35813
-spotifywebapipython/docs/__init__.html,sha256=i_KJOOg9faSAQAHQd2ZVZG_k8O-zIyp5ZgGO8FpnSLI,189158
+spotifywebapipython/docs/__init__.html,sha256=lrPl2UUBlZh4Fk1JGqXeTRo-AQXsZ10sTrSg3yqRXk4,189948
 spotifywebapipython/docs/codecopy.js,sha256=ryuoZwLIL03YitjjFzn49UO5ta7-OBos6LNA3qHhFzs,3120
-spotifywebapipython/docs/index.html,sha256=5II2gcv5RHgaO_C8d7GE0aK1O4-xSj1irJMBYLS5dk8,48779
-spotifywebapipython/docs/search.js,sha256=lU92TIzxFYH0FZpmt-w3-1jp5aC2WSGBaAqf3Wzr8Mk,9151303
+spotifywebapipython/docs/index.html,sha256=MyO_pTnOe2Q023BfcPHb6kedmJH2raTY-OHF5NeTMAA,48779
+spotifywebapipython/docs/search.js,sha256=9Q3ewHFsndlyJ7GIzJS3M40--ZmacLvrPtY8DwXxErg,9156714
 spotifywebapipython/docs/spotifywebapipython.ico,sha256=YImj39fqqSPSuB2-sMDlUYDd6YwRfQeJRtq4FjwWglg,16410
 spotifywebapipython/docs/spotifywebapipython_OLD.ico,sha256=YIv5LjcD4bTIJQSOr8jjwbWaeB3QkElRwkTOePiGbZo,14904
-spotifywebapipython/docs/spotifywebapipython/const.html,sha256=2mAnx4sG9Vsz0IgdYF1rDVFmjOntMKdcUrGJtxa1_W0,60537
-spotifywebapipython/docs/spotifywebapipython/saappmessages.html,sha256=6llXoqrtQ4szyl0Iea1-hK-B_ppcePyrFnV9qt7SUmo,62358
-spotifywebapipython/docs/spotifywebapipython/sautils.html,sha256=6jGK5BkOUsPd87FFtIDTh7SH2BuAW36SK6BEqoAdeN8,61063
-spotifywebapipython/docs/spotifywebapipython/spotifyapierror.html,sha256=Tc5GkhJ-QS2m2-BywLo27iEWKyfZXwX2NbuN_mJrfPE,48054
-spotifywebapipython/docs/spotifywebapipython/spotifyapimessage.html,sha256=ZK5V6i8KCu0n4czfD7XTBFZ-_N1YTehkl2vbThvTg70,59210
-spotifywebapipython/docs/spotifywebapipython/spotifyauthtoken.html,sha256=Q5m_KsggKEqN6N3kKeb9m9lSw176gpuFCkTxbTvWlNY,59256
-spotifywebapipython/docs/spotifywebapipython/spotifyclient.html,sha256=o9e1VVuCXmM51CKwWtCwx4Al787KiUNKfun56AIi5xo,1667177
-spotifywebapipython/docs/spotifywebapipython/spotifydiscovery.html,sha256=XuIzD-Ul_At3mi4PN_-EjP8GKuT9ASe2mgKRNmWEzS8,57662
-spotifywebapipython/docs/spotifywebapipython/spotifymediatypes.html,sha256=vyiH7w5ACg-ATbqXMBUbhAckGR_X0UZv7LaOiALEyOQ,51532
-spotifywebapipython/docs/spotifywebapipython/spotifytypeprefixes.html,sha256=YjnHbcdmtzzTHmyZR5SXMKNCNixvylAEcDUn8TobCcA,52401
-spotifywebapipython/docs/spotifywebapipython/spotifywebapiauthenticationerror.html,sha256=t30e7qXagK783JUlQK3E8c9qf0zxAZgxWPPmzAMFUMA,52174
-spotifywebapipython/docs/spotifywebapipython/spotifywebapierror.html,sha256=TLAo5SsUB4fgqItB6vj1A3F1qHyD2iJJ5JOh202cB-w,50592
-spotifywebapipython/docs/spotifywebapipython/spotifywebplayertoken.html,sha256=AMeiBdr1kYdxyfkEuYb1cBYyASDHYoXqEcUAHUIHb8U,62204
+spotifywebapipython/docs/spotifywebapipython/const.html,sha256=uA4aSw56JWEOVG9yuYWiHkgtzQQLhwCt1hZuT4huev4,60537
+spotifywebapipython/docs/spotifywebapipython/saappmessages.html,sha256=aYagyGIS33pOd2nql6B9IKlGpqgijSxI_iGuZqUi1gw,62358
+spotifywebapipython/docs/spotifywebapipython/sautils.html,sha256=XJCU_qfYVhGMMZ-hLvZC_uMQj8yLl4FMBcRAsmtZUZw,62031
+spotifywebapipython/docs/spotifywebapipython/spotifyapierror.html,sha256=11bJWINLI6OJJVqeK0PXYPSqD3ty97msys1_NAqxdJM,48054
+spotifywebapipython/docs/spotifywebapipython/spotifyapimessage.html,sha256=LrvPGPT1wbbLffRDXoAvgfpA0PhGGyOqkCyv45kk9hU,59210
+spotifywebapipython/docs/spotifywebapipython/spotifyauthtoken.html,sha256=wPTL_yholTpYc2q0Sea8QVDq2-lDjOtcXf7gd1KeH6M,59256
+spotifywebapipython/docs/spotifywebapipython/spotifyclient.html,sha256=jTtKnuKuU-u8XUhC-UEwd_-ytno3LWdxhP6LKEBxx4M,1667177
+spotifywebapipython/docs/spotifywebapipython/spotifydiscovery.html,sha256=9IXRdnpRGD4n4HEJqLuXWPeg602rDQv7DoZRq6zCD4g,57662
+spotifywebapipython/docs/spotifywebapipython/spotifymediatypes.html,sha256=RSd_qiBEkDJeGIBfuxTm-AdH2C5-cHpCS_HHTZWW_Ug,51532
+spotifywebapipython/docs/spotifywebapipython/spotifytypeprefixes.html,sha256=zzCw1fn3WubRUO_NDSw1OOiaGZzrKuwY1AeVTdYZ_2A,52401
+spotifywebapipython/docs/spotifywebapipython/spotifywebapiauthenticationerror.html,sha256=gmzjrJ8GKag7TfP0wDRLz05sc1HqvOj0N0paEWW2ILs,52174
+spotifywebapipython/docs/spotifywebapipython/spotifywebapierror.html,sha256=Tz27uWAyVNaMUnHaWuVKzW-6kj_UmUNupP_szPAnBpw,50592
+spotifywebapipython/docs/spotifywebapipython/spotifywebplayertoken.html,sha256=rCAoHY67tZbghUATzKqoNq4Fi_Lef3joK9etpszmxJg,62204
 spotifywebapipython/models/__init__.py,sha256=RwRQhUX-6EUs8XvStVFpR8EPwoqIAz9K6ref-28qHKI,4423
 spotifywebapipython/models/album.py,sha256=U3Pdw0-EL33LdkeiN31fjZ23rlLk6DNGV8jRmZU7EyQ,5170
 spotifywebapipython/models/albumpagesaved.py,sha256=SBYMhkh5ZsMrRAXl-cm9zsxMDh8gO190ENq6Py2TyGY,2417
@@ -117,7 +117,7 @@ spotifywebapipython/spotifyconnect/spotifyconnectzeroconfcastlistener.py,sha256=
 spotifywebapipython/spotifyconnect/spotifyconnectzeroconfcastmultizonecontrollerlistener.py,sha256=AA-XxS6AptJWzyO2zsM9DA5ioCncJBKDTpJkr_aN9IM,12352
 spotifywebapipython/spotifyconnect/spotifyconnectzeroconfcastmultizonemanagerlistener.py,sha256=k3wMC80Z7jBXYwiw9jq-oixRsum7E_vdHzwEgvcGbiw,18918
 spotifywebapipython/spotifyconnect/spotifyconnectzeroconfexceptions.py,sha256=aesGauxMoKupdTPR5rL2-rXBC3SEvH_9bQQx2Vh-abs,524
-spotifywebapipython/spotifyconnect/spotifyconnectzeroconflistener.py,sha256=JJovru9o_ie_i9eYb-eZJlPjM-0TQmqU-q3n9F0U-AE,14561
+spotifywebapipython/spotifyconnect/spotifyconnectzeroconflistener.py,sha256=yhz1DU3cDRLG4ymCy2v5d3gUXrvNB2CNlhgqG9p6-yM,16208
 spotifywebapipython/vibrant/__init__.py,sha256=x3yGfhH0ydjWTSILADuwQXaoLvpkV2EM0T_gyZ5aX38,712
 spotifywebapipython/vibrant/colorthieffast.py,sha256=hMPL1yLeCMj6KXpq5V_Pp8eYkvB_8NlA7w95LRh3f1A,21736
 spotifywebapipython/vibrant/generator.py,sha256=UFLketHF_gAjjC-VQCP8vCUFCgZEYxqN91m1_IeOtj0,7462
@@ -137,8 +137,8 @@ spotifywebapipython/zeroconfapi/zeroconfgetinfo.py,sha256=APayso_F7lCsdzzrkescgd
 spotifywebapipython/zeroconfapi/zeroconfgetinfoalias.py,sha256=FZJM23HIPJSfhXIC3-EuS1XhawheoG5maSp7__k4yBo,2932
 spotifywebapipython/zeroconfapi/zeroconfgetinfodrmmediaformat.py,sha256=c5uk8ljsIuBK3w2jahHKQuoWvm245LOjUBitetXx5Mo,2347
 spotifywebapipython/zeroconfapi/zeroconfresponse.py,sha256=mAPIDj5MG53x8peiScrp7OJblwy_o_Sto4wqE0rGujU,6445
-spotifywebapipython-1.0.271.dist-info/LICENSE,sha256=KGcc9g0zwqNLcWnSn_ezv1UtKyhMENFhvtixpxUPNsE,1177
-spotifywebapipython-1.0.271.dist-info/METADATA,sha256=tnqt9be9t9pqJhUlw5xADBNPM1_FvpEA8zI_auwRyZU,11644
-spotifywebapipython-1.0.271.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
-spotifywebapipython-1.0.271.dist-info/top_level.txt,sha256=jTBLFlijKTesYh2dteAz4vb17qjaqWKeDjpnnwTcrjs,20
-spotifywebapipython-1.0.271.dist-info/RECORD,,
+spotifywebapipython-1.0.273.dist-info/LICENSE,sha256=KGcc9g0zwqNLcWnSn_ezv1UtKyhMENFhvtixpxUPNsE,1177
+spotifywebapipython-1.0.273.dist-info/METADATA,sha256=RAKNhVpYfHllZpZ6MPnCEdL_oQ5FH_tZ919ES1UGq7M,11644
+spotifywebapipython-1.0.273.dist-info/WHEEL,sha256=yQN5g4mg4AybRjkgi-9yy4iQEFibGQmlz78Pik5Or-A,92
+spotifywebapipython-1.0.273.dist-info/top_level.txt,sha256=jTBLFlijKTesYh2dteAz4vb17qjaqWKeDjpnnwTcrjs,20
+spotifywebapipython-1.0.273.dist-info/RECORD,,