rdelaage
/
librespot-python
mirror of https://github.com/kokarare1212/librespot-python.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor unnecessary `else` / `elif` when `if` block has a `return` statement

This commit is contained in:
deepsource-autofix[bot] 2021-12-26 05:05:38 +00:00 committed by GitHub
parent 414c8babeb
commit 129fb92511
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
librespot/audio/__init__.py
View File

@ -169,33 +169,32 @@ class AbsChunkedInputStream(io.BytesIO, HaltListener):
buffer.seek(0)
self.__pos += buffer.getbuffer().nbytes
return buffer.read()
else:
buffer = io.BytesIO()
chunk = int(self.__pos / (128 * 1024))
chunk_off = int(self.__pos % (128 * 1024))
chunk_end = int(__size / (128 * 1024))
chunk_end_off = int(__size % (128 * 1024))
if chunk_end > self.size():
chunk_end = int(self.size() / (128 * 1024))
chunk_end_off = int(self.size() % (128 * 1024))
if chunk_off + __size > len(self.buffer()[chunk]):
buffer = io.BytesIO()
chunk = int(self.__pos / (128 * 1024))
chunk_off = int(self.__pos % (128 * 1024))
chunk_end = int(__size / (128 * 1024))
chunk_end_off = int(__size % (128 * 1024))
if chunk_end > self.size():
chunk_end = int(self.size() / (128 * 1024))
chunk_end_off = int(self.size() % (128 * 1024))
if chunk_off + __size > len(self.buffer()[chunk]):
self.check_availability(chunk, True, False)
buffer.write(self.buffer()[chunk][chunk_off:])
chunk += 1
while chunk <= chunk_end:
self.check_availability(chunk, True, False)
buffer.write(self.buffer()[chunk][chunk_off:])
if chunk == chunk_end:
buffer.write(self.buffer()[chunk][:chunk_end_off])
else:
buffer.write(self.buffer()[chunk])
chunk += 1
while chunk <= chunk_end:
self.check_availability(chunk, True, False)
if chunk == chunk_end:
buffer.write(self.buffer()[chunk][:chunk_end_off])
else:
buffer.write(self.buffer()[chunk])
chunk += 1
else:
self.check_availability(chunk, True, False)
buffer.write(self.buffer()[chunk][chunk_off:chunk_off +
__size])
buffer.seek(0)
self.__pos += buffer.getbuffer().nbytes
return buffer.read()
else:
self.check_availability(chunk, True, False)
buffer.write(self.buffer()[chunk][chunk_off:chunk_off +
__size])
buffer.seek(0)
self.__pos += buffer.getbuffer().nbytes
return buffer.read()
def notify_chunk_available(self, index: int) -> None:
self.available_chunks()[index] = True
@ -718,11 +717,10 @@ class PlayableContentFeeder:
if type(playable_id) is TrackId:
return self.load_track(playable_id, audio_quality_picker, preload,
halt_listener)
elif type(playable_id) is EpisodeId:
if type(playable_id) is EpisodeId:
return self.load_episode(playable_id, audio_quality_picker,
preload, halt_listener)
else:
raise TypeError("Unknown content: {}".format(playable_id))
raise TypeError("Unknown content: {}".format(playable_id))
def load_stream(self, file: Metadata.AudioFile, track: Metadata.Track,
episode: Metadata.Episode, preload: bool,
@ -736,7 +734,7 @@ class PlayableContentFeeder:
response, preload, halt_lister)
return CdnFeedHelper.load_episode(self.__session, episode, file,
response, preload, halt_lister)
elif response.result == StorageResolve.StorageResolveResponse.Result.STORAGE:
if response.result == StorageResolve.StorageResolveResponse.Result.STORAGE:
if track is None:
pass
elif response.result == StorageResolve.StorageResolveResponse.Result.RESTRICTED:
@ -753,14 +751,13 @@ class PlayableContentFeeder:
if episode.external_url:
return CdnFeedHelper.load_episode_external(self.__session, episode,
halt_listener)
else:
file = audio_quality_picker.get_file(episode.audio)
if file is None:
self.logger.fatal(
"Couldn't find any suitable audio file, available: {}".
format(episode.audio))
return self.load_stream(file, None, episode, preload,
halt_listener)
file = audio_quality_picker.get_file(episode.audio)
if file is None:
self.logger.fatal(
"Couldn't find any suitable audio file, available: {}".
format(episode.audio))
return self.load_stream(file, None, episode, preload,
halt_listener)
def load_track(self, track_id_or_track: typing.Union[TrackId,
Metadata.Track],

9
librespot/core.py
View File

@ -563,14 +563,13 @@ class MessageType(enum.Enum):
def parse(_typ: str):
if _typ == MessageType.MESSAGE.value:
return MessageType.MESSAGE
elif _typ == MessageType.PING.value:
if _typ == MessageType.PING.value:
return MessageType.PING
elif _typ == MessageType.PONG.value:
if _typ == MessageType.PONG.value:
return MessageType.PONG
elif _typ == MessageType.REQUEST.value:
if _typ == MessageType.REQUEST.value:
return MessageType.REQUEST
else:
raise TypeError("Unknown MessageType: {}".format(_typ))
raise TypeError("Unknown MessageType: {}".format(_typ))
class Session(Closeable, MessageListener, SubListener):

5
librespot/metadata.py
View File

@ -38,10 +38,9 @@ class PlayableId:
return UnsupportedId(uri)
if TrackId.pattern.search(uri) is not None:
return TrackId.from_uri(uri)
elif EpisodeId.pattern.search(uri) is not None:
if EpisodeId.pattern.search(uri) is not None:
return EpisodeId.from_uri(uri)
else:
raise TypeError("Unknown uri: {}".format(uri))
raise TypeError("Unknown uri: {}".format(uri))
@staticmethod
def is_supported(uri: str):