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

Merge pull request #44 from JackDandy/feature/FixAddShowFromTVRage

Browse source 
Fix adding shows from TVRage API plus sorting them in Layout Simple of S...
This commit is contained in:
JackDandy 2014-11-21 11:51:29 +00:00
commit 2ebd0a90a3
3 changed files with 25 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
CHANGES.md
View file

@ -32,12 +32,14 @@
* Change suppress HTTPS verification InsecureRequestWarning as many sites use self-certified certificates * Change suppress HTTPS verification InsecureRequestWarning as many sites use self-certified certificates
* Fix API endpoint Episode.SetStatus to "Wanted" * Fix API endpoint Episode.SetStatus to "Wanted"
* Change airdateModifyStamp to handle hour that is "00:00" * Change airdateModifyStamp to handle hour that is "00:00"
* Fix a handler when ShowData is not available in tvdb and tvrage APIs * Fix a handler when ShowData is not available in TVDB and TVRage APIs
* Fix a handler when EpisodeData is not available in tvdb and tvrage APIs * Fix a handler when EpisodeData is not available in TVDB and TVRage APIs
* Add TVRage "Canceled/Ended" as "Ended" status to sort on Simple Layout of Show List page
* Fix qtips on Display Show and Config Post Processing * Fix qtips on Display Show and Config Post Processing
[develop changelog] [develop changelog]
* Fix typo for commit "ShowData handler" i.e. SHA-1:3eec217 * Fix typo for commit "ShowData handler" i.e. SHA-1:3eec217
* Fix adding show from TVRage API
### 0.3.1 (2014-11-19 16:40:00 UTC) ### 0.3.1 (2014-11-19 16:40:00 UTC)

24
gui/slick/interfaces/default/home.tmpl
View file

@ -280,10 +280,13 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
#set $cur_downloaded = 0 #set $cur_downloaded = 0
#set $cur_total = 0 #set $cur_total = 0
#set $download_stat_tip = '' #set $download_stat_tip = ''
#if None is not $curShow.status and re.search(r'(?i)(?:new|returning)\s*series', $curShow.status) #set $display_status = $curShow.status
#set $display_status = 'Continuing' #if None is not $display_status
#else #if re.search(r'(?i)(?:new|returning)\s*series', $curShow.status)
#set $display_status = $curShow.status #set $display_status = 'Continuing'
#else if re.search(r'(?i)(?:nded)', $curShow.status)
#set $display_status = 'Ended'
#end if
#end if #end if
#if $curShow.indexerid in $show_stat: #if $curShow.indexerid in $show_stat:
@ -604,11 +607,16 @@ $myShowList.sort(lambda x, y: cmp(x.name, y.name))
</td> </td>
<td align="center"> <td align="center">
#if None is not $curShow.status and re.search(r'(?i)(?:new|returning)\s*series', $curShow.status)
Continuing #set $display_status = $curShow.status
#else: #if None is not $display_status
$curShow.status #if re.search(r'(?i)(?:new|returning)\s*series', $curShow.status)
#set $display_status = 'Continuing'
#else if re.search(r'(?i)(?:nded)', $curShow.status)
#set $display_status = 'Ended'
#end if
#end if #end if
$display_status
</td> </td>
</tr> </tr>

2
lib/tvrage_api/tvrage_api.py
View file

@ -604,7 +604,7 @@ class TVRage:
self.config['params_epInfo']['sid'] = sid self.config['params_epInfo']['sid'] = sid
epsEt = self._getetsrc(self.config['url_epInfo'], self.config['params_epInfo']) epsEt = self._getetsrc(self.config['url_epInfo'], self.config['params_epInfo'])
if 'episode' not in epsEt: if 'episodelist' not in epsEt and 'season' not in epsEt['episodelist']:
return False return False
seasons = epsEt['episodelist']['season'] seasons = epsEt['episodelist']['season']