Merge branch 'development' of github.com:midgetspy/Sick-Beard

midgetspy · Jun 26, 2012 · f357de5 · f357de5
2 parents 910038b + 6cbf407
commit f357de5
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/sickbeard/helpers.py b/sickbeard/helpers.py
@@ -114,8 +114,8 @@ def sanitizeFileName (name):
     name = re.sub(r'[\\/\*]', '-', name)
     name = re.sub(r'[:"<>|?]', '', name)
 
-    # remove leading/trailing periods
-    name = re.sub(r'(^\.+|\.+$)', '', name)
+    # remove leading/trailing periods and spaces
+    name = name.strip(' .')
 
     return name
 

diff --git a/sickbeard/search_queue.py b/sickbeard/search_queue.py
@@ -227,7 +227,7 @@ def _need_any_episodes(self, statusResults, bestQualities):
                 highestBestQuality = 0
 
             # if we need a better one then say yes
-            if (curStatus in (common.DOWNLOADED, common.SNATCHED) and curQuality < highestBestQuality) or curStatus == common.WANTED:
+            if (curStatus in (common.DOWNLOADED, common.SNATCHED, common.SNATCHED_PROPER) and curQuality < highestBestQuality) or curStatus == common.WANTED:
                 wantSeason = True
                 break
 

diff --git a/sickbeard/tv.py b/sickbeard/tv.py
@@ -901,7 +901,7 @@ def wantEpisode(self, season, episode, quality, manualSearch=False):
         curStatus, curQuality = Quality.splitCompositeStatus(epStatus)
 
         # if we are re-downloading then we only want it if it's in our bestQualities list and better than what we have
-        if curStatus in Quality.SNATCHED + Quality.DOWNLOADED and quality in bestQualities and quality > curQuality:
+        if curStatus in Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_PROPER and quality in bestQualities and quality > curQuality:
             logger.log(u"We already have this ep but the new one is better quality, saying yes", logger.DEBUG)
             return True
 

diff --git a/sickbeard/webserve.py b/sickbeard/webserve.py
@@ -1781,7 +1781,7 @@ def finishAddShow():
         # blanket policy - if the dir exists you should have used "add existing show" numbnuts
         if ek.ek(os.path.isdir, show_dir) and not fullShowPath:
             ui.notifications.error("Unable to add show", "Folder "+show_dir+" exists already")
-            redirect('/home')
+            redirect('/home/addShows/existingShows')
 
         # don't create show dir if config says not to
         if sickbeard.ADD_SHOWS_WO_DIR: