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

Merge branch 'master' into develop

Browse source
This commit is contained in:
JackDandy 2016-01-14 22:09:54 +00:00
commit 39721671bc
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
CHANGES.md
View file

@ -21,6 +21,11 @@
* Update Six compatibility library 1.9.0 (r400) to 1.10.0 (r405) * Update Six compatibility library 1.9.0 (r400) to 1.10.0 (r405)
### 0.11.2 (2016-01-14 21:10:00 UTC)
* Fix issue with "Add Existing Shows" on new installations
### 0.11.1 (2016-01-12 22:20:00 UTC) ### 0.11.1 (2016-01-12 22:20:00 UTC)
* Fix handling non-numeric IMDb popular ratings * Fix handling non-numeric IMDb popular ratings

12
sickbeard/webserve.py
View file

@ -2878,16 +2878,14 @@ class NewHomeAddShows(Home):
if not extra_show: if not extra_show:
return (None, None, None, None) return (None, None, None, None)
split_vals = extra_show.split('|') split_vals = extra_show.split('|')
if len(split_vals) < 4: indexer = helpers.tryInt(split_vals[0], 1)
indexer = split_vals[0]
show_dir = split_vals[1]
return (indexer, show_dir, None, None)
indexer = split_vals[0]
show_dir = split_vals[1] show_dir = split_vals[1]
if len(split_vals) < 4:
return indexer, show_dir, None, None
indexer_id = split_vals[2] indexer_id = split_vals[2]
show_name = '|'.join(split_vals[3:]) show_name = '|'.join(split_vals[3:])
return (indexer, show_dir, indexer_id, show_name) return indexer, show_dir, indexer_id, show_name
def addExistingShows(self, shows_to_add=None, promptForSettings=None, **kwargs): def addExistingShows(self, shows_to_add=None, promptForSettings=None, **kwargs):
""" """
@ -2923,7 +2921,7 @@ class NewHomeAddShows(Home):
if not show_dir or not indexer_id or not show_name: if not show_dir or not indexer_id or not show_name:
continue continue
indexer_id_given.append((int(indexer), show_dir, int(indexer_id), show_name)) indexer_id_given.append((indexer, show_dir, int(indexer_id), show_name))
# if they want me to prompt for settings then I will just carry on to the newShow page # if they want me to prompt for settings then I will just carry on to the newShow page
if promptForSettings and shows_to_add: if promptForSettings and shows_to_add: