github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-08-19 04:49:31 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

more charreplace. #424

Browse source
This commit is contained in:
clinton-hall 2014-06-14 11:58:31 +09:30
commit 72b2fb7967
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
nzbToMedia.py
View file

@ -345,7 +345,7 @@ from nzbtomedia.autoProcess.autoProcessGames import autoProcessGames
from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie from nzbtomedia.autoProcess.autoProcessMovie import autoProcessMovie
from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic from nzbtomedia.autoProcess.autoProcessMusic import autoProcessMusic
from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV from nzbtomedia.autoProcess.autoProcessTV import autoProcessTV
from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, CharReplace from nzbtomedia.nzbToMediaUtil import getDirs, extractFiles, cleanDir, update_downloadInfoStatus, get_downloadInfo, CharReplace, convert_to_ascii
from nzbtomedia import logger, nzbToMediaDB from nzbtomedia import logger, nzbToMediaDB
# post-processing # post-processing
@ -410,6 +410,8 @@ def process(inputDirectory, inputName=None, status=0, clientAgent='manual', down
logger.error('Remote Path %s is not valid for %s:%s Please set this to either 0 to disable or 1 to enable!' % ( logger.error('Remote Path %s is not valid for %s:%s Please set this to either 0 to disable or 1 to enable!' % (
section[inputCategory]['remote_path'], sectionName, inputCategory)) section[inputCategory]['remote_path'], sectionName, inputCategory))
inputName, inputDirectory = convert_to_ascii(inputName, inputDirectory)
if extract == 1: if extract == 1:
logger.debug('Checking for archives to extract in directory: %s' % (inputDirectory)) logger.debug('Checking for archives to extract in directory: %s' % (inputDirectory))
extractFiles(inputDirectory) extractFiles(inputDirectory)

5
nzbtomedia/autoProcess/autoProcessMovie.py
View file

@ -170,8 +170,11 @@ class autoProcessMovie:
os.rename(video, video2) os.rename(video, video2)
if num_files > 0 and good_files == num_files: if num_files > 0 and good_files == num_files:
if status: if status:
logger.info("Status shown as failed from Downloader, but %s valid video files found. Setting as successful." % (str(good_files)), section) logger.info("Status shown as failed from Downloader, but %s valid video files found. Setting as success." % (str(good_files)), section)
status = 0 status = 0
elif num_files > 0 and good_files < num_files:
logger.info("Status shown as success from Downloader, but corrupt video files found. Setting as failed.", section)
status = 1
elif clientAgent == "manual": elif clientAgent == "manual":
logger.warning("No media files found in directory %s to manually process." % (dirName), section) logger.warning("No media files found in directory %s to manually process." % (dirName), section)
return 0 # Success (as far as this script is concerned) return 0 # Success (as far as this script is concerned)

16
nzbtomedia/autoProcess/autoProcessTV.py
View file

@ -87,8 +87,19 @@ class autoProcessTV:
# Check video files for corruption # Check video files for corruption
status = int(failed) status = int(failed)
for video in listMediaFiles(dirName): good_files = 0
if not transcoder.isVideoGood(video): num_files = 0
for video in listMediaFiles(dirName, media=True, audio=False, meta=False, archives=False):
num_files += 1
if transcoder.isVideoGood(video):
good_files += 1
if num_files > 0
if good_files == num_files and not status == 0:
logger.info('Found Valid Videos. Setting status Success')
status = 0
failed = 0
if good_files < num_files and status == 0:
logger.info('Found corrupt videos. Setting status Failed')
status = 1 status = 1
failed = 1 failed = 1
@ -111,6 +122,7 @@ class autoProcessTV:
if transcoder.isVideoGood(video): if transcoder.isVideoGood(video):
good_files += 1 good_files += 1
if num_files > 0 and good_files == num_files: if num_files > 0 and good_files == num_files:
logger.info('Found Valid Videos. Setting status Success')
status = 0 status = 0
failed = 0 failed = 0