Sourcery refactored master branch #1

sourcery-ai · 2022-07-16T01:45:08Z

Branch master refactored by Sourcery.

If you're happy with these changes, merge this Pull Request using the Squash and merge strategy.

See our documentation here.

Run Sourcery locally

Reduce the feedback loop during development by using the Sourcery editor plugin:

Review changes via command line

To manually merge these changes, make sure you're on the master branch, then run:

git fetch origin sourcery/master
git merge --ff-only FETCH_HEAD
git reset HEAD^

Help us improve this pull request!

sourcery-ai · 2022-07-16T01:45:09Z

DiscordUtils/Music.py

-        #dislikes = data["dislike_count"]
-        views = data["view_count"]
-        duration = data["duration"]
-        thumbnail = data["thumbnail"]
-        channel = data["uploader"]
-        channel_url = data["uploader_url"]
-        return Song(source, url, title, description, views, duration, thumbnail, channel, channel_url, False)
    else:
        if bettersearch:
            url = await ytbettersearch(url)
            data = await loop.run_in_executor(None, lambda: ydl.extract_info(url, download=False))
-            source = data["url"]
-            url = "https://www.youtube.com/watch?v="+data["id"]
-            title = data["title"]
-            description = data["description"]
-            #likes = data["like_count"]
-            #dislikes = data["dislike_count"]
-            views = data["view_count"]
-            duration = data["duration"]
-            thumbnail = data["thumbnail"]
-            channel = data["uploader"]
-            channel_url = data["uploader_url"]
-            return Song(source, url, title, description, views, duration, thumbnail, channel, channel_url, False)
-        elif search:
+        else:


Function get_video_data refactored with the following changes:

Hoist repeated code outside conditional statement [×16] (hoist-statement-from-if)

Remove redundant conditional (remove-redundant-if)

This removes the following comments ( why? ):

#dislikes = data["dislike_count"] #likes = data["like_count"]

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Music.py

-        else:
-            return None
+        return None


Function Music.get_player refactored with the following changes:

If else clause is always executed move code to same level as loop (useless-else-on-loop)

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Music.py

-        if ffmpeg_error and "ffmpeg_error_betterfix" in kwargs.keys():
+        if ffmpeg_error and "ffmpeg_error_betterfix" in kwargs:


Function MusicPlayer.__init__ refactored with the following changes:

Remove unnecessary call to keys() (remove-dict-keys)

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Music.py

-        elif not len(self.music.queue[self.ctx.guild.id]) > 1 and not force:
+        elif len(self.music.queue[self.ctx.guild.id]) <= 1 and not force:
            raise EmptyQueue("Cannot skip because queue is empty")
        else:
            old = self.music.queue[self.ctx.guild.id][0]
-            old.is_looping = False if old.is_looping else False
+            old.is_looping = False


Function MusicPlayer.skip refactored with the following changes:

Simplify logical expression using De Morgan identities (de-morgan)

Remove an unnecessary condition used during variable assignment (remove-redundant-condition)

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Music.py

-        if not song.is_looping:
-            song.is_looping = True
-        else:
-            song.is_looping = False
+        song.is_looping = not song.is_looping


Function MusicPlayer.toggle_song_loop refactored with the following changes:

Simplify boolean if expression (boolean-if-exp-identity)

Remove unnecessary casts to int, str, float or bool (remove-unnecessary-cast)

Replace if statement with if expression (assign-if-exp)

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Pagination.py

@@ -29,6 +29,7 @@ async def run(self, embeds, send_to=None):
        msg = await msg.channel.fetch_message(msg.id)
        def check(reaction, user):
            return user == wait_for and reaction.message.id == msg.id and str(reaction.emoji) in self.control_emojis
+


Function AutoEmbedPaginator.run refactored with the following changes:

Remove unreachable code [×2] (remove-unreachable-code)

Replace comparison with min/max call (min-max-identity)

sourcery-ai · 2022-07-16T01:45:10Z

DiscordUtils/Pagination.py

@@ -149,6 +148,7 @@ async def run(self, embeds, send_to=None):
        msg = await msg.channel.fetch_message(msg.id)
        def check(reaction, user):
            return user == wait_for and reaction.message.id == msg.id and str(reaction.emoji) in self.control_emojis
+


Function CustomEmbedPaginator.run refactored with the following changes:

Remove unreachable code [×3] (remove-unreachable-code)

Replace comparison with min/max call [×6] (min-max-identity)

Replace multiple comparisons of same variable with in operator (merge-comparisons)

sourcery-ai · 2022-07-16T01:45:33Z

Sourcery Code Quality Report

✅ Merging this PR will increase code quality in the affected files by 1.95%.

Quality metrics	Before	After	Change
Complexity	77.84 ⛔	69.54 ⛔	-8.30 👍
Method Length	80.46 🙂	76.78 🙂	-3.68 👍
Working memory	4.77 ⭐	4.14 ⭐	-0.63 👍
Quality	56.43% 🙂	58.38% 🙂	1.95% 👍

Other metrics	Before	After	Change
Lines	574	545	-29

Changed files	Quality Before	Quality After	Quality Change
DiscordUtils/Music.py	69.16% 🙂	73.31% 🙂	4.15% 👍
DiscordUtils/Pagination.py	43.06% 😞	43.38% 😞	0.32% 👍

Here are some functions in these files that still need a tune-up:

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
DiscordUtils/Pagination.py	CustomEmbedPaginator.run	206 ⛔	809 ⛔		33.36% 😞	Refactor to reduce nesting. Try splitting into smaller methods
DiscordUtils/Pagination.py	AutoEmbedPaginator.run	90 ⛔	550 ⛔		33.93% 😞	Refactor to reduce nesting. Try splitting into smaller methods
DiscordUtils/Music.py	check_queue	13 🙂	181 😞	14 😞	40.95% 😞	Try splitting into smaller methods. Extract out complex expressions
DiscordUtils/Music.py	get_video_data	11 🙂	205 ⛔	11 😞	45.52% 😞	Try splitting into smaller methods. Extract out complex expressions
DiscordUtils/Music.py	MusicPlayer.__init__	6 ⭐	124 😞	12 😞	56.32% 🙂	Try splitting into smaller methods. Extract out complex expressions

Legend and Explanation

The emojis denote the absolute quality of the code:

⭐ excellent
🙂 good
😞 poor
⛔ very poor

The 👍 and 👎 indicate whether the quality has improved or gotten worse with this pull request.

Please see our documentation here for details on how these metrics are calculated.

We are actively working on this report - lots more documentation and extra metrics to come!

Help us improve this quality report!

'Refactored by Sourcery'

b70679f

sourcery-ai bot requested a review from WinterFe July 16, 2022 01:45

sourcery-ai bot commented Jul 16, 2022

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored master branch #1

Sourcery refactored master branch #1

sourcery-ai bot commented Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot Jul 16, 2022

sourcery-ai bot commented Jul 16, 2022

		if ffmpeg_error and "ffmpeg_error_betterfix" in kwargs.keys():
		if ffmpeg_error and "ffmpeg_error_betterfix" in kwargs:

Sourcery refactored master branch #1

Are you sure you want to change the base?

Sourcery refactored master branch #1

Conversation

sourcery-ai bot commented Jul 16, 2022

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 16, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Jul 16, 2022

Sourcery Code Quality Report

Legend and Explanation