From d3ce2a10f5bafe99eeac6a0a97361c8e802de519 Mon Sep 17 00:00:00 2001
From: Labrys of Knossos <Labrys.git@gmail.com>
Date: Tue, 18 Dec 2018 18:52:19 -0500
Subject: [PATCH] Refactor transcoder.transcoder -> transcoder

---
 core/__init__.py                    | 4 +---
 core/auto_process/movies.py         | 3 +--
 core/auto_process/tv.py             | 3 +--
 core/nzbToMediaUserScript.py        | 3 +--
 core/{transcoder => }/transcoder.py | 2 ++
 core/transcoder/__init__.py         | 2 --
 tests/general.py                    | 2 +-
 7 files changed, 7 insertions(+), 12 deletions(-)
 rename core/{transcoder => }/transcoder.py (99%)
 delete mode 100644 core/transcoder/__init__.py

diff --git a/core/__init__.py b/core/__init__.py
index d0362fd5..b665d255 100644
--- a/core/__init__.py
+++ b/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']
diff --git a/core/auto_process/movies.py b/core/auto_process/movies.py
index 9a3ed3db..6f86a706 100644
--- a/core/auto_process/movies.py
+++ b/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()
 
diff --git a/core/auto_process/tv.py b/core/auto_process/tv.py
index 1636e55b..d93f1d53 100644
--- a/core/auto_process/tv.py
+++ b/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()
 
diff --git a/core/nzbToMediaUserScript.py b/core/nzbToMediaUserScript.py
index c4885444..4e0e966a 100644
--- a/core/nzbToMediaUserScript.py
+++ b/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):
diff --git a/core/transcoder/transcoder.py b/core/transcoder.py
similarity index 99%
rename from core/transcoder/transcoder.py
rename to core/transcoder.py
index 49ca1ace..bc0e2d2a 100644
--- a/core/transcoder/transcoder.py
+++ b/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)
diff --git a/core/transcoder/__init__.py b/core/transcoder/__init__.py
deleted file mode 100644
index b1629751..00000000
--- a/core/transcoder/__init__.py
+++ /dev/null
@@ -1,2 +0,0 @@
-# coding=utf-8
-__author__ = 'Justin'
diff --git a/tests/general.py b/tests/general.py
index e0410c14..d67c9b81 100755
--- a/tests/general.py
+++ b/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()