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

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

Browse Source
This commit is contained in:
deepsource-autofix[bot]
2021-12-26 05:05:38 +00:00
committed by GitHub
parent 414c8babeb
commit 129fb92511
3 changed files with 40 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
librespot/audio/__init__.py
View File

@@ -169,7 +169,6 @@ class AbsChunkedInputStream(io.BytesIO, HaltListener):
buffer.seek(0) buffer.seek(0)
self.__pos += buffer.getbuffer().nbytes self.__pos += buffer.getbuffer().nbytes
return buffer.read() return buffer.read()
else:
buffer = io.BytesIO() buffer = io.BytesIO()
chunk = int(self.__pos / (128 * 1024)) chunk = int(self.__pos / (128 * 1024))
chunk_off = int(self.__pos % (128 * 1024)) chunk_off = int(self.__pos % (128 * 1024))
@@ -718,10 +717,9 @@ class PlayableContentFeeder:
if type(playable_id) is TrackId: if type(playable_id) is TrackId:
return self.load_track(playable_id, audio_quality_picker, preload, return self.load_track(playable_id, audio_quality_picker, preload,
halt_listener) halt_listener)
elif type(playable_id) is EpisodeId: if type(playable_id) is EpisodeId:
return self.load_episode(playable_id, audio_quality_picker, return self.load_episode(playable_id, audio_quality_picker,
preload, halt_listener) 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, def load_stream(self, file: Metadata.AudioFile, track: Metadata.Track,
@@ -736,7 +734,7 @@ class PlayableContentFeeder:
response, preload, halt_lister) response, preload, halt_lister)
return CdnFeedHelper.load_episode(self.__session, episode, file, return CdnFeedHelper.load_episode(self.__session, episode, file,
response, preload, halt_lister) response, preload, halt_lister)
elif response.result == StorageResolve.StorageResolveResponse.Result.STORAGE: if response.result == StorageResolve.StorageResolveResponse.Result.STORAGE:
if track is None: if track is None:
pass pass
elif response.result == StorageResolve.StorageResolveResponse.Result.RESTRICTED: elif response.result == StorageResolve.StorageResolveResponse.Result.RESTRICTED:
@@ -753,7 +751,6 @@ class PlayableContentFeeder:
if episode.external_url: if episode.external_url:
return CdnFeedHelper.load_episode_external(self.__session, episode, return CdnFeedHelper.load_episode_external(self.__session, episode,
halt_listener) halt_listener)
else:
file = audio_quality_picker.get_file(episode.audio) file = audio_quality_picker.get_file(episode.audio)
if file is None: if file is None:
self.logger.fatal( self.logger.fatal(

7
librespot/core.py
View File

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

3
librespot/metadata.py
View File

@@ -38,9 +38,8 @@ class PlayableId:
return UnsupportedId(uri) return UnsupportedId(uri)
if TrackId.pattern.search(uri) is not None: if TrackId.pattern.search(uri) is not None:
return TrackId.from_uri(uri) 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) return EpisodeId.from_uri(uri)
else:
raise TypeError("Unknown uri: {}".format(uri)) raise TypeError("Unknown uri: {}".format(uri))
@staticmethod @staticmethod