Fix freeze
This commit is contained in:
parent
ba0428823c
commit
bd71ecde46
|
@ -77,13 +77,14 @@ class ChannelManager(Closeable, PacketsReceiver):
|
||||||
channel_manager: ChannelManager
|
channel_manager: ChannelManager
|
||||||
chunk_id: int
|
chunk_id: int
|
||||||
q = queue.Queue()
|
q = queue.Queue()
|
||||||
__buffer = io.BytesIO()
|
__buffer: io.BytesIO
|
||||||
__chunk_index: int
|
__chunk_index: int
|
||||||
__file: AudioFile
|
__file: AudioFile
|
||||||
__header: bool = True
|
__header: bool = True
|
||||||
|
|
||||||
def __init__(self, channel_manager: ChannelManager, file: AudioFile,
|
def __init__(self, channel_manager: ChannelManager, file: AudioFile,
|
||||||
chunk_index: int):
|
chunk_index: int):
|
||||||
|
self.__buffer = io.BytesIO()
|
||||||
self.channel_manager = channel_manager
|
self.channel_manager = channel_manager
|
||||||
self.__file = file
|
self.__file = file
|
||||||
self.__chunk_index = chunk_index
|
self.__chunk_index = chunk_index
|
||||||
|
|
|
@ -518,9 +518,10 @@ class EventService(Closeable):
|
||||||
raise NotImplementedError
|
raise NotImplementedError
|
||||||
|
|
||||||
class EventBuilder:
|
class EventBuilder:
|
||||||
body = io.BytesIO()
|
body: io.BytesIO
|
||||||
|
|
||||||
def __init__(self, event_type: EventService.Type):
|
def __init__(self, event_type: EventService.Type):
|
||||||
|
self.body = io.BytesIO()
|
||||||
self.append_no_delimiter(event_type.value[0])
|
self.append_no_delimiter(event_type.value[0])
|
||||||
self.append(event_type.value[1])
|
self.append(event_type.value[1])
|
||||||
|
|
||||||
|
@ -580,21 +581,21 @@ class Session(Closeable, MessageListener, SubListener):
|
||||||
scheduler = sched.scheduler(time.time)
|
scheduler = sched.scheduler(time.time)
|
||||||
__api: ApiClient
|
__api: ApiClient
|
||||||
__ap_welcome: Authentication.APWelcome
|
__ap_welcome: Authentication.APWelcome
|
||||||
__audio_key_manager: typing.Union[AudioKeyManager, None]
|
__audio_key_manager: typing.Union[AudioKeyManager, None] = None
|
||||||
__auth_lock = threading.Condition()
|
__auth_lock = threading.Condition()
|
||||||
__auth_lock_bool = False
|
__auth_lock_bool = False
|
||||||
__cache_manager: typing.Union[CacheManager, None]
|
__cache_manager: typing.Union[CacheManager, None]
|
||||||
__cdn_manager: typing.Union[CdnManager, None]
|
__cdn_manager: typing.Union[CdnManager, None]
|
||||||
__channel_manager: typing.Union[ChannelManager, None]
|
__channel_manager: typing.Union[ChannelManager, None] = None
|
||||||
__client: typing.Union[requests.Session, None]
|
__client: typing.Union[requests.Session, None]
|
||||||
__closed = False
|
__closed = False
|
||||||
__closing = False
|
__closing = False
|
||||||
__content_feeder: typing.Union[PlayableContentFeeder, None]
|
__content_feeder: typing.Union[PlayableContentFeeder, None]
|
||||||
__dealer_client: typing.Union[DealerClient, None]
|
__dealer_client: typing.Union[DealerClient, None] = None
|
||||||
__event_service: typing.Union[EventService, None]
|
__event_service: typing.Union[EventService, None] = None
|
||||||
__keys: DiffieHellman
|
__keys: DiffieHellman
|
||||||
__mercury_client: MercuryClient
|
__mercury_client: MercuryClient
|
||||||
__receiver: typing.Union[Receiver, None]
|
__receiver: typing.Union[Receiver, None] = None
|
||||||
__search: typing.Union[SearchManager, None]
|
__search: typing.Union[SearchManager, None]
|
||||||
__server_key = b"\xac\xe0F\x0b\xff\xc20\xaf\xf4k\xfe\xc3\xbf\xbf\x86=" \
|
__server_key = b"\xac\xe0F\x0b\xff\xc20\xaf\xf4k\xfe\xc3\xbf\xbf\x86=" \
|
||||||
b"\xa1\x91\xc6\xcc3l\x93\xa1O\xb3\xb0\x16\x12\xac\xacj" \
|
b"\xa1\x91\xc6\xcc3l\x93\xa1O\xb3\xb0\x16\x12\xac\xacj" \
|
||||||
|
@ -1004,6 +1005,7 @@ class Session(Closeable, MessageListener, SubListener):
|
||||||
elif packet.is_cmd(Packet.Type.auth_failure):
|
elif packet.is_cmd(Packet.Type.auth_failure):
|
||||||
ap_login_failed = Keyexchange.APLoginFailed()
|
ap_login_failed = Keyexchange.APLoginFailed()
|
||||||
ap_login_failed.ParseFromString(packet.payload)
|
ap_login_failed.ParseFromString(packet.payload)
|
||||||
|
self.close()
|
||||||
raise Session.SpotifyAuthenticationException(ap_login_failed)
|
raise Session.SpotifyAuthenticationException(ap_login_failed)
|
||||||
else:
|
else:
|
||||||
raise RuntimeError("Unknown CMD 0x" + packet.cmd.hex())
|
raise RuntimeError("Unknown CMD 0x" + packet.cmd.hex())
|
||||||
|
@ -1056,7 +1058,10 @@ class Session(Closeable, MessageListener, SubListener):
|
||||||
return self
|
return self
|
||||||
|
|
||||||
class Accumulator:
|
class Accumulator:
|
||||||
__buffer = io.BytesIO()
|
__buffer: io.BytesIO
|
||||||
|
|
||||||
|
def __init__(self):
|
||||||
|
self.__buffer = io.BytesIO()
|
||||||
|
|
||||||
def read(self) -> bytes:
|
def read(self) -> bytes:
|
||||||
"""
|
"""
|
||||||
|
@ -1433,10 +1438,11 @@ class Session(Closeable, MessageListener, SubListener):
|
||||||
)
|
)
|
||||||
|
|
||||||
class ConnectionHolder:
|
class ConnectionHolder:
|
||||||
__buffer = io.BytesIO()
|
__buffer: io.BytesIO
|
||||||
__socket: socket.socket
|
__socket: socket.socket
|
||||||
|
|
||||||
def __init__(self, sock: socket.socket):
|
def __init__(self, sock: socket.socket):
|
||||||
|
self.__buffer = io.BytesIO()
|
||||||
self.__socket = sock
|
self.__socket = sock
|
||||||
|
|
||||||
@staticmethod
|
@staticmethod
|
||||||
|
|
Loading…
Reference in New Issue