From d20d18fa98acf5c7c1455a8738fdb9533c99595d Mon Sep 17 00:00:00 2001 From: "pre-commit-ci[bot]" <66853113+pre-commit-ci[bot]@users.noreply.github.com> Date: Tue, 1 Aug 2023 03:30:20 +0000 Subject: [PATCH] [pre-commit.ci] auto fixes from pre-commit.com hooks for more information, see https://pre-commit.ci --- modules/config.py | 12 ++++-------- modules/core/recheck.py | 6 ++---- modules/core/remove_orphaned.py | 6 ++---- modules/core/remove_unregistered.py | 18 ++++++------------ modules/core/share_limits.py | 22 ++++++++-------------- modules/core/tag_nohardlinks.py | 14 +++++--------- modules/webhooks.py | 6 ++---- 7 files changed, 29 insertions(+), 55 deletions(-) diff --git a/modules/config.py b/modules/config.py index c8f1e79..6b48e4b 100755 --- a/modules/config.py +++ b/modules/config.py @@ -663,10 +663,8 @@ class Config: if empty_after_x_days <= days: num_del += 1 body += logger.print_line( - ( - f"{'Did not delete' if self.dry_run else 'Deleted'} " - f"{filename} from {folder} (Last modified {round(days)} days ago)." - ), + f"{'Did not delete' if self.dry_run else 'Deleted'} " + f"{filename} from {folder} (Last modified {round(days)} days ago).", self.loglevel, ) files += [str(filename)] @@ -679,10 +677,8 @@ class Config: for path in location_path_list: util.remove_empty_directories(path, "**/*") body += logger.print_line( - ( - f"{'Did not delete' if self.dry_run else 'Deleted'} {num_del} files " - f"({util.human_readable_size(size_bytes)}) from the {location}." - ), + f"{'Did not delete' if self.dry_run else 'Deleted'} {num_del} files " + f"({util.human_readable_size(size_bytes)}) from the {location}.", self.loglevel, ) attr = { diff --git a/modules/core/recheck.py b/modules/core/recheck.py index ab0a48e..30c31e7 100644 --- a/modules/core/recheck.py +++ b/modules/core/recheck.py @@ -64,10 +64,8 @@ class ReCheck: ) logger.debug( logger.insert_space( - ( - f"-- Seeding Time vs Max Seed Time: {timedelta(seconds=torrent.seeding_time)} < " - f"{timedelta(minutes=torrent.max_seeding_time)}" - ), + f"-- Seeding Time vs Max Seed Time: {timedelta(seconds=torrent.seeding_time)} < " + f"{timedelta(minutes=torrent.max_seeding_time)}", 4, ) ) diff --git a/modules/core/remove_orphaned.py b/modules/core/remove_orphaned.py index 601c841..d1841bb 100644 --- a/modules/core/remove_orphaned.py +++ b/modules/core/remove_orphaned.py @@ -67,10 +67,8 @@ class RemoveOrphaned: logger.print_line(f"{num_orphaned} Orphaned files found", self.config.loglevel) body += logger.print_line("\n".join(orphaned_files), self.config.loglevel) body += logger.print_line( - ( - f"{'Not moving' if self.config.dry_run else 'Moving'} {num_orphaned} Orphaned files " - f"to {self.orphaned_dir.replace(self.remote_dir,self.root_dir)}" - ), + f"{'Not moving' if self.config.dry_run else 'Moving'} {num_orphaned} Orphaned files " + f"to {self.orphaned_dir.replace(self.remote_dir,self.root_dir)}", self.config.loglevel, ) diff --git a/modules/core/remove_unregistered.py b/modules/core/remove_unregistered.py index 6060ed3..68107aa 100644 --- a/modules/core/remove_unregistered.py +++ b/modules/core/remove_unregistered.py @@ -142,28 +142,22 @@ class RemoveUnregistered: if self.stats_deleted >= 1 or self.stats_deleted_contents >= 1: if self.stats_deleted >= 1: logger.print_line( - ( - f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.stats_deleted} " - f".torrent{'s' if self.stats_deleted > 1 else ''} but not content files." - ), + f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.stats_deleted} " + f".torrent{'s' if self.stats_deleted > 1 else ''} but not content files.", self.config.loglevel, ) if self.stats_deleted_contents >= 1: logger.print_line( - ( - f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.stats_deleted_contents} " - f".torrent{'s' if self.stats_deleted_contents > 1 else ''} AND content files." - ), + f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.stats_deleted_contents} " + f".torrent{'s' if self.stats_deleted_contents > 1 else ''} AND content files.", self.config.loglevel, ) else: logger.print_line("No unregistered torrents found.", self.config.loglevel) if self.stats_untagged >= 1: logger.print_line( - ( - f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.tag_error} tags for {self.stats_untagged} " - f".torrent{'s.' if self.stats_untagged > 1 else '.'}" - ), + f"{'Did not delete' if self.config.dry_run else 'Deleted'} {self.tag_error} tags for {self.stats_untagged} " + f".torrent{'s.' if self.stats_untagged > 1 else '.'}", self.config.loglevel, ) if self.stats_tagged >= 1: diff --git a/modules/core/share_limits.py b/modules/core/share_limits.py index 2fd5076..5ce09cf 100644 --- a/modules/core/share_limits.py +++ b/modules/core/share_limits.py @@ -391,11 +391,9 @@ class ShareLimits: print_log += logger.print_line(logger.insert_space(f"Tracker: {tracker}", 8), self.config.loglevel) print_log += logger.print_line( logger.insert_space( - ( - f"Min seed time not met: {timedelta(seconds=torrent.seeding_time)} <=" - f" {timedelta(minutes=min_seeding_time)}. Removing Share Limits so qBittorrent can continue" - " seeding." - ), + f"Min seed time not met: {timedelta(seconds=torrent.seeding_time)} <=" + f" {timedelta(minutes=min_seeding_time)}. Removing Share Limits so qBittorrent can continue" + " seeding.", 8, ), self.config.loglevel, @@ -423,11 +421,9 @@ class ShareLimits: print_log += logger.print_line(logger.insert_space(f"Tracker: {tracker}", 8), self.config.loglevel) print_log += logger.print_line( logger.insert_space( - ( - f"Min number of seeds not met: Total Seeds ({torrent.num_complete}) <" - f"min_num_seeds({min_num_seeds}). Removing Share Limits so qBittorrent can continue" - " seeding." - ), + f"Min number of seeds not met: Total Seeds ({torrent.num_complete}) <" + f"min_num_seeds({min_num_seeds}). Removing Share Limits so qBittorrent can continue" + " seeding.", 8, ), self.config.loglevel, @@ -456,10 +452,8 @@ class ShareLimits: if seeding_time_limit: if (torrent.seeding_time >= seeding_time_limit * 60) and _has_reached_min_seeding_time_limit(): body += logger.insert_space( - ( - f"Seeding Time vs Max Seed Time: {timedelta(seconds=torrent.seeding_time)} >= " - f"{timedelta(minutes=seeding_time_limit)}" - ), + f"Seeding Time vs Max Seed Time: {timedelta(seconds=torrent.seeding_time)} >= " + f"{timedelta(minutes=seeding_time_limit)}", 8, ) return True diff --git a/modules/core/tag_nohardlinks.py b/modules/core/tag_nohardlinks.py index 05bac75..d4a628c 100644 --- a/modules/core/tag_nohardlinks.py +++ b/modules/core/tag_nohardlinks.py @@ -120,20 +120,16 @@ class TagNoHardLinks: self.check_previous_nohardlinks_tagged_torrents(has_nohardlinks, torrent, tracker, category) if self.stats_tagged >= 1: logger.print_line( - ( - f"{'Did not Tag' if self.config.dry_run else 'Added Tag'} for {self.stats_tagged} " - f".torrent{'s.' if self.stats_tagged > 1 else '.'}" - ), + f"{'Did not Tag' if self.config.dry_run else 'Added Tag'} for {self.stats_tagged} " + f".torrent{'s.' if self.stats_tagged > 1 else '.'}", self.config.loglevel, ) else: logger.print_line("No torrents to tag with no hardlinks.", self.config.loglevel) if self.stats_untagged >= 1: logger.print_line( - ( - f"{'Did not delete' if self.config.dry_run else 'Deleted'} " - f"{self.nohardlinks_tag} tags for {self.stats_untagged} " - f".torrent{'s.' if self.stats_untagged > 1 else '.'}" - ), + f"{'Did not delete' if self.config.dry_run else 'Deleted'} " + f"{self.nohardlinks_tag} tags for {self.stats_untagged} " + f".torrent{'s.' if self.stats_untagged > 1 else '.'}", self.config.loglevel, ) diff --git a/modules/webhooks.py b/modules/webhooks.py index 5d80245..41afd54 100755 --- a/modules/webhooks.py +++ b/modules/webhooks.py @@ -171,10 +171,8 @@ class Webhooks: def notify(self, torrents_updated=[], payload={}, group_by=""): if len(torrents_updated) > GROUP_NOTIFICATION_LIMIT: logger.trace( - ( - f"Number of torrents updated > {GROUP_NOTIFICATION_LIMIT}, grouping notifications" - f"{f' by {group_by}' if group_by else ''}" - ), + f"Number of torrents updated > {GROUP_NOTIFICATION_LIMIT}, grouping notifications" + f"{f' by {group_by}' if group_by else ''}", ) if group_by == "category": group_attr = group_notifications_by_key(payload, "torrent_category")