Remove automatic replacing with proper in name not in status

Safer since processer sorts biggest first,
potential risc of replacing with smaller stuff (sample) only because name has proper in it.
+ Add force replace manual post processing

Author: Patrick Vos

data/interfaces/default/home_postprocess.tmpl

@@ -1,5 +1,5 @@
 #import sickbeard
-#set global $title="Post Processing"
+#set global $title="Manual Post-Processing"
 
 #set global $sbPath="../.."
 
@@ -8,7 +8,12 @@
 #include $os.path.join($sickbeard.PROG_DIR, "data/interfaces/default/inc_top.tmpl")
 
 <form name="processForm" method="post" action="processEpisode">
-Enter the folder containing the episode: <input type="text" name="dir" id="episodeDir" #if $sickbeard.TV_DOWNLOAD_DIR then "value=" + $sickbeard.TV_DOWNLOAD_DIR else ""# size="50" /><input type="hidden" name="method" value="Manual"> <input type="submit" class="btn" value="Process" />
+Enter the folder containing the episode: <input type="text" name="dir" id="episodeDir" #if $sickbeard.TV_DOWNLOAD_DIR then "value=\"" + $sickbeard.TV_DOWNLOAD_DIR + "\"" else ""# size="50" />
+<input type="hidden" name="method" value="Manual"> <input type="submit" class="btn" value="Process" />
+<br /><br />
+Force replace existing episodes:&nbsp;<input type="checkbox" name="force_replace" /><br />
+<b>Overwrite</b> existing episode, ignoring status downloaded (quality)<br />
+
 </form>
 <br />
 

sickbeard/postProcessor.py

@@ -58,7 +58,7 @@ class PostProcessor(object):
     FOLDER_NAME = 2
     FILE_NAME = 3
 
-    def __init__(self, file_path, nzb_name=None):
+    def __init__(self, file_path, nzb_name=None, pp_options={}):
         """
         Creates a new post processor with the given file path and optionally an NZB name.
 
@@ -80,6 +80,8 @@ def __init__(self, file_path, nzb_name=None):
         # name of the NZB that resulted in this folder
         self.nzb_name = nzb_name
 
+        self.force_replace = pp_options.get('force_replace', False)
+
         self.in_history = False
         self.release_group = None
         self.is_proper = False
@@ -683,9 +685,9 @@ def _safe_replace(self, ep_obj, new_ep_quality):
 
         # Status downloaded. Quality/ size checks
 
-        # if the file processed appears to be a PROPER/REPACK then it's safe
-        if self.is_proper and new_ep_quality >= old_ep_quality and new_ep_quality != common.Quality.UNKNOWN:
-            self._log(u"Existing episode status is not snatched_proper, but new file appears to be a proper, marking it safe to replace", logger.DEBUG)
+        # if manual post process option is set to force_replace then it's safe
+        if self.force_replace:
+            self._log(u"Processed episode is set to force replace existing episode, marking it safe to replace", logger.DEBUG)
             return True
 
         # if the file processed is higher quality than the existing episode then it's safe

sickbeard/processTV.py

@@ -67,7 +67,7 @@ def logHelper(logMessage, logLevel=logger.MESSAGE):
     return logMessage + u"\n"
 
 
-def processDir(dirName, nzbName=None, method=None, recurse=False):
+def processDir(dirName, nzbName=None, method=None, recurse=False, pp_options={}):
     """
     Scans through the files in dirName and processes whatever media files it finds
 
@@ -144,7 +144,7 @@ def processDir(dirName, nzbName=None, method=None, recurse=False):
             returnStr += logHelper(u"Ignoring hidden folder: " + cur_folder, logger.DEBUG)
         else:
             returnStr += logHelper(u"Recursively processing a folder: " + cur_folder, logger.DEBUG)
-            returnStr += processDir(cur_folder, nzbName=parent_nzbName, recurse=True, method=method)
+            returnStr += processDir(cur_folder, nzbName=parent_nzbName, recurse=True, method=method, pp_options=pp_options)
 
     remainingFolders = filter(lambda x: ek.ek(os.path.isdir, ek.ek(os.path.join, dirName, x)), fileList)
 
@@ -182,7 +182,7 @@ def processDir(dirName, nzbName=None, method=None, recurse=False):
 
         try:
             returnStr += u"\n"
-            processor = postProcessor.PostProcessor(cur_video_file_path, nzbName)
+            processor = postProcessor.PostProcessor(cur_video_file_path, nzb_name=nzbName, pp_options=pp_options)
             process_result = processor.process()
             process_fail_message = ""
 

sickbeard/webserve.py

@@ -1347,12 +1347,18 @@ def index(self):
         return _munge(t)
 
     @cherrypy.expose
-    def processEpisode(self, dir=None, nzbName=None, method=None, jobName=None, quiet=None):
+    def processEpisode(self, dir=None, nzbName=None, method=None, jobName=None, quiet=None, *args, **kwargs):
 
         if not dir:
             redirect("/home/postprocess/")
         else:
-            result = processTV.processDir(dir, nzbName, method=method)
+            pp_options = {}
+            for key, value in kwargs.iteritems():
+                if value == 'on':
+                    value = True
+                pp_options[key] = value
+
+            result = processTV.processDir(dir, nzbName, method=method, pp_options=pp_options)
             if quiet != None and int(quiet) == 1:
                 return result