Sourcery Starbot ⭐ refactored SoulMelody/hls-get #4
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
SourceryAI
commented
Mar 23, 2023
| kwargs = dict() | ||
| kwargs = {} |
There was a problem hiding this comment.
Function download refactored with the following changes:
- Replace
dict()with{}(dict-literal)
| self.key_cache = dict() | ||
| self.key_cache = {} |
There was a problem hiding this comment.
Function HLSDownloader.__init__ refactored with the following changes:
- Replace
dict()with{}(dict-literal)
Comment on lines
-48
to
-52
| wrapper = tenacity.retry( | ||
| return tenacity.retry( | ||
| wait=tenacity.wait_fixed(ctx.params['delay']), | ||
| stop=tenacity.stop_after_attempt(ctx.params['retry_times']) | ||
| stop=tenacity.stop_after_attempt(ctx.params['retry_times']), | ||
| ) | ||
| return wrapper |
There was a problem hiding this comment.
Function HLSDownloader.retry_wrapper refactored with the following changes:
- Inline variable that is immediately returned (
inline-immediately-returned-variable)
Comment on lines
-69
to
+70
| async with self.sem, self.session.get(link) as resp: | ||
| async with (self.sem, self.session.get(link) as resp): | ||
| resp.raise_for_status() | ||
| if text: | ||
| return await resp.text() | ||
| else: | ||
| return await resp.read() | ||
| return await resp.text() if text else await resp.read() |
There was a problem hiding this comment.
Function HLSDownloader.fetch_with_retry refactored with the following changes:
- Replace if statement with if expression (
assign-if-exp)
Comment on lines
-93
to
+130
| if not m3u8_obj.media_sequence: | ||
| if m3u8_obj.is_variant: | ||
| for i, playlist in enumerate(m3u8_obj.playlists): | ||
| click.echo( | ||
| f'{i}: bandwidth={playlist.stream_info.bandwidth} ' | ||
| f'resolution={playlist.stream_info.resolution} ' | ||
| f'codecs={playlist.stream_info.codecs} ' | ||
| ) | ||
| index = click.prompt( | ||
| 'Which playlist to download?', | ||
| type=click.Choice(list(range(len(m3u8_obj.playlists)))), | ||
| value_proc=int, | ||
| default=0 | ||
| if m3u8_obj.media_sequence: | ||
| click.echo('Live streaming media is not suppported!') | ||
|
|
||
| elif m3u8_obj.is_variant: | ||
| for i, playlist in enumerate(m3u8_obj.playlists): | ||
| click.echo( | ||
| f'{i}: bandwidth={playlist.stream_info.bandwidth} ' | ||
| f'resolution={playlist.stream_info.resolution} ' | ||
| f'codecs={playlist.stream_info.codecs} ' | ||
| ) | ||
| return await self.download(m3u8_obj.playlists[index].absolute_uri) | ||
| else: | ||
| tmp_list = m3u8.M3U8() | ||
| tmp_list.version = '3' | ||
| tmp_list.media_sequence = '0' | ||
| tmp_list.target_duration = m3u8_obj.target_duration | ||
| tmp_list.is_endlist = True | ||
| tasks = [] | ||
| os.makedirs(self.cache_dir, exist_ok=True) | ||
| bar = ShadyBar(self.name, max=len(m3u8_obj.segments), suffix='%(percent).1f%% - %(eta_td)s') | ||
| for i, segment in enumerate(m3u8_obj.segments): | ||
| tmp_list.add_segment( | ||
| m3u8.Segment( | ||
| f'{os.path.realpath(self.cache_dir)}/{i}.ts', | ||
| duration=segment.duration, | ||
| base_uri='file://' | ||
| ) | ||
| index = click.prompt( | ||
| 'Which playlist to download?', | ||
| type=click.Choice(list(range(len(m3u8_obj.playlists)))), | ||
| value_proc=int, | ||
| default=0 | ||
| ) | ||
| return await self.download(m3u8_obj.playlists[index].absolute_uri) | ||
| else: | ||
| tmp_list = m3u8.M3U8() | ||
| tmp_list.version = '3' | ||
| tmp_list.media_sequence = '0' | ||
| tmp_list.target_duration = m3u8_obj.target_duration | ||
| tmp_list.is_endlist = True | ||
| tasks = [] | ||
| os.makedirs(self.cache_dir, exist_ok=True) | ||
| bar = ShadyBar(self.name, max=len(m3u8_obj.segments), suffix='%(percent).1f%% - %(eta_td)s') | ||
| for i, segment in enumerate(m3u8_obj.segments): | ||
| tmp_list.add_segment( | ||
| m3u8.Segment( | ||
| f'{os.path.realpath(self.cache_dir)}/{i}.ts', | ||
| duration=segment.duration, | ||
| base_uri='file://' | ||
| ) | ||
| tasks.append( | ||
| asyncio.ensure_future( | ||
| self.download_segment(i, segment, bar) | ||
| ) | ||
| ) | ||
| tasks.append( | ||
| asyncio.ensure_future( | ||
| self.download_segment(i, segment, bar) | ||
| ) | ||
| tmp_list.dump(f'{self.cache_dir}/filelist.m3u8') | ||
| await asyncio.gather(*tasks) | ||
| bar.finish() | ||
| else: | ||
| click.echo('Live streaming media is not suppported!') | ||
| ) | ||
| tmp_list.dump(f'{self.cache_dir}/filelist.m3u8') | ||
| await asyncio.gather(*tasks) | ||
| bar.finish() |
There was a problem hiding this comment.
Function HLSDownloader.download refactored with the following changes:
- Swap if/else branches (
swap-if-else-branches) - Merge else clause's nested if statement into elif (
merge-else-if-into-elif)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Thanks for starring sourcery-ai/sourcery ✨ 🌟 ✨
Here's your pull request refactoring your most popular Python repo.
If you want Sourcery to refactor all your Python repos and incoming pull requests install our bot.
Review changes via command line
To manually merge these changes, make sure you're on the
masterbranch, then run: