Refactor transcoder.transcoder -> transcoder

core/__init__.py

@@ -42,7 +42,7 @@ MYAPP = None
 import six
 from six.moves import reload_module
 
-from core import logger, nzbToMediaDB, versionCheck, databases
+from core import logger, nzbToMediaDB, versionCheck, databases, transcoder
 from core.auto_process import Comic, Game, Movie, Music, TV
 from core.nzbToMediaConfig import config
 from core.nzbToMediaUtil import (
@@ -51,8 +51,6 @@ from core.nzbToMediaUtil import (
     list_media_files, make_dir, parse_args, pause_torrent, remove_torrent,
     resume_torrent, remove_dir, remove_read_only, sanitize_name, update_download_info_status,
 )
-from core.transcoder import transcoder
-
 
 # Client Agents
 NZB_CLIENTS = ['sabnzbd', 'nzbget', 'manual']

core/auto_process/movies.py

@@ -7,10 +7,9 @@ import time
 import requests
 
 import core
-from core import logger
+from core import logger, transcoder
 from core.nzbToMediaSceneExceptions import process_all_exceptions
 from core.nzbToMediaUtil import convert_to_ascii, find_download, find_imdbid, import_subs, list_media_files, remote_dir, report_nzb, remove_dir, server_responding
-from core.transcoder import transcoder
 
 requests.packages.urllib3.disable_warnings()
 

core/auto_process/tv.py

@@ -9,11 +9,10 @@ import time
 import requests
 
 import core
-from core import logger
+from core import logger, transcoder
 from core.nzbToMediaAutoFork import auto_fork
 from core.nzbToMediaSceneExceptions import process_all_exceptions
 from core.nzbToMediaUtil import convert_to_ascii, flatten, import_subs, list_media_files, remote_dir, report_nzb, remove_dir, server_responding
-from core.transcoder import transcoder
 
 requests.packages.urllib3.disable_warnings()
 

core/nzbToMediaUserScript.py

@@ -4,9 +4,8 @@ import os
 from subprocess import Popen
 
 import core
-from core import logger
+from core import logger, transcoder
 from core.nzbToMediaUtil import import_subs, list_media_files, remove_dir
-from core.transcoder import transcoder
 
 
 def external_script(output_destination, torrent_name, torrent_label, settings):

core/transcoder.py

@@ -15,6 +15,8 @@ import core
 from core import logger
 from core.nzbToMediaUtil import make_dir
 
+__author__ = 'Justin'
+
 
 def is_video_good(videofile, status):
     file_name_ext = os.path.basename(videofile)

core/transcoder/__init__.py

@@ -1,2 +0,0 @@
-# coding=utf-8
-__author__ = 'Justin'

tests/general.py

@@ -5,9 +5,9 @@ import guessit
 import requests
 
 import core
+from core import transcoder
 from core.nzbToMediaAutoFork import auto_fork
 from core.nzbToMediaUtil import server_responding
-from core.transcoder import transcoder
 
 # Initialize the config
 core.initialize()