Sourcery refactored main branch #12

sourcery-ai · 2022-07-13T12:45:21Z

Branch main 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 main branch, then run:

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

Help us improve this pull request!

sourcery-ai · 2022-07-13T12:45:23Z

helper_funcs/display_progress.py

-            ''.join(["●" for i in range(math.floor(percentage / 5))]),
-            ''.join(["○" for i in range(20 - math.floor(percentage / 5))]),
-            round(percentage, 2))
+            ''.join(["●" for _ in range(math.floor(percentage / 5))]),
+            ''.join(["○" for _ in range(20 - math.floor(percentage / 5))]),
+            round(percentage, 2),
+        )
+


Function progress_for_pyrogram refactored with the following changes:

Replace unused for index with underscore [×2] (for-index-underscore)

Replace call to format with f-string (use-fstring-for-formatting)

helper_funcs/display_progress.py

sourcery-ai · 2022-07-13T12:45:24Z

helper_funcs/display_progress.py

-    seconds, milliseconds = divmod(int(milliseconds), 1000)
+    seconds, milliseconds = divmod(milliseconds, 1000)
    minutes, seconds = divmod(seconds, 60)
    hours, minutes = divmod(minutes, 60)
    days, hours = divmod(hours, 24)
-    tmp = ((str(days) + "d, ") if days else "") + \
-        ((str(hours) + "h, ") if hours else "") + \
-        ((str(minutes) + "m, ") if minutes else "") + \
-        ((str(seconds) + "s, ") if seconds else "") + \
-        ((str(milliseconds) + "ms, ") if milliseconds else "")
+    tmp = (
+        (f"{str(days)}d, " if days else "")
+        + (f"{str(hours)}h, " if hours else "")
+        + (f"{str(minutes)}m, " if minutes else "")
+        + (f"{str(seconds)}s, " if seconds else "")
+        + (f"{str(milliseconds)}ms, " if milliseconds else "")
+    )
+


Function TimeFormatter refactored with the following changes:

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

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

sourcery-ai · 2022-07-13T12:45:24Z

helper_funcs/help_Nekmo_ffmpeg.py

-    watermarked_file = output_file + ".watermark.png"
+    watermarked_file = f"{output_file}.watermark.png"
    metadata = extractMetadata(createParser(input_file))
    width = metadata.get("width")
    # https://stackoverflow.com/a/34547184/4723940
    shrink_watermark_file_genertor_command = [
        "ffmpeg",
-        "-i", water_mark_file,
+        "-i",
+        water_mark_file,
        "-y -v quiet",
        "-vf",
-        "scale={}*0.5:-1".format(width),
-        watermarked_file
+        f"scale={width}*0.5:-1",
+        watermarked_file,
    ]
+


Function place_water_mark refactored with the following changes:

Use f-string instead of string concatenation (use-fstring-for-concatenation)

Replace call to format with f-string (use-fstring-for-formatting)

sourcery-ai · 2022-07-13T12:45:24Z

helper_funcs/help_Nekmo_ffmpeg.py

-    if os.path.lexists(out_put_file_name):
-        return out_put_file_name
-    else:
-        return None
+    return out_put_file_name if os.path.lexists(out_put_file_name) else None


Function take_screen_shot refactored with the following changes:

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

sourcery-ai · 2022-07-13T12:45:24Z

plugins/custom_thumbnail.py

-    thumb_image_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
+    thumb_image_path = f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.jpg"


Function Gthumb01 refactored with the following changes:

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

sourcery-ai · 2022-07-13T12:45:25Z

plugins/custom_thumbnail.py

-    thumb_image_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
+    thumb_image_path = f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.jpg"


Function Gthumb02 refactored with the following changes:

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

sourcery-ai · 2022-07-13T12:45:25Z

plugins/custom_thumbnail.py

-    duration = 0
    metadata = extractMetadata(createParser(download_directory))
-    if metadata is not None and metadata.has("duration"):
-        duration = metadata.get('duration').seconds
-
-    return duration
+    return (
+        metadata.get('duration').seconds
+        if metadata is not None and metadata.has("duration")
+        else 0
+    )


Function Mdata03 refactored with the following changes:

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

Inline variable that is immediately returned (inline-immediately-returned-variable)

Move setting of default value for variable into else branch (introduce-default-else)

Move assignment closer to its usage within a block (move-assign-in-block)

sourcery-ai · 2022-07-13T12:45:25Z

plugins/dl_button.py

-    tmp_directory_for_each_user = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id)
+    tmp_directory_for_each_user = (
+        f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}"
+    )
+
    if not os.path.isdir(tmp_directory_for_each_user):
        os.makedirs(tmp_directory_for_each_user)
-    download_directory = tmp_directory_for_each_user + "/" + custom_file_name
+    download_directory = f"{tmp_directory_for_each_user}/{custom_file_name}"


Function ddl_call_back refactored with the following changes:

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

sourcery-ai · 2022-07-13T12:45:25Z

plugins/youtube_dl_button.py

-    save_ytdl_json_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".json"
+    save_ytdl_json_path = (
+        f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.json"
+    )
+


Function youtube_dl_call_back refactored with the following changes:

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

Simplify conditional into switch-like form [×10] (switch)

sourcery-ai · 2022-07-13T12:45:43Z

Sourcery Code Quality Report

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

Quality metrics	Before	After	Change
Complexity	25.64 😞	25.96 😞	0.32 👎
Method Length	131.86 😞	132.03 😞	0.17 👎
Working memory	18.41 ⛔	18.59 ⛔	0.18 👎
Quality	36.43% 😞	35.77% 😞	-0.66% 👎

Other metrics	Before	After	Change
Lines	1020	1025	5

Changed files	Quality Before	Quality After	Quality Change
helper_funcs/display_progress.py	63.07% 🙂	63.44% 🙂	0.37% 👍
helper_funcs/help_Nekmo_ffmpeg.py	66.55% 🙂	66.35% 🙂	-0.20% 👎
helper_funcs/help_uploadbot.py	60.31% 🙂	58.88% 🙂	-1.43% 👎
plugins/broadcast.py	39.99% 😞	39.99% 😞	0.00%
plugins/custom_thumbnail.py	77.78% ⭐	77.38% ⭐	-0.40% 👎
plugins/dl_button.py	17.01% ⛔	17.01% ⛔	0.00%
plugins/youtube_dl_button.py	5.92% ⛔	5.92% ⛔	0.00%

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

File	Function	Complexity	Length	Working Memory	Quality	Recommendation
plugins/youtube_dl_button.py	youtube_dl_call_back	56 ⛔	911 ⛔	29 ⛔	3.27% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
plugins/dl_button.py	ddl_call_back	42 ⛔	678 ⛔	28 ⛔	6.25% ⛔	Refactor to reduce nesting. Try splitting into smaller methods. Extract out complex expressions
plugins/broadcast.py	broadcast_	18 🙂	284 ⛔	16 ⛔	28.35% 😞	Try splitting into smaller methods. Extract out complex expressions
plugins/dl_button.py	download_coroutine	14 🙂	203 😞	16 ⛔	35.96% 😞	Try splitting into smaller methods. Extract out complex expressions
helper_funcs/display_progress.py	progress_for_pyrogram	6 ⭐	155 😞	15 😞	48.59% 😞	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!

kalanakt

✅

kalanakt · 2022-07-13T13:04:12Z

helper_funcs/help_Nekmo_ffmpeg.py

-    if os.path.lexists(out_put_file_name):
-        return out_put_file_name
-    else:
-        return None
+    return out_put_file_name if os.path.lexists(out_put_file_name) else None


kalanakt · 2022-07-13T13:04:26Z

helper_funcs/help_Nekmo_ffmpeg.py

-    if os.path.lexists(out_put_file_name):
-        return out_put_file_name
-    else:
-        return None
+    return out_put_file_name if os.path.lexists(out_put_file_name) else None


kalanakt · 2022-07-13T13:04:39Z

helper_funcs/help_Nekmo_ffmpeg.py

-                ss_img = await place_water_mark(ss_img, output_directory + "/" + str(time.time()) + ".jpg", wf)
+                ss_img = await place_water_mark(
+                    ss_img, f"{output_directory}/{str(time.time())}.jpg", wf
+                )
+


kalanakt · 2022-07-13T13:04:51Z

helper_funcs/help_uploadbot.py

-                        text="{}: {} of {}".format(
-                            ud_type,
-                            humanbytes(downloaded_size),
-                            humanbytes(total_size)
-                        )
+                        text=f"{ud_type}: {humanbytes(downloaded_size)} of {humanbytes(total_size)}",
                    )
+


kalanakt · 2022-07-13T13:05:04Z

plugins/broadcast.py

-        broadcast_id = ''.join([random.choice(string.ascii_letters) for i in range(3)])
+        broadcast_id = ''.join([random.choice(string.ascii_letters) for _ in range(3)])


kalanakt · 2022-07-13T13:05:17Z

plugins/custom_thumbnail.py

-    thumb_image_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
+    thumb_image_path = f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.jpg"


kalanakt · 2022-07-13T13:05:30Z

plugins/custom_thumbnail.py

-    thumb_image_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
+    thumb_image_path = f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.jpg"


sourcery-ai bot requested a review from kalanakt July 13, 2022 12:45

sourcery-ai bot commented Jul 13, 2022

View reviewed changes

'Refactored by Sourcery'

8d8aaf6

sourcery-ai bot force-pushed the sourcery/main branch from 8d79df5 to 8d8aaf6 Compare July 13, 2022 12:45

kalanakt reviewed Jul 13, 2022

View reviewed changes

kalanakt merged commit fe101a6 into main Jul 13, 2022

kalanakt deleted the sourcery/main branch July 13, 2022 13:06

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sourcery refactored main branch #12

Sourcery refactored main branch #12

sourcery-ai bot commented Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot Jul 13, 2022

kalanakt Jul 13, 2022

sourcery-ai bot Jul 13, 2022

kalanakt Jul 13, 2022

sourcery-ai bot Jul 13, 2022

kalanakt Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot Jul 13, 2022

sourcery-ai bot commented Jul 13, 2022 •

edited

Loading

kalanakt left a comment

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

kalanakt Jul 13, 2022

		thumb_image_path = Config.DOWNLOAD_LOCATION + "/" + str(update.from_user.id) + ".jpg"
		thumb_image_path = f"{Config.DOWNLOAD_LOCATION}/{str(update.from_user.id)}.jpg"

		broadcast_id = ''.join([random.choice(string.ascii_letters) for i in range(3)])
		broadcast_id = ''.join([random.choice(string.ascii_letters) for _ in range(3)])

Sourcery refactored main branch #12

Sourcery refactored main branch #12

Conversation

sourcery-ai bot commented Jul 13, 2022

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot Jul 13, 2022

Choose a reason for hiding this comment

sourcery-ai bot commented Jul 13, 2022 • edited Loading

Sourcery Code Quality Report

Legend and Explanation

kalanakt left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

sourcery-ai bot commented Jul 13, 2022 •

edited

Loading