monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-03-15 17:17:43 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Fix issue on Add Existing Shows page where shows were listed that should not have been.

Browse source
This commit is contained in:
JackDandy 2016-01-06 20:15:55 +00:00
parent 1cf0b5f9b2
commit 842b08c5fc
5 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
CHANGES.md
View file

@ -1,9 +1,4 @@
### 0.12.0 (2015-xx-xx xx:xx:xx UTC) ### 0.11.0 (2016-xx-xx xx:xx:xx UTC)
* Change to generalize xem id fetching
### 0.11.0 (2015-xx-xx xx:xx:xx UTC)
* Change to only refresh scene exception data for shows that need it * Change to only refresh scene exception data for shows that need it
* Change reduce aggressive use of scene numbering that was overriding user preference where not needed * Change reduce aggressive use of scene numbering that was overriding user preference where not needed
@ -109,6 +104,8 @@
* Change sab to use requests library * Change sab to use requests library
* Add "View Changes" to tools menu * Add "View Changes" to tools menu
* Change disable connection attempts and remove UI references to the TVRage info source * Change disable connection attempts and remove UI references to the TVRage info source
* Change to simplify xem id fetching
* Fix issue on Add Existing Shows page where shows were listed that should not have been
### 0.10.0 (2015-08-06 11:05:00 UTC) ### 0.10.0 (2015-08-06 11:05:00 UTC)

2
gui/slick/interfaces/default/home_massAddTable.tmpl
View file

@ -21,7 +21,7 @@
</tfoot> </tfoot>
<tbody> <tbody>
#for $curDir in $dirList #for $curDir in $dirList
#if $curDir['added_already'] and None is $curDir.get('highlight') #if $curDir['added_already'] and (None is $curDir.get('highlight') or not $kwargs.get('hash_dir'))
#continue #continue
#end if #end if

2
sickbeard/notifiers/trakt.py
View file

@ -91,7 +91,7 @@ class TraktNotifier:
msg = 'Episode not found on Trakt, not adding to' msg = 'Episode not found on Trakt, not adding to'
else: else:
warn, msg = True, 'Could not add episode to' warn, msg = True, 'Could not add episode to'
except exceptions.TraktAuthException, exceptions.TraktException: except (exceptions.TraktAuthException, exceptions.TraktException):
warn, msg = True, 'Error adding episode to' warn, msg = True, 'Error adding episode to'
msg = 'Trakt: %s your %s collection' % (msg, sickbeard.TRAKT_ACCOUNTS[tid].name) msg = 'Trakt: %s your %s collection' % (msg, sickbeard.TRAKT_ACCOUNTS[tid].name)
if not warn: if not warn:

2
sickbeard/show_name_helpers.py
View file

@ -116,7 +116,7 @@ def compile_word_list(lookup_words, re_prefix='(^|[\W_])', re_suffix='($|[\W_])'
# !0 == regex and subject = s / 'what\'s the "time"' / what\'s\ the\ \"time\" # !0 == regex and subject = s / 'what\'s the "time"' / what\'s\ the\ \"time\"
subject = search_raw and re.escape(word) or re.sub(r'([\" \'])', r'\\\1', word) subject = search_raw and re.escape(word) or re.sub(r'([\" \'])', r'\\\1', word)
result.append(re.compile('(?i)%s%s%s' % (re_prefix, subject, re_suffix))) result.append(re.compile('(?i)%s%s%s' % (re_prefix, subject, re_suffix)))
except Exception as e: except re.error as e:
logger.log(u'Failure to compile filter expression: %s ... Reason: %s' % (word, e.message), logger.DEBUG) logger.log(u'Failure to compile filter expression: %s ... Reason: %s' % (word, e.message), logger.DEBUG)
diff = len(lookup_words) - len(result) diff = len(lookup_words) - len(result)

2
sickbeard/webserve.py
View file

@ -2302,6 +2302,8 @@ class NewHomeAddShows(Home):
if indexer_id and helpers.findCertainShow(sickbeard.showList, indexer_id): if indexer_id and helpers.findCertainShow(sickbeard.showList, indexer_id):
cur_dir['added_already'] = True cur_dir['added_already'] = True
file_list = None
t.dirList = dir_list t.dirList = dir_list
return t.respond() return t.respond()