github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-21 13:53:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add peppiness

Browse source
This commit is contained in:
Labrys of Knossos 2022-12-09 16:08:25 -05:00
commit 5f54513b75
10 changed files with 401 additions and 254 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cleanup.py
View file

@ -68,8 +68,10 @@ def module_path(module=__file__, parent=False):
return normalized return normalized
def git_clean(remove_directories=False, force=False, dry_run=False, interactive=False, quiet=False, exclude=None, def git_clean(
ignore_rules=False, clean_ignored=False, paths=None): remove_directories=False, force=False, dry_run=False, interactive=False, quiet=False, exclude=None,
ignore_rules=False, clean_ignored=False, paths=None,
):
"""Execute git clean commands.""" """Execute git clean commands."""
command = ['git', 'clean'] command = ['git', 'clean']
if remove_directories: if remove_directories:

54
core/__init__.py
View file

@ -391,9 +391,9 @@ def configure_updates():
logger.error('Update failed, not restarting. Check your log for more information.') logger.error('Update failed, not restarting. Check your log for more information.')
# Set Current Version # Set Current Version
logger.info('nzbToMedia Version:{version} Branch:{branch} ({system} {release})'.format logger.info(
(version=NZBTOMEDIA_VERSION, branch=GIT_BRANCH, 'nzbToMedia Version:{version} Branch:{branch} ({system} {release})'.format(version=NZBTOMEDIA_VERSION, branch=GIT_BRANCH, system=platform.system(), release=platform.release()),
system=platform.system(), release=platform.release())) )
def configure_wake_on_lan(): def configure_wake_on_lan():
@ -442,7 +442,7 @@ def configure_niceness():
try: try:
subprocess.Popen(['nice'], stdout=devnull, stderr=devnull).communicate() subprocess.Popen(['nice'], stdout=devnull, stderr=devnull).communicate()
niceness = CFG['Posix']['niceness'] niceness = CFG['Posix']['niceness']
if len(niceness.split(',')) > 1: #Allow passing of absolute command, not just value. if len(niceness.split(',')) > 1: # Allow passing of absolute command, not just value.
NICENESS.extend(niceness.split(',')) NICENESS.extend(niceness.split(','))
else: else:
NICENESS.extend(['nice', f'-n{int(niceness)}']) NICENESS.extend(['nice', f'-n{int(niceness)}'])
@ -473,11 +473,15 @@ def configure_containers():
global AUDIO_CONTAINER global AUDIO_CONTAINER
global META_CONTAINER global META_CONTAINER
COMPRESSED_CONTAINER = [re.compile(r'.r\d{2}$', re.I), COMPRESSED_CONTAINER = [
re.compile(r'.part\d+.rar$', re.I), re.compile(r'.r\d{2}$', re.I),
re.compile('.rar$', re.I)] re.compile(r'.part\d+.rar$', re.I),
COMPRESSED_CONTAINER += [re.compile(f'{ext}$', re.I) for ext in re.compile('.rar$', re.I),
CFG['Extensions']['compressedExtensions']] ]
COMPRESSED_CONTAINER += [
re.compile(f'{ext}$', re.I) for ext in
CFG['Extensions']['compressedExtensions']
]
MEDIA_CONTAINER = CFG['Extensions']['mediaExtensions'] MEDIA_CONTAINER = CFG['Extensions']['mediaExtensions']
AUDIO_CONTAINER = CFG['Extensions']['audioExtensions'] AUDIO_CONTAINER = CFG['Extensions']['audioExtensions']
META_CONTAINER = CFG['Extensions']['metaExtensions'] # .nfo,.sub,.srt META_CONTAINER = CFG['Extensions']['metaExtensions'] # .nfo,.sub,.srt
@ -755,7 +759,7 @@ def configure_transcoder():
'ACODEC': 'dts', 'ACODEC_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE': None, 'ACHANNELS': 8, 'ACODEC': 'dts', 'ACODEC_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE': None, 'ACHANNELS': 8,
'ACODEC2': None, 'ACODEC2_ALLOW': [], 'ABITRATE2': None, 'ACHANNELS2': None, 'ACODEC2': None, 'ACODEC2_ALLOW': [], 'ABITRATE2': None, 'ACHANNELS2': None,
'ACODEC3': 'ac3', 'ACODEC3_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE3': None, 'ACHANNELS3': 8, 'ACODEC3': 'ac3', 'ACODEC3_ALLOW': ['libfaac', 'dts', 'ac3', 'mp2', 'mp3'], 'ABITRATE3': None, 'ACHANNELS3': 8,
'SCODEC': 'mov_text' 'SCODEC': 'mov_text',
}, },
'mkv-bluray': { 'mkv-bluray': {
'VEXTENSION': '.mkv', 'VCODEC': 'libx265', 'VPRESET': None, 'VFRAMERATE': None, 'VBITRATE': None, 'VCRF': None, 'VLEVEL': None, 'VEXTENSION': '.mkv', 'VCODEC': 'libx265', 'VPRESET': None, 'VFRAMERATE': None, 'VBITRATE': None, 'VCRF': None, 'VLEVEL': None,
@ -901,7 +905,8 @@ def configure_utility_locations():
if not SEVENZIP: if not SEVENZIP:
SEVENZIP = None SEVENZIP = None
logger.warning( logger.warning(
'Failed to locate 7zip. Transcoding of disk images and extraction of .7z files will not be possible!') 'Failed to locate 7zip. Transcoding of disk images and extraction of .7z files will not be possible!',
)
try: try:
PAR2CMD = subprocess.Popen(['which', 'par2'], stdout=subprocess.PIPE).communicate()[0].strip().decode() PAR2CMD = subprocess.Popen(['which', 'par2'], stdout=subprocess.PIPE).communicate()[0].strip().decode()
except Exception: except Exception:
@ -909,12 +914,17 @@ def configure_utility_locations():
if not PAR2CMD: if not PAR2CMD:
PAR2CMD = None PAR2CMD = None
logger.warning( logger.warning(
'Failed to locate par2. Repair and rename using par files will not be possible!') 'Failed to locate par2. Repair and rename using par files will not be possible!',
if os.path.isfile(os.path.join(FFMPEG_PATH, 'ffmpeg')) or os.access(os.path.join(FFMPEG_PATH, 'ffmpeg'), )
os.X_OK): if os.path.isfile(os.path.join(FFMPEG_PATH, 'ffmpeg')) or os.access(
os.path.join(FFMPEG_PATH, 'ffmpeg'),
os.X_OK,
):
FFMPEG = os.path.join(FFMPEG_PATH, 'ffmpeg') FFMPEG = os.path.join(FFMPEG_PATH, 'ffmpeg')
elif os.path.isfile(os.path.join(FFMPEG_PATH, 'avconv')) or os.access(os.path.join(FFMPEG_PATH, 'avconv'), elif os.path.isfile(os.path.join(FFMPEG_PATH, 'avconv')) or os.access(
os.X_OK): os.path.join(FFMPEG_PATH, 'avconv'),
os.X_OK,
):
FFMPEG = os.path.join(FFMPEG_PATH, 'avconv') FFMPEG = os.path.join(FFMPEG_PATH, 'avconv')
else: else:
try: try:
@ -931,11 +941,15 @@ def configure_utility_locations():
logger.warning('Failed to locate ffmpeg. Transcoding disabled!') logger.warning('Failed to locate ffmpeg. Transcoding disabled!')
logger.warning('Install ffmpeg with x264 support to enable this feature ...') logger.warning('Install ffmpeg with x264 support to enable this feature ...')
if os.path.isfile(os.path.join(FFMPEG_PATH, 'ffprobe')) or os.access(os.path.join(FFMPEG_PATH, 'ffprobe'), if os.path.isfile(os.path.join(FFMPEG_PATH, 'ffprobe')) or os.access(
os.X_OK): os.path.join(FFMPEG_PATH, 'ffprobe'),
os.X_OK,
):
FFPROBE = os.path.join(FFMPEG_PATH, 'ffprobe') FFPROBE = os.path.join(FFMPEG_PATH, 'ffprobe')
elif os.path.isfile(os.path.join(FFMPEG_PATH, 'avprobe')) or os.access(os.path.join(FFMPEG_PATH, 'avprobe'), elif os.path.isfile(os.path.join(FFMPEG_PATH, 'avprobe')) or os.access(
os.X_OK): os.path.join(FFMPEG_PATH, 'avprobe'),
os.X_OK,
):
FFPROBE = os.path.join(FFMPEG_PATH, 'avprobe') FFPROBE = os.path.join(FFMPEG_PATH, 'avprobe')
else: else:
try: try:

204
core/configuration.py
View file

@ -139,16 +139,18 @@ class ConfigObj(configobj.ConfigObj, Section):
if CFG_OLD[section].sections: if CFG_OLD[section].sections:
subsections.update({section: CFG_OLD[section].sections}) subsections.update({section: CFG_OLD[section].sections})
for option, value in CFG_OLD[section].items(): for option, value in CFG_OLD[section].items():
if option in ['category', if option in [
'cpsCategory', 'category',
'sbCategory', 'cpsCategory',
'srCategory', 'sbCategory',
'hpCategory', 'srCategory',
'mlCategory', 'hpCategory',
'gzCategory', 'mlCategory',
'raCategory', 'gzCategory',
'ndCategory', 'raCategory',
'W3Category']: 'ndCategory',
'W3Category',
]:
if not isinstance(value, list): if not isinstance(value, list):
value = [value] value = [value]
@ -279,29 +281,29 @@ class ConfigObj(configobj.ConfigObj, Section):
try: try:
if 'NZBPO_NDCATEGORY' in os.environ and 'NZBPO_SBCATEGORY' in os.environ: if 'NZBPO_NDCATEGORY' in os.environ and 'NZBPO_SBCATEGORY' in os.environ:
if os.environ['NZBPO_NDCATEGORY'] == os.environ['NZBPO_SBCATEGORY']: if os.environ['NZBPO_NDCATEGORY'] == os.environ['NZBPO_SBCATEGORY']:
logger.warning('{x} category is set for SickBeard and Sonarr. ' logger.warning(
'Please check your config in NZBGet'.format '{x} category is set for SickBeard and Sonarr. Please check your config in NZBGet'.format(x=os.environ['NZBPO_NDCATEGORY']),
(x=os.environ['NZBPO_NDCATEGORY'])) )
if 'NZBPO_RACATEGORY' in os.environ and 'NZBPO_CPSCATEGORY' in os.environ: if 'NZBPO_RACATEGORY' in os.environ and 'NZBPO_CPSCATEGORY' in os.environ:
if os.environ['NZBPO_RACATEGORY'] == os.environ['NZBPO_CPSCATEGORY']: if os.environ['NZBPO_RACATEGORY'] == os.environ['NZBPO_CPSCATEGORY']:
logger.warning('{x} category is set for CouchPotato and Radarr. ' logger.warning(
'Please check your config in NZBGet'.format '{x} category is set for CouchPotato and Radarr. Please check your config in NZBGet'.format(x=os.environ['NZBPO_RACATEGORY']),
(x=os.environ['NZBPO_RACATEGORY'])) )
if 'NZBPO_RACATEGORY' in os.environ and 'NZBPO_W3CATEGORY' in os.environ: if 'NZBPO_RACATEGORY' in os.environ and 'NZBPO_W3CATEGORY' in os.environ:
if os.environ['NZBPO_RACATEGORY'] == os.environ['NZBPO_W3CATEGORY']: if os.environ['NZBPO_RACATEGORY'] == os.environ['NZBPO_W3CATEGORY']:
logger.warning('{x} category is set for Watcher3 and Radarr. ' logger.warning(
'Please check your config in NZBGet'.format '{x} category is set for Watcher3 and Radarr. Please check your config in NZBGet'.format(x=os.environ['NZBPO_RACATEGORY']),
(x=os.environ['NZBPO_RACATEGORY'])) )
if 'NZBPO_W3CATEGORY' in os.environ and 'NZBPO_CPSCATEGORY' in os.environ: if 'NZBPO_W3CATEGORY' in os.environ and 'NZBPO_CPSCATEGORY' in os.environ:
if os.environ['NZBPO_W3CATEGORY'] == os.environ['NZBPO_CPSCATEGORY']: if os.environ['NZBPO_W3CATEGORY'] == os.environ['NZBPO_CPSCATEGORY']:
logger.warning('{x} category is set for CouchPotato and Watcher3. ' logger.warning(
'Please check your config in NZBGet'.format '{x} category is set for CouchPotato and Watcher3. Please check your config in NZBGet'.format(x=os.environ['NZBPO_W3CATEGORY']),
(x=os.environ['NZBPO_W3CATEGORY'])) )
if 'NZBPO_LICATEGORY' in os.environ and 'NZBPO_HPCATEGORY' in os.environ: if 'NZBPO_LICATEGORY' in os.environ and 'NZBPO_HPCATEGORY' in os.environ:
if os.environ['NZBPO_LICATEGORY'] == os.environ['NZBPO_HPCATEGORY']: if os.environ['NZBPO_LICATEGORY'] == os.environ['NZBPO_HPCATEGORY']:
logger.warning('{x} category is set for HeadPhones and Lidarr. ' logger.warning(
'Please check your config in NZBGet'.format '{x} category is set for HeadPhones and Lidarr. Please check your config in NZBGet'.format(x=os.environ['NZBPO_LICATEGORY']),
(x=os.environ['NZBPO_LICATEGORY'])) )
section = 'Nzb' section = 'Nzb'
key = 'NZBOP_DESTDIR' key = 'NZBOP_DESTDIR'
if key in os.environ: if key in os.environ:
@ -331,10 +333,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'CouchPotato' section = 'CouchPotato'
env_cat_key = 'NZBPO_CPSCATEGORY' env_cat_key = 'NZBPO_CPSCATEGORY'
env_keys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'METHOD', 'DELETE_FAILED', 'REMOTE_PATH', env_keys = [
'WAIT_FOR', 'WATCH_DIR', 'OMDBAPIKEY'] 'ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'METHOD', 'DELETE_FAILED', 'REMOTE_PATH',
cfg_keys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'method', 'delete_failed', 'remote_path', 'WAIT_FOR', 'WATCH_DIR', 'OMDBAPIKEY',
'wait_for', 'watch_dir', 'omdbapikey'] ]
cfg_keys = [
'enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'method', 'delete_failed', 'remote_path',
'wait_for', 'watch_dir', 'omdbapikey',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_CPS{env_keys[index]}' key = f'NZBPO_CPS{env_keys[index]}'
@ -352,10 +358,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'Watcher3' section = 'Watcher3'
env_cat_key = 'NZBPO_W3CATEGORY' env_cat_key = 'NZBPO_W3CATEGORY'
env_keys = ['ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'METHOD', 'DELETE_FAILED', 'REMOTE_PATH', env_keys = [
'WAIT_FOR', 'WATCH_DIR', 'OMDBAPIKEY'] 'ENABLED', 'APIKEY', 'HOST', 'PORT', 'SSL', 'WEB_ROOT', 'METHOD', 'DELETE_FAILED', 'REMOTE_PATH',
cfg_keys = ['enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'method', 'delete_failed', 'remote_path', 'WAIT_FOR', 'WATCH_DIR', 'OMDBAPIKEY',
'wait_for', 'watch_dir', 'omdbapikey'] ]
cfg_keys = [
'enabled', 'apikey', 'host', 'port', 'ssl', 'web_root', 'method', 'delete_failed', 'remote_path',
'wait_for', 'watch_dir', 'omdbapikey',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_W3{env_keys[index]}' key = f'NZBPO_W3{env_keys[index]}'
@ -373,10 +383,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'SickBeard' section = 'SickBeard'
env_cat_key = 'NZBPO_SBCATEGORY' env_cat_key = 'NZBPO_SBCATEGORY'
env_keys = ['ENABLED', 'HOST', 'PORT', 'APIKEY', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'TORRENT_NOLINK', env_keys = [
'NZBEXTRACTIONBY', 'REMOTE_PATH', 'PROCESS_METHOD'] 'ENABLED', 'HOST', 'PORT', 'APIKEY', 'USERNAME', 'PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', 'TORRENT_NOLINK',
cfg_keys = ['enabled', 'host', 'port', 'apikey', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'Torrent_NoLink', 'NZBEXTRACTIONBY', 'REMOTE_PATH', 'PROCESS_METHOD',
'nzbExtractionBy', 'remote_path', 'process_method'] ]
cfg_keys = [
'enabled', 'host', 'port', 'apikey', 'username', 'password', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'Torrent_NoLink',
'nzbExtractionBy', 'remote_path', 'process_method',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_SB{env_keys[index]}' key = f'NZBPO_SB{env_keys[index]}'
@ -394,10 +408,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'SiCKRAGE' section = 'SiCKRAGE'
env_cat_key = 'NZBPO_SRCATEGORY' env_cat_key = 'NZBPO_SRCATEGORY'
env_keys = ['ENABLED', 'HOST', 'PORT', 'APIKEY', 'API_VERSION', 'SSO_USERNAME', 'SSO_PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', env_keys = [
'DELETE_FAILED', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'REMOTE_PATH', 'PROCESS_METHOD'] 'ENABLED', 'HOST', 'PORT', 'APIKEY', 'API_VERSION', 'SSO_USERNAME', 'SSO_PASSWORD', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK',
cfg_keys = ['enabled', 'host', 'port', 'apikey', 'api_version', 'sso_username', 'sso_password', 'ssl', 'web_root', 'watch_dir', 'fork', 'DELETE_FAILED', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'REMOTE_PATH', 'PROCESS_METHOD',
'delete_failed', 'Torrent_NoLink', 'nzbExtractionBy', 'remote_path', 'process_method'] ]
cfg_keys = [
'enabled', 'host', 'port', 'apikey', 'api_version', 'sso_username', 'sso_password', 'ssl', 'web_root', 'watch_dir', 'fork',
'delete_failed', 'Torrent_NoLink', 'nzbExtractionBy', 'remote_path', 'process_method',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_SR{env_keys[index]}' key = f'NZBPO_SR{env_keys[index]}'
@ -432,10 +450,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'Mylar' section = 'Mylar'
env_cat_key = 'NZBPO_MYCATEGORY' env_cat_key = 'NZBPO_MYCATEGORY'
env_keys = ['ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'APIKEY', 'SSL', 'WEB_ROOT', 'WATCH_DIR', env_keys = [
'REMOTE_PATH'] 'ENABLED', 'HOST', 'PORT', 'USERNAME', 'PASSWORD', 'APIKEY', 'SSL', 'WEB_ROOT', 'WATCH_DIR',
cfg_keys = ['enabled', 'host', 'port', 'username', 'password', 'apikey', 'ssl', 'web_root', 'watch_dir', 'REMOTE_PATH',
'remote_path'] ]
cfg_keys = [
'enabled', 'host', 'port', 'username', 'password', 'apikey', 'ssl', 'web_root', 'watch_dir',
'remote_path',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_MY{env_keys[index]}' key = f'NZBPO_MY{env_keys[index]}'
@ -479,11 +501,15 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'NzbDrone' section = 'NzbDrone'
env_cat_key = 'NZBPO_NDCATEGORY' env_cat_key = 'NZBPO_NDCATEGORY'
env_keys = ['ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', env_keys = [
'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'IMPORTMODE'] 'ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED',
'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'IMPORTMODE',
]
# new cfgKey added for importMode # new cfgKey added for importMode
cfg_keys = ['enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', cfg_keys = [
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path', 'importMode'] 'enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed',
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path', 'importMode',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_ND{env_keys[index]}' key = f'NZBPO_ND{env_keys[index]}'
@ -501,11 +527,15 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'Radarr' section = 'Radarr'
env_cat_key = 'NZBPO_RACATEGORY' env_cat_key = 'NZBPO_RACATEGORY'
env_keys = ['ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', env_keys = [
'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'OMDBAPIKEY', 'IMPORTMODE'] 'ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED',
'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH', 'OMDBAPIKEY', 'IMPORTMODE',
]
# new cfgKey added for importMode # new cfgKey added for importMode
cfg_keys = ['enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', cfg_keys = [
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path', 'omdbapikey', 'importMode'] 'enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed',
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path', 'omdbapikey', 'importMode',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_RA{env_keys[index]}' key = f'NZBPO_RA{env_keys[index]}'
@ -523,10 +553,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'Lidarr' section = 'Lidarr'
env_cat_key = 'NZBPO_LICATEGORY' env_cat_key = 'NZBPO_LICATEGORY'
env_keys = ['ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED', env_keys = [
'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH'] 'ENABLED', 'HOST', 'APIKEY', 'PORT', 'SSL', 'WEB_ROOT', 'WATCH_DIR', 'FORK', 'DELETE_FAILED',
cfg_keys = ['enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed', 'TORRENT_NOLINK', 'NZBEXTRACTIONBY', 'WAIT_FOR', 'DELETE_FAILED', 'REMOTE_PATH',
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path'] ]
cfg_keys = [
'enabled', 'host', 'apikey', 'port', 'ssl', 'web_root', 'watch_dir', 'fork', 'delete_failed',
'Torrent_NoLink', 'nzbExtractionBy', 'wait_for', 'delete_failed', 'remote_path',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_LI{env_keys[index]}' key = f'NZBPO_LI{env_keys[index]}'
@ -561,26 +595,30 @@ class ConfigObj(configobj.ConfigObj, Section):
cfg_new[section][option] = value cfg_new[section][option] = value
section = 'Transcoder' section = 'Transcoder'
env_keys = ['TRANSCODE', 'DUPLICATE', 'IGNOREEXTENSIONS', 'OUTPUTFASTSTART', 'OUTPUTVIDEOPATH', env_keys = [
'PROCESSOUTPUT', 'AUDIOLANGUAGE', 'ALLAUDIOLANGUAGES', 'SUBLANGUAGES', 'TRANSCODE', 'DUPLICATE', 'IGNOREEXTENSIONS', 'OUTPUTFASTSTART', 'OUTPUTVIDEOPATH',
'ALLSUBLANGUAGES', 'EMBEDSUBS', 'BURNINSUBTITLE', 'EXTRACTSUBS', 'EXTERNALSUBDIR', 'PROCESSOUTPUT', 'AUDIOLANGUAGE', 'ALLAUDIOLANGUAGES', 'SUBLANGUAGES',
'OUTPUTDEFAULT', 'OUTPUTVIDEOEXTENSION', 'OUTPUTVIDEOCODEC', 'VIDEOCODECALLOW', 'ALLSUBLANGUAGES', 'EMBEDSUBS', 'BURNINSUBTITLE', 'EXTRACTSUBS', 'EXTERNALSUBDIR',
'OUTPUTVIDEOPRESET', 'OUTPUTVIDEOFRAMERATE', 'OUTPUTVIDEOBITRATE', 'OUTPUTAUDIOCODEC', 'OUTPUTDEFAULT', 'OUTPUTVIDEOEXTENSION', 'OUTPUTVIDEOCODEC', 'VIDEOCODECALLOW',
'AUDIOCODECALLOW', 'OUTPUTAUDIOBITRATE', 'OUTPUTQUALITYPERCENT', 'GETSUBS', 'OUTPUTVIDEOPRESET', 'OUTPUTVIDEOFRAMERATE', 'OUTPUTVIDEOBITRATE', 'OUTPUTAUDIOCODEC',
'OUTPUTAUDIOTRACK2CODEC', 'AUDIOCODEC2ALLOW', 'OUTPUTAUDIOTRACK2BITRATE', 'AUDIOCODECALLOW', 'OUTPUTAUDIOBITRATE', 'OUTPUTQUALITYPERCENT', 'GETSUBS',
'OUTPUTAUDIOOTHERCODEC', 'AUDIOOTHERCODECALLOW', 'OUTPUTAUDIOOTHERBITRATE', 'OUTPUTAUDIOTRACK2CODEC', 'AUDIOCODEC2ALLOW', 'OUTPUTAUDIOTRACK2BITRATE',
'OUTPUTSUBTITLECODEC', 'OUTPUTAUDIOCHANNELS', 'OUTPUTAUDIOTRACK2CHANNELS', 'OUTPUTAUDIOOTHERCODEC', 'AUDIOOTHERCODECALLOW', 'OUTPUTAUDIOOTHERBITRATE',
'OUTPUTAUDIOOTHERCHANNELS', 'OUTPUTVIDEORESOLUTION'] 'OUTPUTSUBTITLECODEC', 'OUTPUTAUDIOCHANNELS', 'OUTPUTAUDIOTRACK2CHANNELS',
cfg_keys = ['transcode', 'duplicate', 'ignoreExtensions', 'outputFastStart', 'outputVideoPath', 'OUTPUTAUDIOOTHERCHANNELS', 'OUTPUTVIDEORESOLUTION',
'processOutput', 'audioLanguage', 'allAudioLanguages', 'subLanguages', ]
'allSubLanguages', 'embedSubs', 'burnInSubtitle', 'extractSubs', 'externalSubDir', cfg_keys = [
'outputDefault', 'outputVideoExtension', 'outputVideoCodec', 'VideoCodecAllow', 'transcode', 'duplicate', 'ignoreExtensions', 'outputFastStart', 'outputVideoPath',
'outputVideoPreset', 'outputVideoFramerate', 'outputVideoBitrate', 'outputAudioCodec', 'processOutput', 'audioLanguage', 'allAudioLanguages', 'subLanguages',
'AudioCodecAllow', 'outputAudioBitrate', 'outputQualityPercent', 'getSubs', 'allSubLanguages', 'embedSubs', 'burnInSubtitle', 'extractSubs', 'externalSubDir',
'outputAudioTrack2Codec', 'AudioCodec2Allow', 'outputAudioTrack2Bitrate', 'outputDefault', 'outputVideoExtension', 'outputVideoCodec', 'VideoCodecAllow',
'outputAudioOtherCodec', 'AudioOtherCodecAllow', 'outputAudioOtherBitrate', 'outputVideoPreset', 'outputVideoFramerate', 'outputVideoBitrate', 'outputAudioCodec',
'outputSubtitleCodec', 'outputAudioChannels', 'outputAudioTrack2Channels', 'AudioCodecAllow', 'outputAudioBitrate', 'outputQualityPercent', 'getSubs',
'outputAudioOtherChannels', 'outputVideoResolution'] 'outputAudioTrack2Codec', 'AudioCodec2Allow', 'outputAudioTrack2Bitrate',
'outputAudioOtherCodec', 'AudioOtherCodecAllow', 'outputAudioOtherBitrate',
'outputSubtitleCodec', 'outputAudioChannels', 'outputAudioTrack2Channels',
'outputAudioOtherChannels', 'outputVideoResolution',
]
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_{env_keys[index]}' key = f'NZBPO_{env_keys[index]}'
if key in os.environ: if key in os.environ:
@ -600,10 +638,14 @@ class ConfigObj(configobj.ConfigObj, Section):
section = 'UserScript' section = 'UserScript'
env_cat_key = 'NZBPO_USCATEGORY' env_cat_key = 'NZBPO_USCATEGORY'
env_keys = ['USER_SCRIPT_MEDIAEXTENSIONS', 'USER_SCRIPT_PATH', 'USER_SCRIPT_PARAM', 'USER_SCRIPT_RUNONCE', env_keys = [
'USER_SCRIPT_SUCCESSCODES', 'USER_SCRIPT_CLEAN', 'USDELAY', 'USREMOTE_PATH'] 'USER_SCRIPT_MEDIAEXTENSIONS', 'USER_SCRIPT_PATH', 'USER_SCRIPT_PARAM', 'USER_SCRIPT_RUNONCE',
cfg_keys = ['user_script_mediaExtensions', 'user_script_path', 'user_script_param', 'user_script_runOnce', 'USER_SCRIPT_SUCCESSCODES', 'USER_SCRIPT_CLEAN', 'USDELAY', 'USREMOTE_PATH',
'user_script_successCodes', 'user_script_clean', 'delay', 'remote_path'] ]
cfg_keys = [
'user_script_mediaExtensions', 'user_script_path', 'user_script_param', 'user_script_runOnce',
'user_script_successCodes', 'user_script_clean', 'delay', 'remote_path',
]
if env_cat_key in os.environ: if env_cat_key in os.environ:
for index in range(len(env_keys)): for index in range(len(env_keys)):
key = f'NZBPO_{env_keys[index]}' key = f'NZBPO_{env_keys[index]}'

15
core/databases.py
View file

@ -40,17 +40,14 @@ class InitialSchema(main_db.SchemaUpgrade):
cur_db_version = self.check_db_version() cur_db_version = self.check_db_version()
if cur_db_version < MIN_DB_VERSION: if cur_db_version < MIN_DB_VERSION:
logger.log_error_and_exit('Your database version ({current}) is too old to migrate ' logger.log_error_and_exit(
'from what this version of nzbToMedia supports ({min}).' 'Your database version ({current}) is too old to migrate from what this version of nzbToMedia supports ({min}).\nPlease remove nzbtomedia.db file to begin fresh.'.format(current=cur_db_version, min=MIN_DB_VERSION),
'\nPlease remove nzbtomedia.db file to begin fresh.'.format )
(current=cur_db_version, min=MIN_DB_VERSION))
if cur_db_version > MAX_DB_VERSION: if cur_db_version > MAX_DB_VERSION:
logger.log_error_and_exit('Your database version ({current}) has been incremented ' logger.log_error_and_exit(
'past what this version of nzbToMedia supports ({max}).' 'Your database version ({current}) has been incremented past what this version of nzbToMedia supports ({max}).\nIf you have used other forks of nzbToMedia, your database may be unusable due to their modifications.'.format(current=cur_db_version, max=MAX_DB_VERSION),
'\nIf you have used other forks of nzbToMedia, your database ' )
'may be unusable due to their modifications.'.format
(current=cur_db_version, max=MAX_DB_VERSION))
if cur_db_version < MAX_DB_VERSION: # We need to upgrade. if cur_db_version < MAX_DB_VERSION: # We need to upgrade.
queries = [ queries = [
'CREATE TABLE downloads2 (input_directory TEXT, input_name TEXT, input_hash TEXT, input_id TEXT, client_agent TEXT, status INTEGER, last_update NUMERIC, CONSTRAINT pk_downloadID PRIMARY KEY (input_directory, input_name));', 'CREATE TABLE downloads2 (input_directory TEXT, input_name TEXT, input_hash TEXT, input_id TEXT, client_agent TEXT, status INTEGER, last_update NUMERIC, CONSTRAINT pk_downloadID PRIMARY KEY (input_directory, input_name));',

6
core/github_api.py
View file

@ -44,7 +44,9 @@ class GitHub:
Returns a deserialized json object containing the compare info. See http://developer.github.com/v3/repos/commits/ Returns a deserialized json object containing the compare info. See http://developer.github.com/v3/repos/commits/
""" """
return self._access_api( return self._access_api(
['repos', self.github_repo_user, self.github_repo, 'compare', [
f'{base}...{head}'], 'repos', self.github_repo_user, self.github_repo, 'compare',
f'{base}...{head}',
],
params={'per_page': per_page}, params={'per_page': per_page},
) )

46
core/logger.py
View file

@ -19,12 +19,14 @@ DEBUG = logging.DEBUG
POSTPROCESS = 21 POSTPROCESS = 21
DB = 5 DB = 5
reverseNames = {'ERROR': ERROR, reverseNames = {
'WARNING': WARNING, 'ERROR': ERROR,
'INFO': MESSAGE, 'WARNING': WARNING,
'DEBUG': DEBUG, 'INFO': MESSAGE,
'POSTPROCESS': POSTPROCESS, 'DEBUG': DEBUG,
'DB': DB} 'POSTPROCESS': POSTPROCESS,
'DB': DB,
}
class NTMRotatingLogHandler: class NTMRotatingLogHandler:
@ -81,12 +83,16 @@ class NTMRotatingLogHandler:
console.setLevel(DB) console.setLevel(DB)
# set a format which is simpler for console use # set a format which is simpler for console use
console.setFormatter(DispatchingFormatter( console.setFormatter(
{'nzbtomedia': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'), DispatchingFormatter(
'postprocess': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'), {
'db': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'), 'nzbtomedia': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'),
}, 'postprocess': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'),
logging.Formatter('%(message)s'))) 'db': logging.Formatter('[%(asctime)s] [%(levelname)s]::%(message)s', '%H:%M:%S'),
},
logging.Formatter('%(message)s'),
),
)
# add the handler to the root logger # add the handler to the root logger
logging.getLogger('nzbtomedia').addHandler(console) logging.getLogger('nzbtomedia').addHandler(console)
@ -115,12 +121,16 @@ class NTMRotatingLogHandler:
file_handler.setLevel(DB) file_handler.setLevel(DB)
file_handler.setFormatter(DispatchingFormatter( file_handler.setFormatter(
{'nzbtomedia': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'), DispatchingFormatter(
'postprocess': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'), {
'db': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'), 'nzbtomedia': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'),
}, 'postprocess': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'),
logging.Formatter('%(message)s'))) 'db': logging.Formatter('%(asctime)s %(levelname)-8s::%(message)s', '%Y-%m-%d %H:%M:%S'),
},
logging.Formatter('%(message)s'),
),
)
return file_handler return file_handler

35
core/main_db.py
View file

@ -56,8 +56,9 @@ class DBConnection:
cursor.execute(query) cursor.execute(query)
sql_result = cursor.fetchone()[0] sql_result = cursor.fetchone()[0]
else: else:
logger.log('{name}: {query} with args {args}'.format logger.log(
(name=self.filename, query=query, args=args), logger.DB) '{name}: {query} with args {args}'.format(name=self.filename, query=query, args=args), logger.DB,
)
cursor = self.connection.cursor() cursor = self.connection.cursor()
cursor.execute(query, args) cursor.execute(query, args)
sql_result = cursor.fetchone()[0] sql_result = cursor.fetchone()[0]
@ -131,8 +132,9 @@ class DBConnection:
logger.log(f'{self.filename}: {query}', logger.DB) logger.log(f'{self.filename}: {query}', logger.DB)
sql_result = self.connection.execute(query) sql_result = self.connection.execute(query)
else: else:
logger.log('{name}: {query} with args {args}'.format logger.log(
(name=self.filename, query=query, args=args), logger.DB) '{name}: {query} with args {args}'.format(name=self.filename, query=query, args=args), logger.DB,
)
sql_result = self.connection.execute(query, args) sql_result = self.connection.execute(query, args)
self.connection.commit() self.connection.commit()
# get out of the connection attempt loop since we were successful # get out of the connection attempt loop since we were successful
@ -228,22 +230,27 @@ def pretty_name(class_name):
def _process_upgrade(connection, upgrade_class): def _process_upgrade(connection, upgrade_class):
instance = upgrade_class(connection) instance = upgrade_class(connection)
logger.log('Checking {name} database upgrade'.format logger.log(
(name=pretty_name(upgrade_class.__name__)), logger.DEBUG) 'Checking {name} database upgrade'.format(name=pretty_name(upgrade_class.__name__)), logger.DEBUG,
)
if not instance.test(): if not instance.test():
logger.log('Database upgrade required: {name}'.format logger.log(
(name=pretty_name(upgrade_class.__name__)), logger.MESSAGE) 'Database upgrade required: {name}'.format(name=pretty_name(upgrade_class.__name__)), logger.MESSAGE,
)
try: try:
instance.execute() instance.execute()
except sqlite3.DatabaseError as error: except sqlite3.DatabaseError as error:
print('Error in {name}: {msg}'.format print(
(name=upgrade_class.__name__, msg=error)) 'Error in {name}: {msg}'.format(name=upgrade_class.__name__, msg=error),
)
raise raise
logger.log('{name} upgrade completed'.format logger.log(
(name=upgrade_class.__name__), logger.DEBUG) '{name} upgrade completed'.format(name=upgrade_class.__name__), logger.DEBUG,
)
else: else:
logger.log('{name} upgrade not required'.format logger.log(
(name=upgrade_class.__name__), logger.DEBUG) '{name} upgrade not required'.format(name=upgrade_class.__name__), logger.DEBUG,
)
for upgradeSubClass in upgrade_class.__subclasses__(): for upgradeSubClass in upgrade_class.__subclasses__():
_process_upgrade(connection, upgradeSubClass) _process_upgrade(connection, upgradeSubClass)

49
core/scene_exceptions.py
View file

@ -8,23 +8,28 @@ import core
from core import logger from core import logger
from core.utils 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\.', reverse_list = [
r'\b[45]62[xh]\.', r'\.yarulb\.', r'\.vtd[hp]\.', r'\.\d{2}e\d{2}s\.', r'\.[pi]0801\.', r'\.p027\.', r'\.[pi]675\.', r'\.[pi]084\.', r'\.p063\.',
r'\.ld[.-]?bew\.', r'\.pir.?(dov|dvd|bew|db|rb)\.', r'\brdvd\.', r'\.vts\.', r'\.reneercs\.', r'\b[45]62[xh]\.', r'\.yarulb\.', r'\.vtd[hp]\.',
r'\.dcv\.', r'\b(pir|mac)dh\b', r'\.reporp\.', r'\.kcaper\.', r'\.ld[.-]?bew\.', r'\.pir.?(dov|dvd|bew|db|rb)\.', r'\brdvd\.', r'\.vts\.', r'\.reneercs\.',
r'\.lanretni\.', r'\b3ca\b', r'\.cstn\.'] r'\.dcv\.', r'\b(pir|mac)dh\b', r'\.reporp\.', r'\.kcaper\.',
r'\.lanretni\.', r'\b3ca\b', r'\.cstn\.',
]
reverse_pattern = re.compile('|'.join(reverse_list), flags=re.IGNORECASE) reverse_pattern = re.compile('|'.join(reverse_list), flags=re.IGNORECASE)
season_pattern = re.compile(r'(.*\.\d{2}e\d{2}s\.)(.*)', flags=re.IGNORECASE) season_pattern = re.compile(r'(.*\.\d{2}e\d{2}s\.)(.*)', flags=re.IGNORECASE)
word_pattern = re.compile(r'([^A-Z0-9]*[A-Z0-9]+)') word_pattern = re.compile(r'([^A-Z0-9]*[A-Z0-9]+)')
media_list = [r'\.s\d{2}e\d{2}\.', r'\.1080[pi]\.', r'\.720p\.', r'\.576[pi]', r'\.480[pi]\.', r'\.360p\.', media_list = [
r'\.[xh]26[45]\b', r'\.bluray\.', r'\.[hp]dtv\.', r'\.s\d{2}e\d{2}\.', r'\.1080[pi]\.', r'\.720p\.', r'\.576[pi]', r'\.480[pi]\.', r'\.360p\.',
r'\.web[.-]?dl\.', r'\.(vod|dvd|web|bd|br).?rip\.', r'\.dvdr\b', r'\.stv\.', r'\.screener\.', r'\.vcd\.', r'\.[xh]26[45]\b', r'\.bluray\.', r'\.[hp]dtv\.',
r'\bhd(cam|rip)\b', r'\.proper\.', r'\.repack\.', r'\.web[.-]?dl\.', r'\.(vod|dvd|web|bd|br).?rip\.', r'\.dvdr\b', r'\.stv\.', r'\.screener\.', r'\.vcd\.',
r'\.internal\.', r'\bac3\b', r'\.ntsc\.', r'\.pal\.', r'\.secam\.', r'\bdivx\b', r'\bxvid\b'] r'\bhd(cam|rip)\b', r'\.proper\.', r'\.repack\.',
r'\.internal\.', r'\bac3\b', r'\.ntsc\.', r'\.pal\.', r'\.secam\.', r'\bdivx\b', r'\bxvid\b',
]
media_pattern = re.compile('|'.join(media_list), flags=re.IGNORECASE) media_pattern = re.compile('|'.join(media_list), flags=re.IGNORECASE)
garbage_name = re.compile(r'^[a-zA-Z0-9]*$') garbage_name = re.compile(r'^[a-zA-Z0-9]*$')
char_replace = [[r'(\w)1\.(\w)', r'\1i\2'], char_replace = [
] [r'(\w)1\.(\w)', r'\1i\2'],
]
def process_all_exceptions(name, dirname): def process_all_exceptions(name, dirname):
@ -66,8 +71,9 @@ def strip_groups(filename):
def rename_file(filename, newfile_path): def rename_file(filename, newfile_path):
if os.path.isfile(newfile_path): if os.path.isfile(newfile_path):
newfile_path = os.path.splitext(newfile_path)[0] + '.NTM' + os.path.splitext(newfile_path)[1] newfile_path = os.path.splitext(newfile_path)[0] + '.NTM' + os.path.splitext(newfile_path)[1]
logger.debug('Replacing file name {old} with download name {new}'.format logger.debug(
(old=filename, new=newfile_path), 'EXCEPTION') 'Replacing file name {old} with download name {new}'.format(old=filename, new=newfile_path), 'EXCEPTION',
)
try: try:
os.rename(filename, newfile_path) os.rename(filename, newfile_path)
except Exception as error: except Exception as error:
@ -81,8 +87,9 @@ def replace_filename(filename, dirname, name):
logger.debug(f'Replacing file name {head} with directory name {newname}', 'EXCEPTION') logger.debug(f'Replacing file name {head} with directory name {newname}', 'EXCEPTION')
elif media_pattern.search(name.replace(' ', '.').lower()) is not None: elif media_pattern.search(name.replace(' ', '.').lower()) is not None:
newname = name.replace(' ', '.') newname = name.replace(' ', '.')
logger.debug('Replacing file name {old} with download name {new}'.format logger.debug(
(old=head, new=newname), 'EXCEPTION') 'Replacing file name {old} with download name {new}'.format(old=head, new=newname), 'EXCEPTION',
)
else: else:
logger.warning(f'No name replacement determined for {head}', 'EXCEPTION') logger.warning(f'No name replacement determined for {head}', 'EXCEPTION')
newname = name newname = name
@ -110,8 +117,9 @@ def reverse_filename(filename, dirname, name):
else: else:
newname = head[::-1].title() newname = head[::-1].title()
newname = newname.replace(' ', '.') newname = newname.replace(' ', '.')
logger.debug('Reversing filename {old} to {new}'.format logger.debug(
(old=head, new=newname), 'EXCEPTION') 'Reversing filename {old} to {new}'.format(old=head, new=newname), 'EXCEPTION',
)
newfile = newname + file_extension newfile = newname + file_extension
newfile_path = os.path.join(dirname, newfile) newfile_path = os.path.join(dirname, newfile)
return newfile_path return newfile_path
@ -137,8 +145,9 @@ def rename_script(dirname):
dest = os.path.join(dirname, cmd[1].split('\\')[-1].split('/')[-1]) dest = os.path.join(dirname, cmd[1].split('\\')[-1].split('/')[-1])
if os.path.isfile(dest): if os.path.isfile(dest):
continue continue
logger.debug('Renaming file {source} to {destination}'.format logger.debug(
(source=orig, destination=dest), 'EXCEPTION') 'Renaming file {source} to {destination}'.format(source=orig, destination=dest), 'EXCEPTION',
)
try: try:
os.rename(orig, dest) os.rename(orig, dest)
except Exception as error: except Exception as error:

112
core/transcoder.py
View file

@ -33,8 +33,10 @@ def is_video_good(videofile, status, require_lan=None):
aud_streams = [item for item in test_details['streams'] if 'codec_type' in item and item['codec_type'] == 'audio'] aud_streams = [item for item in test_details['streams'] if 'codec_type' in item and item['codec_type'] == 'audio']
if not (len(vid_streams) > 0 and len(aud_streams) > 0): if not (len(vid_streams) > 0 and len(aud_streams) > 0):
disable = True disable = True
logger.info('DISABLED: ffprobe failed to analyse streams from test file. Stopping corruption check.', logger.info(
'TRANSCODER') 'DISABLED: ffprobe failed to analyse streams from test file. Stopping corruption check.',
'TRANSCODER',
)
if disable: if disable:
if status: # if the download was 'failed', assume bad. If it was successful, assume good. if status: # if the download was 'failed', assume bad. If it was successful, assume good.
return False return False
@ -55,7 +57,7 @@ def is_video_good(videofile, status, require_lan=None):
video_streams = [item for item in video_details['streams'] if item['codec_type'] == 'video'] video_streams = [item for item in video_details['streams'] if item['codec_type'] == 'video']
audio_streams = [item for item in video_details['streams'] if item['codec_type'] == 'audio'] audio_streams = [item for item in video_details['streams'] if item['codec_type'] == 'audio']
if require_lan: if require_lan:
valid_audio = [item for item in audio_streams if 'tags' in item and 'language' in item['tags'] and item['tags']['language'] in require_lan ] valid_audio = [item for item in audio_streams if 'tags' in item and 'language' in item['tags'] and item['tags']['language'] in require_lan]
else: else:
valid_audio = audio_streams valid_audio = audio_streams
if len(video_streams) > 0 and len(valid_audio) > 0: if len(video_streams) > 0 and len(valid_audio) > 0:
@ -89,8 +91,10 @@ def get_video_details(videofile, img=None, bitbucket=None):
try: try:
if img: if img:
videofile = '-' videofile = '-'
command = [core.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error', command = [
videofile] core.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error',
videofile,
]
print_cmd(command) print_cmd(command)
if img: if img:
procin = zip_out(file, img, bitbucket) procin = zip_out(file, img, bitbucket)
@ -102,7 +106,7 @@ def get_video_details(videofile, img=None, bitbucket=None):
result = proc.returncode result = proc.returncode
video_details = json.loads(out.decode()) video_details = json.loads(out.decode())
except Exception: except Exception:
try: # try this again without -show error in case of ffmpeg limitation try: # try this again without -show error in case of ffmpeg limitation
command = [core.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', videofile] command = [core.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', videofile]
print_cmd(command) print_cmd(command)
if img: if img:
@ -159,9 +163,9 @@ def build_commands(file, new_dir, movie_name, bitbucket):
rem_vid = [] rem_vid = []
for vid in data['files']: for vid in data['files']:
video_details, result = get_video_details(vid, img, bitbucket) video_details, result = get_video_details(vid, img, bitbucket)
if not check_vid_file(video_details, result): #lets not transcode menu or other clips that don't have audio and video. if not check_vid_file(video_details, result): # lets not transcode menu or other clips that don't have audio and video.
rem_vid.append(vid) rem_vid.append(vid)
data['files'] = [ f for f in data['files'] if f not in rem_vid ] data['files'] = [f for f in data['files'] if f not in rem_vid]
new_file = {img: {'name': data['name'], 'files': data['files']}} new_file = {img: {'name': data['name'], 'files': data['files']}}
video_details, result = get_video_details(data['files'][0], img, bitbucket) video_details, result = get_video_details(data['files'][0], img, bitbucket)
input_file = '-' input_file = '-'
@ -178,7 +182,8 @@ def build_commands(file, new_dir, movie_name, bitbucket):
other_cmd = [] other_cmd = []
if not video_details or not video_details.get( if not video_details or not video_details.get(
'streams'): # we couldn't read streams with ffprobe. Set defaults to try transcoding. 'streams',
): # we couldn't read streams with ffprobe. Set defaults to try transcoding.
video_streams = [] video_streams = []
audio_streams = [] audio_streams = []
sub_streams = [] sub_streams = []
@ -205,8 +210,10 @@ def build_commands(file, new_dir, movie_name, bitbucket):
if core.ACODEC: if core.ACODEC:
audio_cmd.extend(['-c:a', core.ACODEC]) audio_cmd.extend(['-c:a', core.ACODEC])
if core.ACODEC in ['aac', if core.ACODEC in [
'dts']: # Allow users to use the experimental AAC codec that's built into recent versions of ffmpeg 'aac',
'dts',
]: # Allow users to use the experimental AAC codec that's built into recent versions of ffmpeg
audio_cmd.extend(['-strict', '-2']) audio_cmd.extend(['-strict', '-2'])
else: else:
audio_cmd.extend(['-c:a', 'copy']) audio_cmd.extend(['-c:a', 'copy'])
@ -232,9 +239,12 @@ def build_commands(file, new_dir, movie_name, bitbucket):
audio_streams = [item for item in video_details['streams'] if item['codec_type'] == 'audio'] audio_streams = [item for item in video_details['streams'] if item['codec_type'] == 'audio']
sub_streams = [item for item in video_details['streams'] if item['codec_type'] == 'subtitle'] sub_streams = [item for item in video_details['streams'] if item['codec_type'] == 'subtitle']
if core.VEXTENSION not in ['.mkv', '.mpegts']: if core.VEXTENSION not in ['.mkv', '.mpegts']:
sub_streams = [item for item in video_details['streams'] if sub_streams = [
item['codec_type'] == 'subtitle' and item['codec_name'] != 'hdmv_pgs_subtitle' and item[ item for item in video_details['streams'] if
'codec_name'] != 'pgssub'] item['codec_type'] == 'subtitle' and item['codec_name'] != 'hdmv_pgs_subtitle' and item[
'codec_name'
] != 'pgssub'
]
for video in video_streams: for video in video_streams:
codec = video['codec_name'] codec = video['codec_name']
@ -518,8 +528,10 @@ def build_commands(file, new_dir, movie_name, bitbucket):
except Exception: except Exception:
pass pass
if metlan: if metlan:
meta_cmd.extend([f'-metadata:s:s:{len(s_mapped) + n}', meta_cmd.extend([
f'language={metlan.alpha3}']) f'-metadata:s:s:{len(s_mapped) + n}',
f'language={metlan.alpha3}',
])
n += 1 n += 1
map_cmd.extend(['-map', f'{n}:0']) map_cmd.extend(['-map', f'{n}:0'])
@ -567,13 +579,19 @@ def extract_subs(file, newfile_path, bitbucket):
name = os.path.splitext(os.path.split(newfile_path)[1])[0] name = os.path.splitext(os.path.split(newfile_path)[1])[0]
try: try:
sub_streams = [item for item in video_details['streams'] if sub_streams = [
item['codec_type'] == 'subtitle' and item['tags']['language'] in core.SLANGUAGES and item[ item for item in video_details['streams'] if
'codec_name'] != 'hdmv_pgs_subtitle' and item['codec_name'] != 'pgssub'] item['codec_type'] == 'subtitle' and item['tags']['language'] in core.SLANGUAGES and item[
'codec_name'
] != 'hdmv_pgs_subtitle' and item['codec_name'] != 'pgssub'
]
except Exception: except Exception:
sub_streams = [item for item in video_details['streams'] if sub_streams = [
item['codec_type'] == 'subtitle' and item['codec_name'] != 'hdmv_pgs_subtitle' and item[ item for item in video_details['streams'] if
'codec_name'] != 'pgssub'] item['codec_type'] == 'subtitle' and item['codec_name'] != 'hdmv_pgs_subtitle' and item[
'codec_name'
] != 'pgssub'
]
num = len(sub_streams) num = len(sub_streams)
for n in range(num): for n in range(num):
sub = sub_streams[n] sub = sub_streams[n]
@ -589,8 +607,10 @@ def extract_subs(file, newfile_path, bitbucket):
if os.path.isfile(output_file): if os.path.isfile(output_file):
output_file = os.path.join(subdir, f'{name}.{lan}.{n}.srt') output_file = os.path.join(subdir, f'{name}.{lan}.{n}.srt')
command = [core.FFMPEG, '-loglevel', 'warning', '-i', file, '-vn', '-an', command = [
f'-codec:{idx}', 'srt', output_file] core.FFMPEG, '-loglevel', 'warning', '-i', file, '-vn', '-an',
f'-codec:{idx}', 'srt', output_file,
]
if platform.system() != 'Windows': if platform.system() != 'Windows':
command = core.NICENESS + command command = core.NICENESS + command
@ -672,17 +692,17 @@ def process_list(it, new_dir, bitbucket):
return it, rem_list, new_list, success return it, rem_list, new_list, success
def mount_iso(item, new_dir, bitbucket): #Currently only supports Linux Mount when permissions allow. def mount_iso(item, new_dir, bitbucket): # Currently only supports Linux Mount when permissions allow.
if platform.system() == 'Windows': if platform.system() == 'Windows':
logger.error(f'No mounting options available under Windows for image file {item}', 'TRANSCODER') logger.error(f'No mounting options available under Windows for image file {item}', 'TRANSCODER')
return [] return []
mount_point = os.path.join(os.path.dirname(os.path.abspath(item)),'temp') mount_point = os.path.join(os.path.dirname(os.path.abspath(item)), 'temp')
make_dir(mount_point) make_dir(mount_point)
cmd = ['mount', '-o', 'loop', item, mount_point] cmd = ['mount', '-o', 'loop', item, mount_point]
print_cmd(cmd) print_cmd(cmd)
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket)
out, err = proc.communicate() out, err = proc.communicate()
core.MOUNTED = mount_point # Allows us to verify this has been done and then cleanup. core.MOUNTED = mount_point # Allows us to verify this has been done and then cleanup.
for root, dirs, files in os.walk(mount_point): for root, dirs, files in os.walk(mount_point):
for file in files: for file in files:
full_path = os.path.join(root, file) full_path = os.path.join(root, file)
@ -701,7 +721,7 @@ def mount_iso(item, new_dir, bitbucket): #Currently only supports Linux Mount wh
mts_path = os.path.split(full_path)[0] mts_path = os.path.split(full_path)[0]
return combine_mts(mts_path) return combine_mts(mts_path)
logger.error(f'No VIDEO_TS or BDMV/SOURCE folder found in image file {mount_point}', 'TRANSCODER') logger.error(f'No VIDEO_TS or BDMV/SOURCE folder found in image file {mount_point}', 'TRANSCODER')
return ['failure'] # If we got here, nothing matched our criteria return ['failure'] # If we got here, nothing matched our criteria
def rip_iso(item, new_dir, bitbucket): def rip_iso(item, new_dir, bitbucket):
@ -711,7 +731,7 @@ def rip_iso(item, new_dir, bitbucket):
if not core.SEVENZIP: if not core.SEVENZIP:
logger.debug(f'No 7zip installed. Attempting to mount image file {item}', 'TRANSCODER') logger.debug(f'No 7zip installed. Attempting to mount image file {item}', 'TRANSCODER')
try: try:
new_files = mount_iso(item, new_dir, bitbucket) # Currently only works for Linux. new_files = mount_iso(item, new_dir, bitbucket) # Currently only works for Linux.
except Exception: except Exception:
logger.error(f'Failed to mount and extract from image file {item}', 'TRANSCODER') logger.error(f'Failed to mount and extract from image file {item}', 'TRANSCODER')
new_files = [failure_dir] new_files = [failure_dir]
@ -732,7 +752,7 @@ def rip_iso(item, new_dir, bitbucket):
if file_match if file_match
] ]
combined = [] combined = []
if file_list: # handle DVD if file_list: # handle DVD
for n in range(99): for n in range(99):
concat = [] concat = []
m = 1 m = 1
@ -749,10 +769,10 @@ def rip_iso(item, new_dir, bitbucket):
combined.extend(concat) combined.extend(concat)
continue continue
name = '{name}.cd{x}'.format( name = '{name}.cd{x}'.format(
name=os.path.splitext(os.path.split(item)[1])[0], x=n + 1 name=os.path.splitext(os.path.split(item)[1])[0], x=n + 1,
) )
new_files.append({item: {'name': name, 'files': concat}}) new_files.append({item: {'name': name, 'files': concat}})
else: #check BlueRay for BDMV/STREAM/XXXX.MTS else: # check BlueRay for BDMV/STREAM/XXXX.MTS
mts_list_gen = ( mts_list_gen = (
re.match(r'.+(BDMV[/\\]STREAM[/\\][0-9]+[0-9].[Mm]).', line) re.match(r'.+(BDMV[/\\]STREAM[/\\][0-9]+[0-9].[Mm]).', line)
for line in out.decode().splitlines() for line in out.decode().splitlines()
@ -762,9 +782,9 @@ def rip_iso(item, new_dir, bitbucket):
for file_match in mts_list_gen for file_match in mts_list_gen
if file_match if file_match
] ]
if sys.version_info[0] == 2: # Python2 sorting if sys.version_info[0] == 2: # Python2 sorting
mts_list.sort(key=lambda f: int(filter(str.isdigit, f))) # Sort all .mts files in numerical order mts_list.sort(key=lambda f: int(filter(str.isdigit, f))) # Sort all .mts files in numerical order
else: # Python3 sorting else: # Python3 sorting
mts_list.sort(key=lambda f: int(''.join(filter(str.isdigit, f)))) mts_list.sort(key=lambda f: int(''.join(filter(str.isdigit, f))))
n = 0 n = 0
for mts_name in mts_list: for mts_name in mts_list:
@ -775,7 +795,7 @@ def rip_iso(item, new_dir, bitbucket):
combined.extend(concat) combined.extend(concat)
continue continue
name = '{name}.cd{x}'.format( name = '{name}.cd{x}'.format(
name=os.path.splitext(os.path.split(item)[1])[0], x=n name=os.path.splitext(os.path.split(item)[1])[0], x=n,
) )
new_files.append({item: {'name': name, 'files': concat}}) new_files.append({item: {'name': name, 'files': concat}})
if core.CONCAT and combined: if core.CONCAT and combined:
@ -814,7 +834,7 @@ def combine_vts(vts_path):
combined.extend(concat) combined.extend(concat)
continue continue
name = '{name}.cd{x}'.format( name = '{name}.cd{x}'.format(
name=name, x=n + 1 name=name, x=n + 1,
) )
new_files.append({vts_path: {'name': name, 'files': concat}}) new_files.append({vts_path: {'name': name, 'files': concat}})
if core.CONCAT: if core.CONCAT:
@ -832,18 +852,18 @@ def combine_mts(mts_path):
name = os.path.basename(name) name = os.path.basename(name)
n = 0 n = 0
mts_list = [f for f in os.listdir(mts_path) if os.path.isfile(os.path.join(mts_path, f))] mts_list = [f for f in os.listdir(mts_path) if os.path.isfile(os.path.join(mts_path, f))]
if sys.version_info[0] == 2: # Python2 sorting if sys.version_info[0] == 2: # Python2 sorting
mts_list.sort(key=lambda f: int(filter(str.isdigit, f))) mts_list.sort(key=lambda f: int(filter(str.isdigit, f)))
else: # Python3 sorting else: # Python3 sorting
mts_list.sort(key=lambda f: int(''.join(filter(str.isdigit, f)))) mts_list.sort(key=lambda f: int(''.join(filter(str.isdigit, f))))
for mts_name in mts_list: ### need to sort all files [1 - 998].mts in order for mts_name in mts_list: # need to sort all files [1 - 998].mts in order
concat = [] concat = []
concat.append(os.path.join(mts_path, mts_name)) concat.append(os.path.join(mts_path, mts_name))
if core.CONCAT: if core.CONCAT:
combined.extend(concat) combined.extend(concat)
continue continue
name = '{name}.cd{x}'.format( name = '{name}.cd{x}'.format(
name=name, x=n + 1 name=name, x=n + 1,
) )
new_files.append({mts_path: {'name': name, 'files': concat}}) new_files.append({mts_path: {'name': name, 'files': concat}})
n += 1 n += 1
@ -857,8 +877,10 @@ def combine_cd(combine):
for item in {re.match('(.+)[cC][dD][0-9].', item).groups()[0] for item in combine}: for item in {re.match('(.+)[cC][dD][0-9].', item).groups()[0] for item in combine}:
concat = '' concat = ''
for n in range(99): for n in range(99):
files = [file for file in combine if files = [
n + 1 == int(re.match('.+[cC][dD]([0-9]+).', file).groups()[0]) and item in file] file for file in combine if
n + 1 == int(re.match('.+[cC][dD]([0-9]+).', file).groups()[0]) and item in file
]
if files: if files:
concat += f'{files[0]}|' concat += f'{files[0]}|'
else: else:
@ -963,8 +985,8 @@ def transcode_directory(dir_name):
logger.error(f'Transcoding of video to {newfile_path} failed with result {result}') logger.error(f'Transcoding of video to {newfile_path} failed with result {result}')
# this will be 0 (successful) it all are successful, else will return a positive integer for failure. # this will be 0 (successful) it all are successful, else will return a positive integer for failure.
final_result = final_result + result final_result = final_result + result
if core.MOUNTED: # In case we mounted an .iso file, unmount here. if core.MOUNTED: # In case we mounted an .iso file, unmount here.
time.sleep(5) # play it safe and avoid failing to unmount. time.sleep(5) # play it safe and avoid failing to unmount.
cmd = ['umount', '-l', core.MOUNTED] cmd = ['umount', '-l', core.MOUNTED]
print_cmd(cmd) print_cmd(cmd)
proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket) proc = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=bitbucket)

128
core/version_check.py
View file

@ -105,7 +105,8 @@ class GitUpdateManager(UpdateManager):
def _git_error(self): def _git_error(self):
logger.debug( logger.debug(
'Unable to find your git executable - Set git_path in your autoProcessMedia.cfg OR delete your .git folder and run from source to enable updates.') 'Unable to find your git executable - Set git_path in your autoProcessMedia.cfg OR delete your .git folder and run from source to enable updates.',
)
def _find_working_git(self): def _find_working_git(self):
test_cmd = 'version' test_cmd = 'version'
@ -115,8 +116,10 @@ class GitUpdateManager(UpdateManager):
else: else:
main_git = 'git' main_git = 'git'
logger.log('Checking if we can use git commands: {git} {cmd}'.format logger.log(
(git=main_git, cmd=test_cmd), logger.DEBUG) 'Checking if we can use git commands: {git} {cmd}'.format
(git=main_git, cmd=test_cmd), logger.DEBUG,
)
output, err, exit_status = self._run_git(main_git, test_cmd) output, err, exit_status = self._run_git(main_git, test_cmd)
if exit_status == 0: if exit_status == 0:
@ -141,8 +144,10 @@ class GitUpdateManager(UpdateManager):
logger.log('Trying known alternative git locations', logger.DEBUG) logger.log('Trying known alternative git locations', logger.DEBUG)
for cur_git in alternative_git: for cur_git in alternative_git:
logger.log('Checking if we can use git commands: {git} {cmd}'.format logger.log(
(git=cur_git, cmd=test_cmd), logger.DEBUG) 'Checking if we can use git commands: {git} {cmd}'.format
(git=cur_git, cmd=test_cmd), logger.DEBUG,
)
output, err, exit_status = self._run_git(cur_git, test_cmd) output, err, exit_status = self._run_git(cur_git, test_cmd)
if exit_status == 0: if exit_status == 0:
@ -152,9 +157,11 @@ class GitUpdateManager(UpdateManager):
logger.log(f'Not using: {cur_git}', logger.DEBUG) logger.log(f'Not using: {cur_git}', logger.DEBUG)
# Still haven't found a working git # Still haven't found a working git
logger.debug('Unable to find your git executable - ' logger.debug(
'Set git_path in your autoProcessMedia.cfg OR ' 'Unable to find your git executable - '
'delete your .git folder and run from source to enable updates.') 'Set git_path in your autoProcessMedia.cfg OR '
'delete your .git folder and run from source to enable updates.',
)
return None return None
@ -171,10 +178,14 @@ class GitUpdateManager(UpdateManager):
cmd = f'{git_path} {args}' cmd = f'{git_path} {args}'
try: try:
logger.log('Executing {cmd} with your shell in {directory}'.format logger.log(
(cmd=cmd, directory=core.APP_ROOT), logger.DEBUG) 'Executing {cmd} with your shell in {directory}'.format
p = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT, (cmd=cmd, directory=core.APP_ROOT), logger.DEBUG,
shell=True, cwd=core.APP_ROOT) )
p = subprocess.Popen(
cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
shell=True, cwd=core.APP_ROOT,
)
output, err = p.communicate() output, err = p.communicate()
exit_status = p.returncode exit_status = p.returncode
@ -194,12 +205,16 @@ class GitUpdateManager(UpdateManager):
logger.log(f'{cmd} : returned successful', logger.DEBUG) logger.log(f'{cmd} : returned successful', logger.DEBUG)
exit_status = 0 exit_status = 0
elif core.LOG_GIT and exit_status in (1, 128): elif core.LOG_GIT and exit_status in (1, 128):
logger.log('{cmd} returned : {output}'.format logger.log(
(cmd=cmd, output=output), logger.DEBUG) '{cmd} returned : {output}'.format
(cmd=cmd, output=output), logger.DEBUG,
)
else: else:
if core.LOG_GIT: if core.LOG_GIT:
logger.log('{cmd} returned : {output}, treat as error for now'.format logger.log(
(cmd=cmd, output=output), logger.DEBUG) '{cmd} returned : {output}, treat as error for now'.format
(cmd=cmd, output=output), logger.DEBUG,
)
exit_status = 1 exit_status = 1
return output, err, exit_status return output, err, exit_status
@ -284,18 +299,26 @@ class GitUpdateManager(UpdateManager):
logger.log('git didn\'t return numbers for behind and ahead, not using it', logger.DEBUG) logger.log('git didn\'t return numbers for behind and ahead, not using it', logger.DEBUG)
return return
logger.log('cur_commit = {current} % (newest_commit)= {new}, ' logger.log(
'num_commits_behind = {x}, num_commits_ahead = {y}'.format 'cur_commit = {current} % (newest_commit)= {new}, '
(current=self._cur_commit_hash, new=self._newest_commit_hash, 'num_commits_behind = {x}, num_commits_ahead = {y}'.format
x=self._num_commits_behind, y=self._num_commits_ahead), logger.DEBUG) (
current=self._cur_commit_hash, new=self._newest_commit_hash,
x=self._num_commits_behind, y=self._num_commits_ahead,
), logger.DEBUG,
)
def set_newest_text(self): def set_newest_text(self):
if self._num_commits_ahead: if self._num_commits_ahead:
logger.log('Local branch is ahead of {branch}. Automatic update not possible.'.format logger.log(
(branch=self.branch), logger.ERROR) 'Local branch is ahead of {branch}. Automatic update not possible.'.format
(branch=self.branch), logger.ERROR,
)
elif self._num_commits_behind: elif self._num_commits_behind:
logger.log('There is a newer version available (you\'re {x} commit{s} behind)'.format logger.log(
(x=self._num_commits_behind, s='s' if self._num_commits_behind > 1 else ''), logger.MESSAGE) 'There is a newer version available (you\'re {x} commit{s} behind)'.format
(x=self._num_commits_behind, s='s' if self._num_commits_behind > 1 else ''), logger.MESSAGE,
)
else: else:
return return
@ -417,8 +440,10 @@ class SourceUpdateManager(UpdateManager):
# when _cur_commit_hash doesn't match anything _num_commits_behind == 100 # when _cur_commit_hash doesn't match anything _num_commits_behind == 100
self._num_commits_behind += 1 self._num_commits_behind += 1
logger.log('cur_commit = {current} % (newest_commit)= {new}, num_commits_behind = {x}'.format logger.log(
(current=self._cur_commit_hash, new=self._newest_commit_hash, x=self._num_commits_behind), logger.DEBUG) 'cur_commit = {current} % (newest_commit)= {new}, num_commits_behind = {x}'.format
(current=self._cur_commit_hash, new=self._newest_commit_hash, x=self._num_commits_behind), logger.DEBUG,
)
def set_newest_text(self): def set_newest_text(self):
@ -428,15 +453,18 @@ class SourceUpdateManager(UpdateManager):
if not self._cur_commit_hash: if not self._cur_commit_hash:
logger.log('Unknown current version number, don\'t know if we should update or not', logger.ERROR) logger.log('Unknown current version number, don\'t know if we should update or not', logger.ERROR)
elif self._num_commits_behind > 0: elif self._num_commits_behind > 0:
logger.log('There is a newer version available (you\'re {x} commit{s} behind)'.format logger.log(
(x=self._num_commits_behind, s='s' if self._num_commits_behind > 1 else ''), logger.MESSAGE) 'There is a newer version available (you\'re {x} commit{s} behind)'.format
(x=self._num_commits_behind, s='s' if self._num_commits_behind > 1 else ''), logger.MESSAGE,
)
else: else:
return return
def update(self): def update(self):
"""Download and install latest source tarball from github.""" """Download and install latest source tarball from github."""
tar_download_url = 'https://github.com/{org}/{repo}/tarball/{branch}'.format( tar_download_url = 'https://github.com/{org}/{repo}/tarball/{branch}'.format(
org=self.github_repo_user, repo=self.github_repo, branch=self.branch) org=self.github_repo_user, repo=self.github_repo, branch=self.branch,
)
version_path = os.path.join(core.APP_ROOT, 'version.txt') version_path = os.path.join(core.APP_ROOT, 'version.txt')
try: try:
@ -456,13 +484,17 @@ class SourceUpdateManager(UpdateManager):
urlretrieve(tar_download_url, tar_download_path) urlretrieve(tar_download_url, tar_download_path)
if not os.path.isfile(tar_download_path): if not os.path.isfile(tar_download_path):
logger.log('Unable to retrieve new version from {url}, can\'t update'.format logger.log(
(url=tar_download_url), logger.ERROR) 'Unable to retrieve new version from {url}, can\'t update'.format
(url=tar_download_url), logger.ERROR,
)
return False return False
if not tarfile.is_tarfile(tar_download_path): if not tarfile.is_tarfile(tar_download_path):
logger.log('Retrieved version from {url} is corrupt, can\'t update'.format logger.log(
(url=tar_download_url), logger.ERROR) 'Retrieved version from {url} is corrupt, can\'t update'.format
(url=tar_download_url), logger.ERROR,
)
return False return False
# extract to sb-update dir # extract to sb-update dir
@ -476,16 +508,20 @@ class SourceUpdateManager(UpdateManager):
os.remove(tar_download_path) os.remove(tar_download_path)
# find update dir name # find update dir name
update_dir_contents = [x for x in os.listdir(sb_update_dir) if update_dir_contents = [
os.path.isdir(os.path.join(sb_update_dir, x))] x for x in os.listdir(sb_update_dir) if
os.path.isdir(os.path.join(sb_update_dir, x))
]
if len(update_dir_contents) != 1: if len(update_dir_contents) != 1:
logger.log(f'Invalid update data, update failed: {update_dir_contents}', logger.ERROR) logger.log(f'Invalid update data, update failed: {update_dir_contents}', logger.ERROR)
return False return False
content_dir = os.path.join(sb_update_dir, update_dir_contents[0]) content_dir = os.path.join(sb_update_dir, update_dir_contents[0])
# walk temp folder and move files to main folder # walk temp folder and move files to main folder
logger.log('Moving files from {source} to {destination}'.format logger.log(
(source=content_dir, destination=core.APP_ROOT)) 'Moving files from {source} to {destination}'.format
(source=content_dir, destination=core.APP_ROOT),
)
for dirname, _, filenames in os.walk(content_dir): # @UnusedVariable for dirname, _, filenames in os.walk(content_dir): # @UnusedVariable
dirname = dirname[len(content_dir) + 1:] dirname = dirname[len(content_dir) + 1:]
for curfile in filenames: for curfile in filenames:
@ -501,8 +537,10 @@ class SourceUpdateManager(UpdateManager):
os.remove(new_path) os.remove(new_path)
os.renames(old_path, new_path) os.renames(old_path, new_path)
except Exception as error: except Exception as error:
logger.log('Unable to update {path}: {msg}'.format logger.log(
(path=new_path, msg=error), logger.DEBUG) 'Unable to update {path}: {msg}'.format
(path=new_path, msg=error), logger.DEBUG,
)
os.remove(old_path) # Trash the updated file without moving in new path os.remove(old_path) # Trash the updated file without moving in new path
continue continue
@ -515,13 +553,17 @@ class SourceUpdateManager(UpdateManager):
with open(version_path, 'w') as ver_file: with open(version_path, 'w') as ver_file:
ver_file.write(self._newest_commit_hash) ver_file.write(self._newest_commit_hash)
except OSError as error: except OSError as error:
logger.log('Unable to write version file, update not complete: {msg}'.format logger.log(
(msg=error), logger.ERROR) 'Unable to write version file, update not complete: {msg}'.format
(msg=error), logger.ERROR,
)
return False return False
except Exception as error: except Exception as error:
logger.log('Error while trying to update: {msg}'.format logger.log(
(msg=error), logger.ERROR) 'Error while trying to update: {msg}'.format
(msg=error), logger.ERROR,
)
logger.log(f'Traceback: {traceback.format_exc()}', logger.DEBUG) logger.log(f'Traceback: {traceback.format_exc()}', logger.DEBUG)
return False return False