From 5bc789bca3fb368e312d9196772458e988377219 Mon Sep 17 00:00:00 2001 From: Labrys of Knossos Date: Fri, 14 Dec 2018 20:51:54 -0500 Subject: [PATCH] Optimize imports --- TorrentToMedia.py | 6 +++--- core/__init__.py | 17 ++++++++------- core/autoProcess/autoProcessComics.py | 5 +++-- core/autoProcess/autoProcessGames.py | 7 ++++--- core/autoProcess/autoProcessMovie.py | 11 +++++----- core/autoProcess/autoProcessMusic.py | 11 +++++----- core/autoProcess/autoProcessTV.py | 13 ++++++------ core/extractor/extractor.py | 7 ++++--- core/logger.py | 3 ++- core/nzbToMediaAutoFork.py | 1 - core/nzbToMediaConfig.py | 13 ++++++------ core/nzbToMediaSceneExceptions.py | 8 ++++--- core/nzbToMediaUserScript.py | 8 ++++--- core/nzbToMediaUtil.py | 30 ++++++++++++++------------- core/transcoder/transcoder.py | 14 +++++++------ core/versionCheck.py | 10 ++++----- nzbToCouchPotato.py | 1 + nzbToGamez.py | 1 + nzbToHeadPhones.py | 1 + nzbToLidarr.py | 1 + nzbToMedia.py | 8 +++---- nzbToMylar.py | 1 + nzbToNzbDrone.py | 1 + nzbToRadarr.py | 1 + nzbToSickBeard.py | 1 + tests/general.py | 10 +++------ 26 files changed, 105 insertions(+), 85 deletions(-) diff --git a/TorrentToMedia.py b/TorrentToMedia.py index 1bd92b28..22bac54e 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -3,12 +3,12 @@ import datetime import os import sys -import core -from libs.six import text_type +import core from core import logger, nzbToMediaDB -from core.nzbToMediaUtil import convert_to_ascii, CharReplace, plex_update, replace_links from core.nzbToMediaUserScript import external_script +from core.nzbToMediaUtil import CharReplace, convert_to_ascii, plex_update, replace_links +from libs.six import text_type def processTorrent(inputDirectory, inputName, inputCategory, inputHash, inputID, clientAgent): diff --git a/core/__init__.py b/core/__init__.py index cc0c44c8..c1fb443d 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -5,10 +5,10 @@ from __future__ import print_function import itertools import locale import os +import platform import re import subprocess import sys -import platform import time @@ -34,21 +34,22 @@ MYAPP = None import six from six.moves import reload_module +from core import logger, nzbToMediaDB, versionCheck from core.autoProcess.autoProcessComics import autoProcessComics from core.autoProcess.autoProcessGames import autoProcessGames from core.autoProcess.autoProcessMovie import autoProcessMovie from core.autoProcess.autoProcessMusic import autoProcessMusic from core.autoProcess.autoProcessTV import autoProcessTV -from core import logger, versionCheck, nzbToMediaDB +from core.databases import mainDB from core.nzbToMediaConfig import config from core.nzbToMediaUtil import ( - category_search, sanitizeName, copy_link, parse_args, flatten, getDirs, - rmReadOnly, rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles, - extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanDir, - create_torrent_class, listMediaFiles, RunningProcess, - ) + RunningProcess, WakeUp, category_search, cleanDir, cleanDir, copy_link, + create_torrent_class, extractFiles, flatten, getDirs, get_downloadInfo, + listMediaFiles, makeDir, parse_args, pause_torrent, remove_torrent, + resume_torrent, rmDir, rmReadOnly, sanitizeName, update_downloadInfoStatus, +) from core.transcoder import transcoder -from core.databases import mainDB + # Client Agents NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual'] diff --git a/core/autoProcess/autoProcessComics.py b/core/autoProcess/autoProcessComics.py index 0e4facf7..56d65f2e 100644 --- a/core/autoProcess/autoProcessComics.py +++ b/core/autoProcess/autoProcessComics.py @@ -1,11 +1,12 @@ # coding=utf-8 import os -import core + import requests -from core.nzbToMediaUtil import convert_to_ascii, remoteDir, server_responding +import core from core import logger +from core.nzbToMediaUtil import convert_to_ascii, remoteDir, server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/autoProcess/autoProcessGames.py b/core/autoProcess/autoProcessGames.py index ef7e7cb9..25b4c12f 100644 --- a/core/autoProcess/autoProcessGames.py +++ b/core/autoProcess/autoProcessGames.py @@ -1,12 +1,13 @@ # coding=utf-8 import os -import core -import requests import shutil -from core.nzbToMediaUtil import convert_to_ascii, server_responding +import requests + +import core from core import logger +from core.nzbToMediaUtil import convert_to_ascii, server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/autoProcess/autoProcessMovie.py b/core/autoProcess/autoProcessMovie.py index 4c9dd99d..d488640a 100644 --- a/core/autoProcess/autoProcessMovie.py +++ b/core/autoProcess/autoProcessMovie.py @@ -1,14 +1,15 @@ # coding=utf-8 +import json import os import time -import requests -import json -import core -from core.nzbToMediaSceneExceptions import process_all_exceptions -from core.nzbToMediaUtil import convert_to_ascii, rmDir, find_imdbid, find_download, listMediaFiles, remoteDir, import_subs, server_responding, reportNzb +import requests + +import core from core import logger +from core.nzbToMediaSceneExceptions import process_all_exceptions +from core.nzbToMediaUtil import convert_to_ascii, find_download, find_imdbid, import_subs, listMediaFiles, remoteDir, reportNzb, rmDir, server_responding from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() diff --git a/core/autoProcess/autoProcessMusic.py b/core/autoProcess/autoProcessMusic.py index be64d73c..54192d58 100644 --- a/core/autoProcess/autoProcessMusic.py +++ b/core/autoProcess/autoProcessMusic.py @@ -1,14 +1,15 @@ # coding=utf-8 +import json import os import time -import requests -import core -import json -from core.nzbToMediaUtil import convert_to_ascii, rmDir, remoteDir, listMediaFiles, server_responding -from core.nzbToMediaSceneExceptions import process_all_exceptions +import requests + +import core from core import logger +from core.nzbToMediaSceneExceptions import process_all_exceptions +from core.nzbToMediaUtil import convert_to_ascii, listMediaFiles, remoteDir, rmDir, server_responding requests.packages.urllib3.disable_warnings() diff --git a/core/autoProcess/autoProcessTV.py b/core/autoProcess/autoProcessTV.py index b9d92fcd..bacf7b15 100644 --- a/core/autoProcess/autoProcessTV.py +++ b/core/autoProcess/autoProcessTV.py @@ -1,17 +1,18 @@ # coding=utf-8 import copy +import errno +import json import os import time -import errno -import requests -import json -import core +import requests + +import core +from core import logger from core.nzbToMediaAutoFork import autoFork from core.nzbToMediaSceneExceptions import process_all_exceptions -from core.nzbToMediaUtil import convert_to_ascii, flatten, rmDir, listMediaFiles, remoteDir, import_subs, server_responding, reportNzb -from core import logger +from core.nzbToMediaUtil import convert_to_ascii, flatten, import_subs, listMediaFiles, remoteDir, reportNzb, rmDir, server_responding from core.transcoder import transcoder requests.packages.urllib3.disable_warnings() diff --git a/core/extractor/extractor.py b/core/extractor/extractor.py index 1eb2cb1e..c32d9c9a 100644 --- a/core/extractor/extractor.py +++ b/core/extractor/extractor.py @@ -4,10 +4,11 @@ import os import platform import shutil import stat -from time import sleep -import core -from subprocess import call, Popen import subprocess +from subprocess import Popen, call +from time import sleep + +import core def extract(filePath, outputDestination): diff --git a/core/logger.py b/core/logger.py index 5a555bf2..9a30913f 100644 --- a/core/logger.py +++ b/core/logger.py @@ -1,10 +1,11 @@ # coding=utf-8 from __future__ import with_statement +import logging import os import sys import threading -import logging + import core # number of log files to keep diff --git a/core/nzbToMediaAutoFork.py b/core/nzbToMediaAutoFork.py index a4bb9207..ba3fab2f 100644 --- a/core/nzbToMediaAutoFork.py +++ b/core/nzbToMediaAutoFork.py @@ -1,7 +1,6 @@ # coding=utf-8 import requests - from six import iteritems import core diff --git a/core/nzbToMediaConfig.py b/core/nzbToMediaConfig.py index 6b57817c..7f915936 100644 --- a/core/nzbToMediaConfig.py +++ b/core/nzbToMediaConfig.py @@ -1,15 +1,16 @@ # coding=utf-8 -from six import iteritems +import copy import os import shutil -import copy -import core -import configobj -from core import logger - from itertools import chain +import configobj +from six import iteritems + +import core +from core import logger + class Section(configobj.Section, object): def isenabled(section): diff --git a/core/nzbToMediaSceneExceptions.py b/core/nzbToMediaSceneExceptions.py index 21289d12..7a9e1dd5 100644 --- a/core/nzbToMediaSceneExceptions.py +++ b/core/nzbToMediaSceneExceptions.py @@ -1,10 +1,12 @@ # coding=utf-8 + import os -import re -import core -import shlex import platform +import re +import shlex import subprocess + +import core from core import logger from core.nzbToMediaUtil import listMediaFiles diff --git a/core/nzbToMediaUserScript.py b/core/nzbToMediaUserScript.py index 679521f1..046e0a69 100644 --- a/core/nzbToMediaUserScript.py +++ b/core/nzbToMediaUserScript.py @@ -1,10 +1,12 @@ # coding=utf-8 + import os -import core from subprocess import Popen -from core.transcoder import transcoder -from core.nzbToMediaUtil import import_subs, listMediaFiles, rmDir + +import core from core import logger +from core.nzbToMediaUtil import import_subs, listMediaFiles, rmDir +from core.transcoder import transcoder def external_script(outputDestination, torrentName, torrentLabel, settings): diff --git a/core/nzbToMediaUtil.py b/core/nzbToMediaUtil.py index 4338a624..7414b9ac 100644 --- a/core/nzbToMediaUtil.py +++ b/core/nzbToMediaUtil.py @@ -1,30 +1,32 @@ # coding=utf-8 from __future__ import print_function, unicode_literals -from six import text_type + +import datetime import os +import platform import re +import shutil import socket import stat import struct -import shutil import time -import datetime -import platform -import guessit -import beets -import requests -import core -from babelfish import Language -import subliminal +import beets +import guessit +import requests +import subliminal +from babelfish import Language +from six import text_type + +import core +from core import logger, nzbToMediaDB from core.extractor import extractor from core.linktastic import linktastic -from core.synchronousdeluge.client import DelugeClient -from core.utorrent.client import UTorrentClient -from core.transmissionrpc.client import Client as TransmissionClient from core.qbittorrent.client import Client as qBittorrentClient -from core import logger, nzbToMediaDB +from core.synchronousdeluge.client import DelugeClient +from core.transmissionrpc.client import Client as TransmissionClient +from core.utorrent.client import UTorrentClient requests.packages.urllib3.disable_warnings() diff --git a/core/transcoder/transcoder.py b/core/transcoder/transcoder.py index 9c61efca..814de4ca 100644 --- a/core/transcoder/transcoder.py +++ b/core/transcoder/transcoder.py @@ -1,17 +1,19 @@ # coding=utf-8 -from six import iteritems import errno +import json import os import platform -import subprocess -import core -import json -import shutil import re +import shutil +import subprocess + +from babelfish import Language +from six import iteritems + +import core from core import logger from core.nzbToMediaUtil import makeDir -from babelfish import Language def isVideoGood(videofile, status): diff --git a/core/versionCheck.py b/core/versionCheck.py index 85d8ec75..529e21e1 100644 --- a/core/versionCheck.py +++ b/core/versionCheck.py @@ -4,16 +4,16 @@ import os import platform -import shutil -import subprocess import re -import urllib -import tarfile +import shutil import stat +import subprocess +import tarfile import traceback -import gh_api as github +import urllib import core +import gh_api as github from core import logger diff --git a/nzbToCouchPotato.py b/nzbToCouchPotato.py index ec30db9a..9b91f789 100755 --- a/nzbToCouchPotato.py +++ b/nzbToCouchPotato.py @@ -256,6 +256,7 @@ ############################################################################## import sys + import nzbToMedia section = "CouchPotato" diff --git a/nzbToGamez.py b/nzbToGamez.py index b98bf89a..8b846c55 100755 --- a/nzbToGamez.py +++ b/nzbToGamez.py @@ -101,6 +101,7 @@ ############################################################################## import sys + import nzbToMedia section = "Gamez" diff --git a/nzbToHeadPhones.py b/nzbToHeadPhones.py index 949bf0df..7ecdf701 100755 --- a/nzbToHeadPhones.py +++ b/nzbToHeadPhones.py @@ -123,6 +123,7 @@ ############################################################################## import sys + import nzbToMedia section = "HeadPhones" diff --git a/nzbToLidarr.py b/nzbToLidarr.py index a11a5eca..b9d1bf10 100755 --- a/nzbToLidarr.py +++ b/nzbToLidarr.py @@ -238,6 +238,7 @@ ############################################################################## import sys + import nzbToMedia section = "Lidarr" diff --git a/nzbToMedia.py b/nzbToMedia.py index 4e75bf12..3a8ce793 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -623,20 +623,20 @@ from __future__ import print_function +import datetime import os import sys -import datetime -from libs.six import text_type import core +from core import logger, nzbToMediaDB from core.autoProcess.autoProcessComics import autoProcessComics from core.autoProcess.autoProcessGames import autoProcessGames from core.autoProcess.autoProcessMovie import autoProcessMovie from core.autoProcess.autoProcessMusic import autoProcessMusic from core.autoProcess.autoProcessTV import autoProcessTV -from core.nzbToMediaUtil import getDirs, extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, CharReplace, convert_to_ascii, get_nzoid, plex_update from core.nzbToMediaUserScript import external_script -from core import logger, nzbToMediaDB +from core.nzbToMediaUtil import CharReplace, cleanDir, convert_to_ascii, extractFiles, getDirs, get_downloadInfo, get_nzoid, plex_update, update_downloadInfoStatus +from libs.six import text_type # post-processing diff --git a/nzbToMylar.py b/nzbToMylar.py index d9edfddf..7440bfdf 100755 --- a/nzbToMylar.py +++ b/nzbToMylar.py @@ -114,6 +114,7 @@ ############################################################################## import sys + import nzbToMedia section = "Mylar" diff --git a/nzbToNzbDrone.py b/nzbToNzbDrone.py index d1b67593..78116c71 100755 --- a/nzbToNzbDrone.py +++ b/nzbToNzbDrone.py @@ -243,6 +243,7 @@ ############################################################################## import sys + import nzbToMedia section = "NzbDrone" diff --git a/nzbToRadarr.py b/nzbToRadarr.py index 8f739e26..f9d2e5da 100755 --- a/nzbToRadarr.py +++ b/nzbToRadarr.py @@ -248,6 +248,7 @@ ############################################################################## import sys + import nzbToMedia section = "Radarr" diff --git a/nzbToSickBeard.py b/nzbToSickBeard.py index 036e6007..e9b25ad2 100755 --- a/nzbToSickBeard.py +++ b/nzbToSickBeard.py @@ -257,6 +257,7 @@ ############################################################################## import sys + import nzbToMedia section = "SickBeard" diff --git a/tests/general.py b/tests/general.py index be63331f..89f403f8 100755 --- a/tests/general.py +++ b/tests/general.py @@ -1,17 +1,13 @@ #! /usr/bin/env python2 from __future__ import print_function -import os -import sys -import datetime -import re -import core import guessit import requests + +import core from core.nzbToMediaAutoFork import autoFork -from core import nzbToMediaDB +from core.nzbToMediaUtil import server_responding from core.transcoder import transcoder -from core.nzbToMediaUtil import get_downloadInfo, server_responding # Initialize the config core.initialize()