Optimize imports

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):

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,
+    RunningProcess, WakeUp, category_search, cleanDir, cleanDir, copy_link,
-    rmReadOnly, rmDir, pause_torrent, resume_torrent, remove_torrent, listMediaFiles,
+    create_torrent_class, extractFiles, flatten, getDirs, get_downloadInfo,
-    extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, WakeUp, makeDir, cleanDir,
+    listMediaFiles, makeDir, parse_args, pause_torrent, remove_torrent,
-    create_torrent_class, listMediaFiles, RunningProcess,
+    resume_torrent, rmDir, rmReadOnly, sanitizeName, update_downloadInfoStatus,
- )
+)
 from core.transcoder import transcoder
-from core.databases import mainDB
+
 
 # Client Agents
 NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']

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()
 

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()
 

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
+import requests
-from core.nzbToMediaUtil import convert_to_ascii, rmDir, find_imdbid, find_download, listMediaFiles, remoteDir, import_subs, server_responding, reportNzb
+
+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()

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
+import requests
-from core.nzbToMediaSceneExceptions import process_all_exceptions
+
+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()
 

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.nzbToMediaUtil import convert_to_ascii, flatten, import_subs, listMediaFiles, remoteDir, reportNzb, rmDir, server_responding
-from core import logger
 from core.transcoder import transcoder
 
 requests.packages.urllib3.disable_warnings()

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):

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

core/nzbToMediaAutoFork.py

@@ -1,7 +1,6 @@
 # coding=utf-8
 
 import requests
-
 from six import iteritems
 
 import core

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):

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
 

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):

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()
 

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):

core/versionCheck.py

@@ -4,16 +4,16 @@
 
 import os
 import platform
-import shutil
-import subprocess
 import re
-import urllib
+import shutil
-import tarfile
 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
 
 

nzbToCouchPotato.py

@@ -256,6 +256,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "CouchPotato"

nzbToGamez.py

@@ -101,6 +101,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "Gamez"

nzbToHeadPhones.py

@@ -123,6 +123,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "HeadPhones"

nzbToLidarr.py

@@ -238,6 +238,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "Lidarr"

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

nzbToMylar.py

@@ -114,6 +114,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "Mylar"

nzbToNzbDrone.py

@@ -243,6 +243,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "NzbDrone"

nzbToRadarr.py

@@ -248,6 +248,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "Radarr"

nzbToSickBeard.py

@@ -257,6 +257,7 @@
 ##############################################################################
 
 import sys
+
 import nzbToMedia
 
 section = "SickBeard"

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()