output_dir fix

fixes output dir setting not working properly with nzb and sab scripts
justinglock40 · Aug 28, 2015 · 33eb642 · 33eb642
1 parent 9389d8d
commit 33eb642
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/NZBGetPostProcess.py b/NZBGetPostProcess.py
@@ -159,7 +159,6 @@
 
     if shouldConvert:
         converter = MkvtoMp4(settings, logger=log)
-        converter.output_dir = None
         for r, d, f in os.walk(path):
             for files in f:
                 inputfile = os.path.join(r, files)
@@ -175,7 +174,8 @@
                                 converter.QTFS(output['output'])
                         except:
                             log.warning("File processing failed.")
-
+        if converter.output_dir:
+            path = converter.output_dir
     if (category.lower() == categories[0]):
         #DEBUG#print "Sickbeard Processing Activated"
         autoProcessTV.processEpisode(path, settings, nzb)

diff --git a/SABPostProcess.py b/SABPostProcess.py
@@ -48,7 +48,6 @@
 if settings.SAB['convert']:
     log.info("Performing conversion")
     converter = MkvtoMp4(settings)
-    converter.output_dir = None
     for r, d, f in os.walk(path):
         for files in f:
             inputfile = os.path.join(r, files)
@@ -63,6 +62,8 @@
                     log.exception("Error converting file %s." % inputfile)
             else:
                 log.debug("Ignoring file %s." % inputfile)
+    if converter.output_dir:
+        path = converter.output_dir
 else:
     log.info("Passing without conversion.")