fixed the _pb2 suffix error and import errors

librespot/player/StateWrapper.py

@@ -7,11 +7,11 @@ from librespot.dealer import DealerClient
 from librespot.player import Player
 from librespot.player import PlayerConfiguration
 from librespot.player.state import DeviceStateHandler
-from librespot.proto import Connect
-from librespot.proto.Player import ContextPlayerOptions
-from librespot.proto.Player import PlayerState
-from librespot.proto.Player import Restrictions
-from librespot.proto.Player import Suppressions
+from librespot.proto import Connect_pb2
+from librespot.proto.Player_pb2 import ContextPlayerOptions
+from librespot.proto.Player_pb2 import PlayerState
+from librespot.proto.Player_pb2 import Restrictions
+from librespot.proto.Player_pb2 import Suppressions
 
 
 class StateWrapper(DeviceStateHandler.Listener, DealerClient.MessageListener):
@@ -52,7 +52,7 @@ class StateWrapper(DeviceStateHandler.Listener, DealerClient.MessageListener):
         self._device.add_listener(listener)
 
     def ready(self) -> None:
-        self._device.update_state(Connect.PutStateReason.NEW_DEVICE, 0,
+        self._device.update_state(Connect_pb2.PutStateReason.NEW_DEVICE, 0,
                                   self._state)
 
     def on_message(self, uri: str, headers: typing.Dict[str, str],

librespot/player/codecs/VorbisOnlyAudioQuality.py

@@ -6,7 +6,7 @@ import typing
 from librespot.audio.decoders.AudioQuality import AudioQuality
 from librespot.audio.format.AudioQualityPicker import AudioQualityPicker
 from librespot.audio.format.SuperAudioFormat import SuperAudioFormat
-from librespot.proto import Metadata
+from librespot.proto import Metadata_pb2
 
 
 class VorbisOnlyAudioQuality(AudioQualityPicker):
@@ -17,7 +17,7 @@ class VorbisOnlyAudioQuality(AudioQualityPicker):
         self.preferred = preferred
 
     @staticmethod
-    def get_vorbis_file(files: typing.List[Metadata.AudioFile]):
+    def get_vorbis_file(files: typing.List[Metadata_pb2.AudioFile]):
         for file in files:
             if (hasattr(file, "format") and SuperAudioFormat.get(file.format)
                     == SuperAudioFormat.VORBIS):
@@ -25,13 +25,13 @@ class VorbisOnlyAudioQuality(AudioQualityPicker):
 
         return None
 
-    def get_file(self, files: typing.List[Metadata.AudioFile]):
-        matches: typing.List[Metadata.AudioFile] = self.preferred.get_matches(
+    def get_file(self, files: typing.List[Metadata_pb2.AudioFile]):
+        matches: typing.List[Metadata_pb2.AudioFile] = self.preferred.get_matches(
             files)
-        vorbis: Metadata.AudioFile = VorbisOnlyAudioQuality.get_vorbis_file(
+        vorbis: Metadata_pb2.AudioFile = VorbisOnlyAudioQuality.get_vorbis_file(
             matches)
         if vorbis is None:
-            vorbis: Metadata.AudioFile = VorbisOnlyAudioQuality.get_vorbis_file(
+            vorbis: Metadata_pb2.AudioFile = VorbisOnlyAudioQuality.get_vorbis_file(
                 files)
             if vorbis is not None:
                 self._LOGGER.warning(

librespot/player/state/DeviceStateHandler.py

@@ -11,16 +11,16 @@ import urllib.parse
 from librespot.common import Utils
 from librespot.core import Session
 from librespot.player import PlayerConfiguration
-from librespot.proto import Connect
-from librespot.proto import Player
+from librespot.proto import Connect_pb2
+from librespot.proto import Player_pb2
 
 
 class DeviceStateHandler:
     _LOGGER: logging = logging.getLogger(__name__)
     _session: Session = None
-    _deviceInfo: Connect.DeviceInfo = None
+    _deviceInfo: Connect_pb2.DeviceInfo = None
     _listeners: typing.List[DeviceStateHandler.Listener] = []
-    _putState: Connect.PutStateRequest = None
+    _putState: Connect_pb2.PutStateRequest = None
     _putStateWorker: concurrent.futures.ThreadPoolExecutor = (
         concurrent.futures.ThreadPoolExecutor())
     _connectionId: str = None
@@ -28,7 +28,7 @@ class DeviceStateHandler:
     def __init__(self, session: Session, player, conf: PlayerConfiguration):
         self._session = session
         self._deviceInfo = None
-        self._putState = Connect.PutStateRequest()
+        self._putState = Connect_pb2.PutStateRequest()
 
     def _update_connection_id(self, newer: str) -> None:
         newer = urllib.parse.unquote(newer, "UTF-8")
@@ -48,9 +48,9 @@ class DeviceStateHandler:
 
     def update_state(
         self,
-        reason: Connect.PutStateReason,
+        reason: Connect_pb2.PutStateReason,
         player_time: int,
-        state: Player.PlayerState,
+        state: Player_pb2.PlayerState,
     ):
         if self._connectionId is None:
             raise TypeError()
@@ -67,7 +67,7 @@ class DeviceStateHandler:
 
         self._putStateWorker.submit(self._put_connect_state, self._putState)
 
-    def _put_connect_state(self, req: Connect.PutStateRequest):
+    def _put_connect_state(self, req: Connect_pb2.PutStateRequest):
         self._session.api().put_connect_state(self._connectionId, req)
         self._LOGGER.info("Put state. ts: {}, connId: {}, reason: {}".format(
             req.client_side_timestamp,