monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-07 02:23:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #380 from Prinz23/feature/FixGetManualSearchStatus

Browse source 
Fix getManualSearchStatus: object has no attribute 'segment'
This commit is contained in:
JackDandy 2015-06-03 17:10:14 +01:00
commit 84dbe2fa1e
2 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -15,6 +15,7 @@
* Fix provider SCC handle null server responses * Fix provider SCC handle null server responses
* Change provider SCC remove 1 of 3 requests per search to save 30% time * Change provider SCC remove 1 of 3 requests per search to save 30% time
* Change provider Womble's use SSL * Change provider Womble's use SSL
* Fix getManualSearchStatus: object has no attribute 'segment'
### 0.9.1 (2015-05-25 03:03:00 UTC) ### 0.9.1 (2015-05-25 03:03:00 UTC)

27
sickbeard/webserve.py
View file

@ -1810,7 +1810,7 @@ class Home(MainHandler):
'searchstatus' : searchstatus, 'searchstatus' : searchstatus,
'status' : statusStrings[searchThread.segment.status], 'status' : statusStrings[searchThread.segment.status],
'quality': self.getQualityClass(searchThread.segment)}) 'quality': self.getQualityClass(searchThread.segment)})
else: elif hasattr(searchThread, 'segment'):
for epObj in searchThread.segment: for epObj in searchThread.segment:
episodes.append({'episode': epObj.episode, episodes.append({'episode': epObj.episode,
'episodeindexid': epObj.indexerid, 'episodeindexid': epObj.indexerid,
@ -1833,7 +1833,7 @@ class Home(MainHandler):
'searchstatus' : searchstatus, 'searchstatus' : searchstatus,
'status' : statusStrings[searchThread.segment.status], 'status' : statusStrings[searchThread.segment.status],
'quality': self.getQualityClass(searchThread.segment)}) 'quality': self.getQualityClass(searchThread.segment)})
else: elif hasattr(searchThread, 'segment'):
for epObj in searchThread.segment: for epObj in searchThread.segment:
episodes.append({'episode': epObj.episode, episodes.append({'episode': epObj.episode,
'episodeindexid': epObj.indexerid, 'episodeindexid': epObj.indexerid,
@ -1853,18 +1853,17 @@ class Home(MainHandler):
'searchstatus' : searchstatus, 'searchstatus' : searchstatus,
'status' : statusStrings[searchThread.segment.status], 'status' : statusStrings[searchThread.segment.status],
'quality': self.getQualityClass(searchThread.segment)}) 'quality': self.getQualityClass(searchThread.segment)})
else: ### These are only Failed Downloads/Retry SearchThreadItems.. lets loop through the segement/episodes
### These are only Failed Downloads/Retry SearchThreadItems.. lets loop through the segement/episodes elif hasattr(searchThread, 'segment') and str(searchThread.show.indexerid) == show:
if str(searchThread.show.indexerid) == show: for epObj in searchThread.segment:
for epObj in searchThread.segment: if not [x for x in episodes if x['episodeindexid'] == epObj.indexerid]:
if not [x for x in episodes if x['episodeindexid'] == epObj.indexerid]: searchstatus = 'finished'
searchstatus = 'finished' episodes.append({'episode': epObj.episode,
episodes.append({'episode': epObj.episode, 'episodeindexid': epObj.indexerid,
'episodeindexid': epObj.indexerid, 'season' : epObj.season,
'season' : epObj.season, 'searchstatus' : searchstatus,
'searchstatus' : searchstatus, 'status' : statusStrings[epObj.status],
'status' : statusStrings[epObj.status], 'quality': self.getQualityClass(epObj)})
'quality': self.getQualityClass(epObj)})
return json.dumps({'show': show, 'episodes' : episodes}) return json.dumps({'show': show, 'episodes' : episodes})