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

Merge remote-tracking branch 'origin/rewrite' into rewrite

Browse Source
This commit is contained in:
kokarare1212
2021-09-13 06:48:23 +09:00
parent dc41f749bf 64d70f67ea
commit 928685f296
1 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
librespot/audio/__init__.py
View File

@@ -191,7 +191,8 @@ class AbsChunkedInputStream(io.BytesIO, HaltListener):
chunk += 1 chunk += 1
else: else:
self.check_availability(chunk, True, False) self.check_availability(chunk, True, False)
buffer.write(self.buffer()[chunk][chunk_off:chunk_off + __size]) buffer.write(self.buffer()[chunk][chunk_off:chunk_off +
__size])
buffer.seek(0) buffer.seek(0)
self.__pos += buffer.getbuffer().nbytes self.__pos += buffer.getbuffer().nbytes
return buffer.read() return buffer.read()
@@ -376,7 +377,8 @@ class CdnFeedHelper:
session: Session, session: Session,
episode: Metadata.Episode, episode: Metadata.Episode,
file: Metadata.AudioFile, file: Metadata.AudioFile,
resp_or_url: typing.Union[StorageResolve.StorageResolveResponse, str], preload: bool, resp_or_url: typing.Union[StorageResolve.StorageResolveResponse, str],
preload: bool,
halt_listener: HaltListener, halt_listener: HaltListener,
) -> PlayableContentFeeder.LoadedStream: ) -> PlayableContentFeeder.LoadedStream:
if type(resp_or_url) is str: if type(resp_or_url) is str:
@@ -396,7 +398,8 @@ class CdnFeedHelper:
episode, episode,
streamer, streamer,
normalization_data, normalization_data,
PlayableContentFeeder.Metrics(file.file_id, preload, -1 if preload else audio_key_time), PlayableContentFeeder.Metrics(file.file_id, preload,
-1 if preload else audio_key_time),
) )
@@ -716,7 +719,8 @@ class PlayableContentFeeder:
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: elif type(playable_id) is EpisodeId:
return self.load_episode(playable_id, audio_quality_picker, preload, halt_listener) return self.load_episode(playable_id, audio_quality_picker,
preload, halt_listener)
def load_stream(self, file: Metadata.AudioFile, track: Metadata.Track, def load_stream(self, file: Metadata.AudioFile, track: Metadata.Track,
episode: Metadata.Episode, preload: bool, episode: Metadata.Episode, preload: bool,
@@ -740,15 +744,20 @@ class PlayableContentFeeder:
else: else:
raise RuntimeError("Unknown result: {}".format(response.result)) raise RuntimeError("Unknown result: {}".format(response.result))
def load_episode(self, episode_id: EpisodeId, audio_quality_picker: AudioQualityPicker, preload: bool, halt_listener: HaltListener) -> LoadedStream: def load_episode(self, episode_id: EpisodeId,
audio_quality_picker: AudioQualityPicker, preload: bool,
halt_listener: HaltListener) -> LoadedStream:
episode = self.__session.api().get_metadata_4_episode(episode_id) episode = self.__session.api().get_metadata_4_episode(episode_id)
if episode.external_url: if episode.external_url:
pass pass
else: 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("Couldn't find any suitable audio file, available: {}".format(episode.audio)) self.logger.fatal(
return self.load_stream(file, None, episode, preload, halt_listener) "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, def load_track(self, track_id_or_track: typing.Union[TrackId,
Metadata.Track], Metadata.Track],