From a18329565750c5919aeeaa01d69b671938dadf6c Mon Sep 17 00:00:00 2001 From: echel0n Date: Sun, 20 Apr 2014 21:01:57 -0700 Subject: [PATCH] Cleaned up log messages for Transcoder and logs --- nzbtomedia/Transcoder.py | 13 +++++++------ nzbtomedia/logger.py | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/nzbtomedia/Transcoder.py b/nzbtomedia/Transcoder.py index 039c9062..120c1f28 100644 --- a/nzbtomedia/Transcoder.py +++ b/nzbtomedia/Transcoder.py @@ -8,7 +8,8 @@ from nzbToMediaUtil import listMediaFiles class Transcoder: def isVideoGood(self, videofile): - fileName, fileExt = os.path.splitext(videofile) + fileNameExt = os.path.basename(videofile) + fileName, fileExt = os.path.splitext(fileNameExt) if fileExt not in nzbtomedia.MEDIACONTAINER: return True @@ -18,22 +19,22 @@ class Transcoder: bitbucket = open('/dev/null') if not nzbtomedia.FFPROBE: - logger.error("Cannot detect corrupt video files!, set your ffmpeg_path in your autoProcessMedia.cfg ...") + logger.error("Cannot detect corrupt video files!, set your ffmpeg_path in your autoProcessMedia.cfg ...", 'TRANSCODER') return False command = [nzbtomedia.FFPROBE, videofile] try: - logger.info('Checking if %s has any corruption, please stand by ...' % (videofile)) + logger.info('Checking [%s] for corruption, please stand by ...' % (fileNameExt), 'TRANSCODER') result = call(command, stdout=bitbucket, stderr=bitbucket) except: - logger.error("Checking video %s for corruption has failed" % (videofile)) + logger.error("Checking [%s] for corruption has failed" % (fileNameExt), 'TRANSCODER') return False if result == 0: - logger.info("Video %s has no corruption." % (videofile)) + logger.info("SUCCESS: [%s] has no corruption." % (fileNameExt), 'TRANSCODER') return True else: - logger.error("Video %s is corrupted!" % (videofile)) + logger.error("FAILED: [%s] is corrupted!" % (fileNameExt), 'TRANSCODER') return False def Transcode_directory(self, dirName): diff --git a/nzbtomedia/logger.py b/nzbtomedia/logger.py index 937d287f..c7369bae 100644 --- a/nzbtomedia/logger.py +++ b/nzbtomedia/logger.py @@ -178,7 +178,7 @@ class NTMRotatingLogHandler(object): else: self.writes_since_check += 1 - message = u"%s:: %s" % (str(section).upper(), toLog) + message = u"%s: %s" % (str(section).upper(), toLog) out_line = message