diff --git a/TorrentToMedia.py b/TorrentToMedia.py index f86a6b07..b0e6effd 100755 --- a/TorrentToMedia.py +++ b/TorrentToMedia.py @@ -266,7 +266,7 @@ def main(args): for section, subsections in nzbtomedia.SECTIONS.items(): for subsection in subsections: - for dirName in nzbtomedia.getDirs(section,subsection): + for dirName in nzbtomedia.getDirs(section, subsection, link='hard'): logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName))) diff --git a/nzbToMedia.py b/nzbToMedia.py index 39500c5f..b2a485d7 100755 --- a/nzbToMedia.py +++ b/nzbToMedia.py @@ -706,7 +706,7 @@ def main(args, section=None): for section, subsections in nzbtomedia.SECTIONS.items(): for subsection in subsections: - for dirName in getDirs(section, subsection): + for dirName in getDirs(section, subsection, link = 'move'): logger.info("Starting manual run for %s:%s - Folder:%s" % (section, subsection, dirName)) logger.info("Checking database for download info for %s ..." % (os.path.basename(dirName))) diff --git a/nzbtomedia/transcoder/transcoder.py b/nzbtomedia/transcoder/transcoder.py index f20bc9c8..1af4eb7e 100644 --- a/nzbtomedia/transcoder/transcoder.py +++ b/nzbtomedia/transcoder/transcoder.py @@ -44,8 +44,12 @@ def getVideoDetails(videofile): result = 1 if not nzbtomedia.FFPROBE: return video_details, result + if 'avprobe' in nzbtomedia.FFPROBE: + print_format = '-of' + else: + print_format = '-print_format' try: - command = [nzbtomedia.FFPROBE, '-v', 'quiet', '-print_format', 'json', '-show_format', '-show_streams', '-show_error', videofile] + command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', '-show_error', videofile] proc = subprocess.Popen(command, stdout=subprocess.PIPE) out, err = proc.communicate() result = proc.returncode @@ -53,7 +57,7 @@ def getVideoDetails(videofile): except: pass if not video_details: try: - command = [nzbtomedia.FFPROBE, '-v', 'quiet', '-print_format', 'json', '-show_format', '-show_streams', videofile] + command = [nzbtomedia.FFPROBE, '-v', 'quiet', print_format, 'json', '-show_format', '-show_streams', videofile] proc = subprocess.Popen(command, stdout=subprocess.PIPE) out, err = proc.communicate() result = proc.returncode