From 5d65b4c5e9866e0efcf2057f8b0891e5ccf243b9 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Fri, 9 Dec 2022 16:42:42 -0500 Subject: [PATCH] Modify imports --- cleanup.py | 3 +- core/__init__.py | 2 + core/auto_process/books.py | 34 +++---- core/auto_process/comics.py | 34 +++---- core/auto_process/common.py | 2 + core/auto_process/games.py | 34 +++---- core/auto_process/managers/pymedusa.py | 6 +- core/auto_process/managers/sickbeard.py | 12 +-- core/auto_process/movies.py | 34 +++---- core/auto_process/music.py | 34 +++---- core/auto_process/tv.py | 34 +++---- core/configuration.py | 2 + core/databases.py | 5 +- core/extractor/__init__.py | 5 +- core/github_api.py | 2 + core/logger.py | 4 +- core/main_db.py | 2 + core/plugins/downloaders/configuration.py | 8 +- core/plugins/downloaders/nzb/configuration.py | 2 + core/plugins/downloaders/nzb/utils.py | 2 + .../downloaders/torrent/configuration.py | 2 + core/plugins/downloaders/torrent/deluge.py | 4 +- .../downloaders/torrent/qbittorrent.py | 2 + core/plugins/downloaders/torrent/synology.py | 2 + .../downloaders/torrent/transmission.py | 2 + core/plugins/downloaders/torrent/utils.py | 4 +- core/plugins/downloaders/torrent/utorrent.py | 2 + core/plugins/downloaders/utils.py | 10 +-- core/plugins/plex.py | 2 + core/plugins/subtitles.py | 12 +-- core/processor/manual.py | 8 +- core/processor/nzb.py | 24 +++-- core/processor/nzbget.py | 2 + core/processor/sab.py | 2 + core/scene_exceptions.py | 2 + core/transcoder.py | 6 +- core/user_scripts.py | 2 + core/utils/__init__.py | 88 +++++++++++-------- core/utils/common.py | 10 ++- core/utils/download_info.py | 5 +- core/utils/encoding.py | 2 + core/utils/files.py | 11 ++- core/utils/identification.py | 2 + core/utils/links.py | 2 + core/utils/naming.py | 2 + core/utils/network.py | 2 + core/utils/parsers.py | 2 + core/utils/paths.py | 4 +- core/utils/processes.py | 7 +- core/version_check.py | 5 +- eol.py | 1 + setup.py | 1 + tests/__init__.py | 1 + tests/test_initialize.py | 1 + tests/test_transcoder.py | 1 + 55 files changed, 301 insertions(+), 195 deletions(-) diff --git a/cleanup.py b/cleanup.py index 62e730bb..2ba35ef3 100644 --- a/cleanup.py +++ b/cleanup.py @@ -1,9 +1,10 @@ #!/usr/bin/env python +from __future__ import annotations import os +import shutil import subprocess import sys -import shutil sys.dont_write_bytecode = True diff --git a/core/__init__.py b/core/__init__.py index aa78aa07..946e48a5 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import itertools import locale import os diff --git a/core/auto_process/books.py b/core/auto_process/books.py index 4ae1c4a4..fe3705f1 100644 --- a/core/auto_process/books.py +++ b/core/auto_process/books.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/comics.py b/core/auto_process/comics.py index d13622ff..aeed6c8c 100644 --- a/core/auto_process/comics.py +++ b/core/auto_process/comics.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/common.py b/core/auto_process/common.py index 779f04ce..b2e3237c 100644 --- a/core/auto_process/common.py +++ b/core/auto_process/common.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import typing import requests diff --git a/core/auto_process/games.py b/core/auto_process/games.py index de685c49..01f4199f 100644 --- a/core/auto_process/games.py +++ b/core/auto_process/games.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/managers/pymedusa.py b/core/auto_process/managers/pymedusa.py index dabe7e87..b99442ab 100644 --- a/core/auto_process/managers/pymedusa.py +++ b/core/auto_process/managers/pymedusa.py @@ -1,12 +1,14 @@ +from __future__ import annotations + import time +import requests + import core.utils.common from core import logger from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import SickBeard -import requests - class PyMedusa(SickBeard): """PyMedusa class.""" diff --git a/core/auto_process/managers/sickbeard.py b/core/auto_process/managers/sickbeard.py index d86bb6d8..526d2dde 100644 --- a/core/auto_process/managers/sickbeard.py +++ b/core/auto_process/managers/sickbeard.py @@ -1,5 +1,11 @@ +from __future__ import annotations + import copy +import requests +from oauthlib.oauth2 import LegacyApplicationClient +from requests_oauthlib import OAuth2Session + import core from core import logger from core.auto_process.common import ( @@ -7,12 +13,6 @@ from core.auto_process.common import ( ) from core.utils import remote_dir -from oauthlib.oauth2 import LegacyApplicationClient - -import requests - -from requests_oauthlib import OAuth2Session - class InitSickBeard: """SickBeard init class. diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py index 2a7b1ed9..30b94b05 100644 --- a/core/auto_process/movies.py +++ b/core/auto_process/movies.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/music.py b/core/auto_process/music.py index 6fde4936..51733306 100644 --- a/core/auto_process/music.py +++ b/core/auto_process/music.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py index f9745562..ce2d2d6d 100644 --- a/core/auto_process/tv.py +++ b/core/auto_process/tv.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import errno import json @@ -10,26 +12,24 @@ from oauthlib.oauth2 import LegacyApplicationClient from requests_oauthlib import OAuth2Session import core -from core import logger, transcoder -from core.auto_process.common import ( - ProcessResult, - command_complete, - completed_download_handling, -) +from core import logger +from core import transcoder +from core.auto_process.common import command_complete +from core.auto_process.common import completed_download_handling +from core.auto_process.common import ProcessResult from core.auto_process.managers.sickbeard import InitSickBeard from core.plugins.downloaders.nzb.utils import report_nzb -from core.plugins.subtitles import import_subs, rename_subs +from core.plugins.subtitles import import_subs +from core.plugins.subtitles import rename_subs from core.scene_exceptions import process_all_exceptions -from core.utils import ( - convert_to_ascii, - find_download, - find_imdbid, - flatten, - list_media_files, - remote_dir, - remove_dir, - server_responding, -) +from core.utils import convert_to_ascii +from core.utils import find_download +from core.utils import find_imdbid +from core.utils import flatten +from core.utils import list_media_files +from core.utils import remote_dir +from core.utils import remove_dir +from core.utils import server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/configuration.py b/core/configuration.py index ce423637..0440b957 100644 --- a/core/configuration.py +++ b/core/configuration.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import copy import os import shutil diff --git a/core/databases.py b/core/databases.py index 9a3bae34..a6c77415 100644 --- a/core/databases.py +++ b/core/databases.py @@ -1,4 +1,7 @@ -from core import logger, main_db +from __future__ import annotations + +from core import logger +from core import main_db from core.utils import backup_versioned_file MIN_DB_VERSION = 1 # oldest db version we support migrating from diff --git a/core/extractor/__init__.py b/core/extractor/__init__.py index c87b5219..f8c91cf1 100644 --- a/core/extractor/__init__.py +++ b/core/extractor/__init__.py @@ -1,9 +1,12 @@ +from __future__ import annotations + import os import platform import shutil import stat import subprocess -from subprocess import Popen, call +from subprocess import call +from subprocess import Popen from time import sleep import core diff --git a/core/github_api.py b/core/github_api.py index 5e857f54..6359c37b 100644 --- a/core/github_api.py +++ b/core/github_api.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import requests diff --git a/core/logger.py b/core/logger.py index 365b3699..1516412e 100644 --- a/core/logger.py +++ b/core/logger.py @@ -1,10 +1,12 @@ +from __future__ import annotations + +import functools import logging import os import sys import threading import core -import functools # number of log files to keep NUM_LOGS = 3 diff --git a/core/main_db.py b/core/main_db.py index 6aff97ac..02c4be58 100644 --- a/core/main_db.py +++ b/core/main_db.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import re import sqlite3 import time diff --git a/core/plugins/downloaders/configuration.py b/core/plugins/downloaders/configuration.py index 7ea4f881..5c122d7f 100644 --- a/core/plugins/downloaders/configuration.py +++ b/core/plugins/downloaders/configuration.py @@ -1,5 +1,5 @@ +from __future__ import annotations + from core.plugins.downloaders.nzb.configuration import configure_nzbs -from core.plugins.downloaders.torrent.configuration import ( - configure_torrents, - configure_torrent_class, -) +from core.plugins.downloaders.torrent.configuration import configure_torrent_class +from core.plugins.downloaders.torrent.configuration import configure_torrents diff --git a/core/plugins/downloaders/nzb/configuration.py b/core/plugins/downloaders/nzb/configuration.py index dea81610..0262e060 100644 --- a/core/plugins/downloaders/nzb/configuration.py +++ b/core/plugins/downloaders/nzb/configuration.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import core diff --git a/core/plugins/downloaders/nzb/utils.py b/core/plugins/downloaders/nzb/utils.py index 3f5cd347..649be19d 100644 --- a/core/plugins/downloaders/nzb/utils.py +++ b/core/plugins/downloaders/nzb/utils.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import requests diff --git a/core/plugins/downloaders/torrent/configuration.py b/core/plugins/downloaders/torrent/configuration.py index ada32ee8..9c9e53e2 100644 --- a/core/plugins/downloaders/torrent/configuration.py +++ b/core/plugins/downloaders/torrent/configuration.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import core from core.plugins.downloaders.torrent.utils import create_torrent_class diff --git a/core/plugins/downloaders/torrent/deluge.py b/core/plugins/downloaders/torrent/deluge.py index ea588d6e..5503ee04 100644 --- a/core/plugins/downloaders/torrent/deluge.py +++ b/core/plugins/downloaders/torrent/deluge.py @@ -1,4 +1,6 @@ -from deluge_client.client import DelugeRPCClient +from __future__ import annotations + +from deluge_client import DelugeRPCClient import core from core import logger diff --git a/core/plugins/downloaders/torrent/qbittorrent.py b/core/plugins/downloaders/torrent/qbittorrent.py index dbfa14b1..4e625ec2 100644 --- a/core/plugins/downloaders/torrent/qbittorrent.py +++ b/core/plugins/downloaders/torrent/qbittorrent.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from qbittorrent import Client as qBittorrentClient import core diff --git a/core/plugins/downloaders/torrent/synology.py b/core/plugins/downloaders/torrent/synology.py index 0fe64cb4..6f24a3dc 100644 --- a/core/plugins/downloaders/torrent/synology.py +++ b/core/plugins/downloaders/torrent/synology.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from syno.downloadstation import DownloadStation import core diff --git a/core/plugins/downloaders/torrent/transmission.py b/core/plugins/downloaders/torrent/transmission.py index aeaab57a..910729f7 100644 --- a/core/plugins/downloaders/torrent/transmission.py +++ b/core/plugins/downloaders/torrent/transmission.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from transmissionrpc.client import Client as TransmissionClient import core diff --git a/core/plugins/downloaders/torrent/utils.py b/core/plugins/downloaders/torrent/utils.py index 87385799..26dfff53 100644 --- a/core/plugins/downloaders/torrent/utils.py +++ b/core/plugins/downloaders/torrent/utils.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import time import core @@ -5,9 +7,9 @@ from core import logger from .deluge import configure_client as deluge_client from .qbittorrent import configure_client as qbittorrent_client +from .synology import configure_client as synology_client from .transmission import configure_client as transmission_client from .utorrent import configure_client as utorrent_client -from .synology import configure_client as synology_client torrent_clients = { 'deluge': deluge_client, diff --git a/core/plugins/downloaders/torrent/utorrent.py b/core/plugins/downloaders/torrent/utorrent.py index 0ea72e32..51f1bd69 100644 --- a/core/plugins/downloaders/torrent/utorrent.py +++ b/core/plugins/downloaders/torrent/utorrent.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from utorrent.client import UTorrentClient import core diff --git a/core/plugins/downloaders/utils.py b/core/plugins/downloaders/utils.py index a84d270b..e68d1ebc 100644 --- a/core/plugins/downloaders/utils.py +++ b/core/plugins/downloaders/utils.py @@ -1,5 +1,5 @@ -from core.plugins.downloaders.torrent.utils import ( - pause_torrent, - remove_torrent, - resume_torrent, -) +from __future__ import annotations + +from core.plugins.downloaders.torrent.utils import pause_torrent +from core.plugins.downloaders.torrent.utils import remove_torrent +from core.plugins.downloaders.torrent.utils import resume_torrent diff --git a/core/plugins/plex.py b/core/plugins/plex.py index 4242de6e..5b1179ac 100644 --- a/core/plugins/plex.py +++ b/core/plugins/plex.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import requests import core diff --git a/core/plugins/subtitles.py b/core/plugins/subtitles.py index 3040cbba..e40f7700 100644 --- a/core/plugins/subtitles.py +++ b/core/plugins/subtitles.py @@ -1,12 +1,14 @@ -from babelfish import Language -import subliminal - -import core -from core import logger +from __future__ import annotations import os import re +import subliminal +from babelfish import Language + +import core +from core import logger + for provider in subliminal.provider_manager.internal_extensions: if provider not in [str(x) for x in subliminal.provider_manager.list_entry_points()]: subliminal.provider_manager.register(str(provider)) diff --git a/core/processor/manual.py b/core/processor/manual.py index ae2e08a8..99b7b41e 100644 --- a/core/processor/manual.py +++ b/core/processor/manual.py @@ -1,13 +1,13 @@ +from __future__ import annotations + import os import core from core import logger from core.auto_process.common import ProcessResult from core.processor import nzb -from core.utils import ( - get_dirs, - get_download_info, -) +from core.utils import get_dirs +from core.utils import get_download_info def process(): diff --git a/core/processor/nzb.py b/core/processor/nzb.py index bcf06ee7..8572aabf 100644 --- a/core/processor/nzb.py +++ b/core/processor/nzb.py @@ -1,19 +1,25 @@ +from __future__ import annotations + import datetime import core -from core import logger, main_db -from core.auto_process import comics, games, movies, music, tv, books +from core import logger +from core import main_db +from core.auto_process import books +from core.auto_process import comics +from core.auto_process import games +from core.auto_process import movies +from core.auto_process import music +from core.auto_process import tv from core.auto_process.common import ProcessResult from core.plugins.downloaders.nzb.utils import get_nzoid from core.plugins.plex import plex_update from core.user_scripts import external_script -from core.utils import ( - char_replace, - clean_dir, - convert_to_ascii, - extract_files, - update_download_info_status, -) +from core.utils import char_replace +from core.utils import clean_dir +from core.utils import convert_to_ascii +from core.utils import extract_files +from core.utils import update_download_info_status def process(input_directory, input_name=None, status=0, client_agent='manual', download_id=None, input_category=None, failure_link=None): diff --git a/core/processor/nzbget.py b/core/processor/nzbget.py index 05fac50e..e0f42b11 100644 --- a/core/processor/nzbget.py +++ b/core/processor/nzbget.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import sys diff --git a/core/processor/sab.py b/core/processor/sab.py index 956371fa..4ab9121d 100644 --- a/core/processor/sab.py +++ b/core/processor/sab.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os from core import logger diff --git a/core/scene_exceptions.py b/core/scene_exceptions.py index d62921f8..f1217037 100644 --- a/core/scene_exceptions.py +++ b/core/scene_exceptions.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import platform import re diff --git a/core/transcoder.py b/core/transcoder.py index 0a9ae537..278e864e 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -1,12 +1,14 @@ +from __future__ import annotations + import errno import json -import sys import os -import time import platform import re import shutil import subprocess +import sys +import time from babelfish import Language diff --git a/core/user_scripts.py b/core/user_scripts.py index 1384c9f8..cac9c839 100644 --- a/core/user_scripts.py +++ b/core/user_scripts.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os from subprocess import Popen diff --git a/core/utils/__init__.py b/core/utils/__init__.py index f4ae2ffe..d5f64a3e 100644 --- a/core/utils/__init__.py +++ b/core/utils/__init__.py @@ -1,43 +1,53 @@ +from __future__ import annotations + import requests -from core.utils.common import clean_dir, flatten, get_dirs, process_dir -from core.utils.download_info import get_download_info, update_download_info_status -from core.utils.encoding import char_replace, convert_to_ascii -from core.utils.files import ( - backup_versioned_file, - extract_files, - is_archive_file, - is_media_file, - is_min_size, - list_media_files, - move_file, -) -from core.utils.identification import category_search, find_imdbid -from core.utils.links import copy_link, replace_links -from core.utils.naming import clean_file_name, is_sample, sanitize_name -from core.utils.network import find_download, server_responding, test_connection, wake_on_lan, wake_up -from core.utils.parsers import ( - parse_args, - parse_deluge, - parse_other, - parse_qbittorrent, - parse_rtorrent, - parse_transmission, - parse_utorrent, - parse_vuze, -) -from core.utils.paths import ( - clean_directory, - flatten_dir, - get_dir_size, - make_dir, - onerror, - rchmod, - remote_dir, - remove_dir, - remove_empty_folders, - remove_read_only, -) -from core.utils.processes import RunningProcess, restart +from core.utils.common import clean_dir +from core.utils.common import flatten +from core.utils.common import get_dirs +from core.utils.common import process_dir +from core.utils.download_info import get_download_info +from core.utils.download_info import update_download_info_status +from core.utils.encoding import char_replace +from core.utils.encoding import convert_to_ascii +from core.utils.files import backup_versioned_file +from core.utils.files import extract_files +from core.utils.files import is_archive_file +from core.utils.files import is_media_file +from core.utils.files import is_min_size +from core.utils.files import list_media_files +from core.utils.files import move_file +from core.utils.identification import category_search +from core.utils.identification import find_imdbid +from core.utils.links import copy_link +from core.utils.links import replace_links +from core.utils.naming import clean_file_name +from core.utils.naming import is_sample +from core.utils.naming import sanitize_name +from core.utils.network import find_download +from core.utils.network import server_responding +from core.utils.network import test_connection +from core.utils.network import wake_on_lan +from core.utils.network import wake_up +from core.utils.parsers import parse_args +from core.utils.parsers import parse_deluge +from core.utils.parsers import parse_other +from core.utils.parsers import parse_qbittorrent +from core.utils.parsers import parse_rtorrent +from core.utils.parsers import parse_transmission +from core.utils.parsers import parse_utorrent +from core.utils.parsers import parse_vuze +from core.utils.paths import clean_directory +from core.utils.paths import flatten_dir +from core.utils.paths import get_dir_size +from core.utils.paths import make_dir +from core.utils.paths import onerror +from core.utils.paths import rchmod +from core.utils.paths import remote_dir +from core.utils.paths import remove_dir +from core.utils.paths import remove_empty_folders +from core.utils.paths import remove_read_only +from core.utils.processes import restart +from core.utils.processes import RunningProcess requests.packages.urllib3.disable_warnings() diff --git a/core/utils/common.py b/core/utils/common.py index 4bc941fc..fe7d3a40 100644 --- a/core/utils/common.py +++ b/core/utils/common.py @@ -1,11 +1,15 @@ +from __future__ import annotations + import os.path import typing import urllib.parse import core from core import logger -from core.utils.files import list_media_files, move_file -from core.utils.paths import clean_directory, flatten_dir +from core.utils.files import list_media_files +from core.utils.files import move_file +from core.utils.paths import clean_directory +from core.utils.paths import flatten_dir def flatten(output_destination): @@ -116,7 +120,7 @@ def get_dirs(section, subsection, link='hard'): def create_url( scheme: str, host: str, - port: typing.Optional[int] = None, + port: int | None = None, path: str = '', query: str = '', ) -> str: diff --git a/core/utils/download_info.py b/core/utils/download_info.py index 063ab2bd..f283af2f 100644 --- a/core/utils/download_info.py +++ b/core/utils/download_info.py @@ -1,6 +1,9 @@ +from __future__ import annotations + import datetime -from core import logger, main_db +from core import logger +from core import main_db database = main_db.DBConnection() diff --git a/core/utils/encoding.py b/core/utils/encoding.py index 16253287..bbb930f1 100644 --- a/core/utils/encoding.py +++ b/core/utils/encoding.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import core diff --git a/core/utils/files.py b/core/utils/files.py index a634ed9a..59fe495b 100644 --- a/core/utils/files.py +++ b/core/utils/files.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import re import shutil @@ -8,10 +10,13 @@ import beets.mediafile import guessit import core -from core import extractor, logger +from core import extractor +from core import logger from core.utils.links import copy_link -from core.utils.naming import is_sample, sanitize_name -from core.utils.paths import get_dir_size, make_dir +from core.utils.naming import is_sample +from core.utils.naming import sanitize_name +from core.utils.paths import get_dir_size +from core.utils.paths import make_dir def move_file(mediafile, path, link): diff --git a/core/utils/identification.py b/core/utils/identification.py index aeac0b9e..7755fb44 100644 --- a/core/utils/identification.py +++ b/core/utils/identification.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import re diff --git a/core/utils/links.py b/core/utils/links.py index c5034de8..2075bcc6 100644 --- a/core/utils/links.py +++ b/core/utils/links.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import shutil diff --git a/core/utils/naming.py b/core/utils/naming.py index ba014312..6eb9362a 100644 --- a/core/utils/naming.py +++ b/core/utils/naming.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import re diff --git a/core/utils/network.py b/core/utils/network.py index fcd3dbad..8ace77b9 100644 --- a/core/utils/network.py +++ b/core/utils/network.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import socket import struct import time diff --git a/core/utils/parsers.py b/core/utils/parsers.py index 5f0631a4..aeaa2fce 100644 --- a/core/utils/parsers.py +++ b/core/utils/parsers.py @@ -1,3 +1,5 @@ +from __future__ import annotations + import os import core diff --git a/core/utils/paths.py b/core/utils/paths.py index bf3acc41..c1c0c1a5 100644 --- a/core/utils/paths.py +++ b/core/utils/paths.py @@ -1,8 +1,10 @@ -from functools import partial +from __future__ import annotations + import os import re import shutil import stat +from functools import partial import core from core import logger diff --git a/core/utils/processes.py b/core/utils/processes.py index 22f0155e..86b80ce4 100644 --- a/core/utils/processes.py +++ b/core/utils/processes.py @@ -1,10 +1,15 @@ +from __future__ import annotations + import os import socket import subprocess import sys import core -from core import logger, version_check, APP_FILENAME, SYS_ARGV +from core import APP_FILENAME +from core import logger +from core import SYS_ARGV +from core import version_check if os.name == 'nt': from win32event import CreateMutex diff --git a/core/version_check.py b/core/version_check.py index e08629dc..5a513381 100644 --- a/core/version_check.py +++ b/core/version_check.py @@ -1,5 +1,6 @@ # Author: Nic Wolfe # Modified by: echel0n +from __future__ import annotations import os import platform @@ -9,12 +10,12 @@ import stat import subprocess import tarfile import traceback - from urllib.request import urlretrieve import cleanup import core -from core import github_api as github, logger +from core import github_api as github +from core import logger class CheckVersion: diff --git a/eol.py b/eol.py index 0bbeea38..34d1d022 100644 --- a/eol.py +++ b/eol.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import datetime import sys diff --git a/setup.py b/setup.py index 7ad147d8..d693f78f 100644 --- a/setup.py +++ b/setup.py @@ -1,4 +1,5 @@ #!/usr/bin/env python +from __future__ import annotations import io import os.path diff --git a/tests/__init__.py b/tests/__init__.py index 1f47cffe..fe2164dc 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -1 +1,2 @@ +from __future__ import annotations __author__ = 'Justin' diff --git a/tests/test_initialize.py b/tests/test_initialize.py index fc2ace2f..da76c10c 100755 --- a/tests/test_initialize.py +++ b/tests/test_initialize.py @@ -1,4 +1,5 @@ #! /usr/bin/env python +from __future__ import annotations import core diff --git a/tests/test_transcoder.py b/tests/test_transcoder.py index bbb39273..25769a5c 100755 --- a/tests/test_transcoder.py +++ b/tests/test_transcoder.py @@ -1,4 +1,5 @@ #! /usr/bin/env python +from __future__ import annotations import core from core import transcoder