diff --git a/core/__init__.py b/core/__init__.py index 9c040377..4cce519d 100644 --- a/core/__init__.py +++ b/core/__init__.py @@ -175,11 +175,11 @@ PLEX_PORT = None PLEX_TOKEN = None PLEX_SECTION = [] -EXTCONTAINER = [] -COMPRESSEDCONTAINER = [] -MEDIACONTAINER = [] -AUDIOCONTAINER = [] -METACONTAINER = [] +EXT_CONTAINER = [] +COMPRESSED_CONTAINER = [] +MEDIA_CONTAINER = [] +AUDIO_CONTAINER = [] +META_CONTAINER = [] SECTIONS = [] CATEGORIES = [] @@ -257,15 +257,15 @@ def initialize(section=None): NZBTOMEDIA_BRANCH, NZBTOMEDIA_VERSION, NEWEST_VERSION, NEWEST_VERSION_STRING, VERSION_NOTIFY, SYS_ARGV, CFG, \ SABNZB_NO_OF_ARGUMENTS, SABNZB_0717_NO_OF_ARGUMENTS, CATEGORIES, TORRENT_CLIENT_AGENT, USE_LINK, OUTPUT_DIRECTORY, \ NOFLATTEN, UTORRENT_PASSWORD, UTORRENT_USER, UTORRENT_WEB_UI, DELUGE_HOST, DELUGE_PORT, DELUGE_USER, DELUGE_PASSWORD, VLEVEL, \ - TRANSMISSION_HOST, TRANSMISSION_PORT, TRANSMISSION_PASSWORD, TRANSMISSION_USER, COMPRESSEDCONTAINER, MEDIACONTAINER, \ - METACONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \ + TRANSMISSION_HOST, TRANSMISSION_PORT, TRANSMISSION_PASSWORD, TRANSMISSION_USER, COMPRESSED_CONTAINER, MEDIA_CONTAINER, \ + META_CONTAINER, SECTIONS, ALL_FORKS, TEST_FILE, GENERALOPTS, LOG_GIT, GROUPS, SEVENZIP, CONCAT, VCRF, \ __INITIALIZED__, AUTO_UPDATE, APP_FILENAME, USER_DELAY, APP_NAME, TRANSCODE, DEFAULTS, GIT_PATH, GIT_USER, \ GIT_BRANCH, GIT_REPO, SYS_ENCODING, NZB_CLIENT_AGENT, SABNZBD_HOST, SABNZBD_PORT, SABNZBD_APIKEY, \ DUPLICATE, IGNOREEXTENSIONS, VEXTENSION, OUTPUTVIDEOPATH, PROCESSOUTPUT, VCODEC, VCODEC_ALLOW, VPRESET, \ VFRAMERATE, LOG_DB, VBITRATE, VRESOLUTION, ALANGUAGE, AINCLUDE, ACODEC, ACODEC_ALLOW, ABITRATE, FAILED, \ ACODEC2, ACODEC2_ALLOW, ABITRATE2, ACODEC3, ACODEC3_ALLOW, ABITRATE3, ALLOWSUBS, SEXTRACT, SEMBED, SLANGUAGES, \ SINCLUDE, SUBSDIR, SCODEC, OUTPUTFASTSTART, OUTPUTQUALITYPERCENT, BURN, GETSUBS, HWACCEL, LOG_DIR, LOG_FILE, \ - NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIOCONTAINER, EXTCONTAINER, TORRENT_CLASS, \ + NICENESS, LOG_DEBUG, FORCE_CLEAN, FFMPEG_PATH, FFMPEG, FFPROBE, AUDIO_CONTAINER, EXT_CONTAINER, TORRENT_CLASS, \ DELETE_ORIGINAL, TORRENT_CHMOD_DIRECTORY, PASSWORDSFILE, USER_DELAY, USER_SCRIPT, USER_SCRIPT_CLEAN, USER_SCRIPT_MEDIAEXTENSIONS, \ USER_SCRIPT_PARAM, USER_SCRIPT_RUNONCE, USER_SCRIPT_SUCCESSCODES, DOWNLOADINFO, CHECK_MEDIA, SAFE_MODE, \ TORRENT_DEFAULT_DIRECTORY, TORRENT_RESUME_ON_FAILURE, NZB_DEFAULT_DIRECTORY, REMOTE_PATHS, LOG_ENV, PID_FILE, MYAPP, ACHANNELS, ACHANNELS2, ACHANNELS3, \ @@ -467,21 +467,21 @@ def initialize(section=None): pass devnull.close() - COMPRESSEDCONTAINER = [re.compile(r'.r\d{2}$', re.I), - re.compile(r'.part\d+.rar$', re.I), - re.compile('.rar$', re.I)] - COMPRESSEDCONTAINER += [re.compile('{0}$'.format(ext), re.I) for ext in CFG['Extensions']['compressedExtensions']] - MEDIACONTAINER = CFG['Extensions']['mediaExtensions'] - AUDIOCONTAINER = CFG['Extensions']['audioExtensions'] - METACONTAINER = CFG['Extensions']['metaExtensions'] # .nfo,.sub,.srt - if isinstance(COMPRESSEDCONTAINER, str): - COMPRESSEDCONTAINER = COMPRESSEDCONTAINER.split(',') - if isinstance(MEDIACONTAINER, str): - MEDIACONTAINER = MEDIACONTAINER.split(',') - if isinstance(AUDIOCONTAINER, str): - AUDIOCONTAINER = AUDIOCONTAINER.split(',') - if isinstance(METACONTAINER, str): - METACONTAINER = METACONTAINER.split(',') + COMPRESSED_CONTAINER = [re.compile(r'.r\d{2}$', re.I), + re.compile(r'.part\d+.rar$', re.I), + re.compile('.rar$', re.I)] + COMPRESSED_CONTAINER += [re.compile('{0}$'.format(ext), re.I) for ext in CFG['Extensions']['compressedExtensions']] + MEDIA_CONTAINER = CFG['Extensions']['mediaExtensions'] + AUDIO_CONTAINER = CFG['Extensions']['audioExtensions'] + META_CONTAINER = CFG['Extensions']['metaExtensions'] # .nfo,.sub,.srt + if isinstance(COMPRESSED_CONTAINER, str): + COMPRESSED_CONTAINER = COMPRESSED_CONTAINER.split(',') + if isinstance(MEDIA_CONTAINER, str): + MEDIA_CONTAINER = MEDIA_CONTAINER.split(',') + if isinstance(AUDIO_CONTAINER, str): + AUDIO_CONTAINER = AUDIO_CONTAINER.split(',') + if isinstance(META_CONTAINER, str): + META_CONTAINER = META_CONTAINER.split(',') GETSUBS = int(CFG['Transcoder']['getSubs']) TRANSCODE = int(CFG['Transcoder']['transcode']) diff --git a/core/transcoder.py b/core/transcoder.py index e2bfb33d..52a35292 100644 --- a/core/transcoder.py +++ b/core/transcoder.py @@ -22,7 +22,7 @@ def is_video_good(videofile, status): file_name_ext = os.path.basename(videofile) file_name, file_ext = os.path.splitext(file_name_ext) disable = False - if file_ext not in core.MEDIACONTAINER or not core.FFPROBE or not core.CHECK_MEDIA or file_ext in ['.iso'] or (status > 0 and core.NOEXTRACTFAILED): + if file_ext not in core.MEDIA_CONTAINER or not core.FFPROBE or not core.CHECK_MEDIA or file_ext in ['.iso'] or (status > 0 and core.NOEXTRACTFAILED): disable = True else: test_details, res = get_video_details(core.TEST_FILE) diff --git a/core/utils/files.py b/core/utils/files.py index b753af0c..895125e1 100644 --- a/core/utils/files.py +++ b/core/utils/files.py @@ -20,7 +20,7 @@ def move_file(mediafile, path, link): new_path = None file_ext = os.path.splitext(mediafile)[1] try: - if file_ext in core.AUDIOCONTAINER: + if file_ext in core.AUDIO_CONTAINER: f = beets.mediafile.MediaFile(mediafile) # get artist and album info @@ -29,7 +29,7 @@ def move_file(mediafile, path, link): # create new path new_path = os.path.join(path, '{0} - {1}'.format(sanitize_name(artist), sanitize_name(album))) - elif file_ext in core.MEDIACONTAINER: + elif file_ext in core.MEDIA_CONTAINER: f = guessit.guessit(mediafile) # get title @@ -75,7 +75,7 @@ def is_min_size(input_name, min_size): # audio files we need to check directory size not file size input_size = os.path.getsize(input_name) - if file_ext in core.AUDIOCONTAINER: + if file_ext in core.AUDIO_CONTAINER: try: input_size = get_dir_size(os.path.dirname(input_name)) except Exception: @@ -89,7 +89,7 @@ def is_min_size(input_name, min_size): def is_archive_file(filename): """Check if the filename is allowed for the Archive""" - for regext in core.COMPRESSEDCONTAINER: + for regext in core.COMPRESSED_CONTAINER: if regext.search(filename): return regext.split(filename)[0] return False @@ -109,9 +109,9 @@ def is_media_file(mediafile, media=True, audio=True, meta=True, archives=True, o pass return any([ - (media and file_ext.lower() in core.MEDIACONTAINER), - (audio and file_ext.lower() in core.AUDIOCONTAINER), - (meta and file_ext.lower() in core.METACONTAINER), + (media and file_ext.lower() in core.MEDIA_CONTAINER), + (audio and file_ext.lower() in core.AUDIO_CONTAINER), + (meta and file_ext.lower() in core.META_CONTAINER), (archives and is_archive_file(mediafile)), (other and (file_ext.lower() in otherext or 'all' in otherext)), ])