Update to Pyro v2 (Sourcery refactored) #7

sourcery-ai · 2022-09-20T10:06:36Z

Pull Request #6 refactored by Sourcery.

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

NOTE: As code is pushed to the original Pull Request, Sourcery will
re-run and update (force-push) this Pull Request with new refactorings as
necessary. If Sourcery finds no refactorings at any point, this Pull Request
will be closed automatically.

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 Pyro-v2 branch, then run:

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

Help us improve this pull request!

sourcery-ai · 2022-09-20T10:06:45Z

Sourcery Code Quality Report

❌ Merging this PR will decrease code quality in the affected files by 0.24%.

Quality metrics	Before	After	Change
Complexity	5.49 ⭐	5.38 ⭐	-0.11 👍
Method Length	90.67 🙂	90.56 🙂	-0.11 👍
Working memory	8.78 🙂	8.87 🙂	0.09 👎
Quality	63.25% 🙂	63.01% 🙂	-0.24% 👎

Other metrics	Before	After	Change
Lines	601	603	2

Changed files	Quality Before	Quality After	Quality Change
gdrive/helpers/downloader.py	75.99% ⭐	74.32% 🙂	-1.67% 👎
gdrive/helpers/utils.py	83.20% ⭐	83.20% ⭐	0.00%
gdrive/helpers/gdrive_utils/gDrive.py	59.57% 🙂	59.73% 🙂	0.16% 👍
gdrive/helpers/sql_helper/gDriveDB.py	89.50% ⭐	89.53% ⭐	0.03% 👍
gdrive/helpers/sql_helper/idsDB.py	88.78% ⭐	88.74% ⭐	-0.04% 👎
gdrive/plugins/copy.py	67.20% 🙂	67.20% 🙂	0.00%
gdrive/plugins/delete.py	58.55% 🙂	59.80% 🙂	1.25% 👍
gdrive/plugins/download.py	46.58% 😞	46.58% 😞	0.00%

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
gdrive/plugins/download.py	_download	10 🙂	284 ⛔	10 😞	44.07% 😞	Try splitting into smaller methods. Extract out complex expressions
gdrive/plugins/download.py	_telegram_file	5 ⭐	229 ⛔	14 😞	44.87% 😞	Try splitting into smaller methods. Extract out complex expressions
gdrive/helpers/gdrive_utils/gDrive.py	GoogleDrive.checkFolderLink	10 🙂	176 😞	13 😞	45.47% 😞	Try splitting into smaller methods. Extract out complex expressions
gdrive/helpers/gdrive_utils/gDrive.py	GoogleDrive.upload_file	10 🙂	234 ⛔	10 😞	46.44% 😞	Try splitting into smaller methods. Extract out complex expressions
gdrive/helpers/gdrive_utils/gDrive.py	GoogleDrive.delete_file	9 🙂	168 😞	11 😞	50.44% 🙂	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!

sourcery-ai · 2022-09-20T10:10:21Z

gdrive/helpers/downloader.py

-        for path in glob.glob(os.path.join(DOWNLOAD_DIRECTORY, "*")):
-            if path.endswith(
-                (
-                    ".avi",
-                    ".mov",
-                    ".flv",
-                    ".wmv",
-                    ".3gp",
-                    ".mpeg",
-                    ".webm",
-                    ".mp4",
-                    ".mkv",
+        return next(
+            (
+                (True, path)
+                for path in glob.glob(os.path.join(DOWNLOAD_DIRECTORY, "*"))
+                if path.endswith(
+                    (
+                        ".avi",
+                        ".mov",
+                        ".flv",
+                        ".wmv",
+                        ".3gp",
+                        ".mpeg",
+                        ".webm",
+                        ".mp4",
+                        ".mkv",
+                    )
                )
-            ) and path.startswith(ytdl.prepare_filename(meta)):
-                return True, path
-        return False, "Something went wrong! No video file exists on server."
+                and path.startswith(ytdl.prepare_filename(meta))
+            ),
+            (False, "Something went wrong! No video file exists on server."),
+        )


Function utube_dl refactored with the following changes:

Use the built-in function next instead of a for-loop (use-next)

sourcery-ai · 2022-09-20T10:10:21Z

gdrive/helpers/utils.py

-    return str(round(size, 2)) + " " + dict_power_n[number] + "B"
+    return f"{str(round(size, 2))} {dict_power_n[number]}B"


Function humanbytes refactored with the following changes:

Use f-string instead of string concatenation [×3] (use-fstring-for-concatenation)

sourcery-ai · 2022-09-20T10:10:22Z

gdrive/helpers/gdrive_utils/gDrive.py

-            return res.group(5)
+            return res[5]


Function GoogleDrive.getIdFromUrl refactored with the following changes:

Replace m.group(x) with m[x] for re.Match objects (use-getitem-for-re-match-groups)

sourcery-ai · 2022-09-20T10:10:22Z

gdrive/helpers/gdrive_utils/gDrive.py

-            for file in response.get("files", []):
-                files.append(file)
+            files.extend(iter(response.get("files", [])))


Function GoogleDrive.getFilesByFolderId refactored with the following changes:

Replace a for append loop with list extend (for-append-to-extend)

Simplify generator expression (simplify-generator)

sourcery-ai · 2022-09-20T10:10:23Z

gdrive/helpers/sql_helper/gDriveDB.py

-        saved_cred = SESSION.query(gDriveCreds).get(chat_id)
-        if saved_cred:
+        if saved_cred := SESSION.query(gDriveCreds).get(chat_id):


Function _clear refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-09-20T10:10:23Z

gdrive/helpers/sql_helper/idsDB.py

-    rem = SESSION.query(ParentID).get(chat_id)
-    if rem:
+    if rem := SESSION.query(ParentID).get(chat_id):


Function _clear refactored with the following changes:

Use named expression to simplify assignment and conditional (use-named-expression)

sourcery-ai · 2022-09-20T10:10:24Z

gdrive/plugins/copy.py

-    user_id = message.from_user.id
    if len(message.command) > 1:
        link = message.command[1]
+        user_id = message.from_user.id


Function _clone refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai · 2022-09-20T10:10:24Z

gdrive/plugins/delete.py

@@ -16,7 +16,6 @@
    & CustomFilters.auth_users
 )
 def _delete(client: Client, message: Message):
-    user_id = message.from_user.id


Function _delete refactored with the following changes:

Move assignments closer to their usage (move-assign)

Split conditional into multiple branches (split-or-ifs)

Merge duplicate blocks in conditional (merge-duplicate-blocks)

Remove redundant conditional (remove-redundant-if)

sourcery-ai · 2022-09-20T10:10:24Z

gdrive/plugins/download.py

-    user_id = message.from_user.id
    if len(message.command) > 1:
        sent_message = message.reply_text("🕵️**Checking Link...**", quote=True)
        link = message.command[1]
+        user_id = message.from_user.id


Function _ytdl refactored with the following changes:

Move assignments closer to their usage (move-assign)

sourcery-ai bot requested a review from Ryomen-Sukuna September 20, 2022 10:06

'Refactored by Sourcery'

67e643a

sourcery-ai bot force-pushed the sourcery/Pyro-v2 branch from d16a4b3 to 67e643a Compare September 20, 2022 10:10

sourcery-ai bot commented Sep 20, 2022

View reviewed changes

Ryomen-Sukuna merged commit a33c1ae into Pyro-v2 Sep 20, 2022

Ryomen-Sukuna deleted the sourcery/Pyro-v2 branch September 20, 2022 10:11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update to Pyro v2 (Sourcery refactored) #7

Update to Pyro v2 (Sourcery refactored) #7

sourcery-ai bot commented Sep 20, 2022 •

edited

Loading

sourcery-ai bot commented Sep 20, 2022 •

edited

Loading

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

sourcery-ai bot Sep 20, 2022

		return str(round(size, 2)) + " " + dict_power_n[number] + "B"
		return f"{str(round(size, 2))} {dict_power_n[number]}B"

Update to Pyro v2 (Sourcery refactored) #7

Update to Pyro v2 (Sourcery refactored) #7

Conversation

sourcery-ai bot commented Sep 20, 2022 • edited Loading

sourcery-ai bot commented Sep 20, 2022 • edited Loading

Sourcery Code Quality Report

Legend and Explanation

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot Sep 20, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Sep 20, 2022 •

edited

Loading

sourcery-ai bot commented Sep 20, 2022 •

edited

Loading