Permalink
Browse files

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

  • Loading branch information...
2 parents 910038b + 6cbf407 commit f357de53bff0a4e36168dcdd61f9f4f53f3ce4f4 @midgetspy committed Jun 26, 2012
Showing with 5 additions and 5 deletions.
  1. +2 −2 sickbeard/helpers.py
  2. +1 −1 sickbeard/search_queue.py
  3. +1 −1 sickbeard/tv.py
  4. +1 −1 sickbeard/webserve.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
@@ -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
View
@@ -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
@@ -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:

0 comments on commit f357de5

Please sign in to comment.