Refactor nzbToMediaUtil -> utils

TorrentToMedia.py

@@ -7,7 +7,7 @@ import sys
 import core
 from core import logger, main_db
 from core.user_scripts import external_script
-from core.nzbToMediaUtil import char_replace, convert_to_ascii, plex_update, replace_links
+from core.utils import char_replace, convert_to_ascii, plex_update, replace_links
 from six import text_type
 
 

core/__init__.py

@@ -45,7 +45,7 @@ from six.moves import reload_module
 from core import logger, main_db, version_check, databases, transcoder
 from core.auto_process import Comic, Game, Movie, Music, TV
 from core.configuration import config
-from core.nzbToMediaUtil import (
+from core.utils import (
     RunningProcess, wake_up, category_search, clean_dir, clean_dir, copy_link,
     create_torrent_class, extract_files, flatten, get_dirs, get_download_info,
     list_media_files, make_dir, parse_args, pause_torrent, remove_torrent,

core/auto_process/comics.py

@@ -6,7 +6,7 @@ import requests
 
 import core
 from core import logger
-from core.nzbToMediaUtil import convert_to_ascii, remote_dir, server_responding
+from core.utils import convert_to_ascii, remote_dir, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/auto_process/games.py

@@ -7,7 +7,7 @@ import requests
 
 import core
 from core import logger
-from core.nzbToMediaUtil import convert_to_ascii, server_responding
+from core.utils import convert_to_ascii, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/auto_process/movies.py

@@ -9,7 +9,7 @@ import requests
 import core
 from core import logger, transcoder
 from core.scene_exceptions 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.utils import convert_to_ascii, find_download, find_imdbid, import_subs, list_media_files, remote_dir, remove_dir, report_nzb, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/auto_process/music.py

@@ -9,7 +9,7 @@ import requests
 import core
 from core import logger
 from core.scene_exceptions import process_all_exceptions
-from core.nzbToMediaUtil import convert_to_ascii, list_media_files, remote_dir, remove_dir, server_responding
+from core.utils import convert_to_ascii, list_media_files, remote_dir, remove_dir, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/auto_process/tv.py

@@ -12,7 +12,7 @@ import core
 from core import logger, transcoder
 from core.forks import auto_fork
 from core.scene_exceptions 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.utils import convert_to_ascii, flatten, import_subs, list_media_files, remote_dir, remove_dir, report_nzb, server_responding
 
 requests.packages.urllib3.disable_warnings()
 

core/databases.py

@@ -1,7 +1,7 @@
 # coding=utf-8
 
 from core import logger, main_db
-from core.nzbToMediaUtil import backup_versioned_file
+from core.utils import backup_versioned_file
 
 MIN_DB_VERSION = 1  # oldest db version we support migrating from
 MAX_DB_VERSION = 2

core/scene_exceptions.py

@@ -8,7 +8,7 @@ import subprocess
 
 import core
 from core import logger
-from core.nzbToMediaUtil import list_media_files
+from core.utils import list_media_files
 
 reverse_list = [r"\.\d{2}e\d{2}s\.", r"\.[pi]0801\.", r"\.p027\.", r"\.[pi]675\.", r"\.[pi]084\.", r"\.p063\.",
                 r"\b[45]62[xh]\.", r"\.yarulb\.", r"\.vtd[hp]\.",

core/transcoder.py

@@ -9,11 +9,11 @@ import shutil
 import subprocess
 
 from babelfish import Language
-from six import iteritems, text_type, string_types
+from six import iteritems, string_types, text_type
 
 import core
 from core import logger
-from core.nzbToMediaUtil import make_dir
+from core.utils import make_dir
 
 __author__ = 'Justin'
 

core/user_scripts.py

@@ -5,7 +5,7 @@ from subprocess import Popen
 
 import core
 from core import logger, transcoder
-from core.nzbToMediaUtil import import_subs, list_media_files, remove_dir
+from core.utils import import_subs, list_media_files, remove_dir
 
 
 def external_script(output_destination, torrent_name, torrent_label, settings):

nzbToMedia.py

@@ -631,7 +631,7 @@ import core
 from core import logger, main_db
 from core.auto_process import Comic, Game, Movie, Music, TV
 from core.user_scripts import external_script
-from core.nzbToMediaUtil import char_replace, clean_dir, convert_to_ascii, extract_files, get_dirs, get_download_info, get_nzoid, plex_update, update_download_info_status
+from core.utils import char_replace, clean_dir, convert_to_ascii, extract_files, get_dirs, get_download_info, get_nzoid, plex_update, update_download_info_status
 
 try:
     text_type = unicode

tests/general.py

@@ -7,7 +7,7 @@ import requests
 import core
 from core import transcoder
 from core.forks import auto_fork
-from core.nzbToMediaUtil import server_responding
+from core.utils import server_responding
 
 # Initialize the config
 core.initialize()