Scrameupeutchi/librespot-python
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixed the _pb2 suffix error and import errors

Browse Source
This commit is contained in:
Pawan Paudel
2021-05-25 21:26:56 +05:45
parent ee247d8a2b
commit 0214721dd7
47 changed files with 163 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
librespot/mercury/MercuryClient.py
View File

@@ -13,8 +13,8 @@ from librespot.crypto import Packet
from librespot.mercury import JsonMercuryRequest
from librespot.mercury import RawMercuryRequest
from librespot.mercury import SubListener
from librespot.proto import Mercury
from librespot.proto import Pubsub
from librespot.proto import Mercury_pb2
from librespot.proto import Pubsub_pb2
from librespot.standard import BytesInputStream
from librespot.standard import BytesOutputStream
from librespot.standard import Closeable
@@ -42,7 +42,7 @@ class MercuryClient(PacketsReceiver.PacketsReceiver, Closeable):
if len(response.payload) > 0:
for payload in response.payload:
sub = Pubsub.Subscription()
sub = Pubsub_pb2.Subscription()
sub.ParseFromString(payload)
self._subscriptions.append(
MercuryClient.InternalSubListener(sub.uri, listener, True))
@@ -150,7 +150,7 @@ class MercuryClient(PacketsReceiver.PacketsReceiver, Closeable):
self._partials.pop(seq)
header = Mercury.Header()
header = Mercury_pb2.Header()
header.ParseFromString(partial[0])
resp = MercuryClient.Response(header, partial)
@@ -257,7 +257,7 @@ class MercuryClient(PacketsReceiver.PacketsReceiver, Closeable):
payload: typing.List[bytes]
status_code: int
def __init__(self, header: Mercury.Header,
def __init__(self, header: Mercury_pb2.Header,
payload: typing.List[bytes]):
self.uri = header.uri
self.status_code = header.status_code

12
librespot/mercury/RawMercuryRequest.py
View File

@@ -1,13 +1,13 @@
import typing
from librespot.proto import Mercury
from librespot.proto import Mercury_pb2
class RawMercuryRequest:
header: Mercury.Header
header: Mercury_pb2.Header
payload: typing.List[bytes]
def __init__(self, header: Mercury.Header, payload: typing.List[bytes]):
def __init__(self, header: Mercury_pb2.Header, payload: typing.List[bytes]):
self.header = header
self.payload = payload
@@ -61,7 +61,7 @@ class RawMercuryRequest:
return self
def add_user_field(self,
field: Mercury.UserField = None,
field: Mercury_pb2.UserField = None,
key: str = None,
value: str = None):
if field is None and (key is None or value is None):
@@ -74,7 +74,7 @@ class RawMercuryRequest:
self.header_dict["user_fields"].append(field)
if key is not None and value is not None:
self.header_dict["user_fields"].append(
Mercury.UserField(key=key, value=value.encode()))
Mercury_pb2.UserField(key=key, value=value.encode()))
return self
def add_payload_part(self, part: bytes):
@@ -85,5 +85,5 @@ class RawMercuryRequest:
return self.add_payload_part(msg)
def build(self):
return RawMercuryRequest(Mercury.Header(**self.header_dict),
return RawMercuryRequest(Mercury_pb2.Header(**self.header_dict),
self.payload)