moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-11-10 19:35:08 -05:00
Code Issues Releases Wiki Activity

Merge branch 'subtitle_api' of https://github.com/Hellowlol/SickRage into develop

Browse Source
This commit is contained in:
Adam 2014-11-01 11:54:45 +08:00
commit f6eda6954d
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGES.md
View File

@ -33,6 +33,7 @@
* Fix keyerrors on backlog overview preventing the page to load * Fix keyerrors on backlog overview preventing the page to load
* Fix exception raised when converting 12pm to 24hr format and handle 12am when setting file modify time (e.g. used during PP) * Fix exception raised when converting 12pm to 24hr format and handle 12am when setting file modify time (e.g. used during PP)
* Fix proxy_indexers setting not loading from config file * Fix proxy_indexers setting not loading from config file
* Add subtitle information to the cmd show and cmd shows api output
[develop changelog] [develop changelog]
* Improve display of progress bars in the Downloads columns of the show list page * Improve display of progress bars in the Downloads columns of the show list page

2
sickbeard/webapi.py
View File

@ -1788,6 +1788,7 @@ class CMD_Show(ApiCall):
showDict["language"] = showObj.lang showDict["language"] = showObj.lang
showDict["show_name"] = showObj.name showDict["show_name"] = showObj.name
showDict["paused"] = showObj.paused showDict["paused"] = showObj.paused
showDict["subtitles"] = showObj.subtitles
showDict["air_by_date"] = showObj.air_by_date showDict["air_by_date"] = showObj.air_by_date
showDict["flatten_folders"] = showObj.flatten_folders showDict["flatten_folders"] = showObj.flatten_folders
showDict["sports"] = showObj.sports showDict["sports"] = showObj.sports
@ -2578,6 +2579,7 @@ class CMD_Shows(ApiCall):
"network": curShow.network, "network": curShow.network,
"show_name": curShow.name, "show_name": curShow.name,
"status": curShow.status, "status": curShow.status,
"subtitles": curShow.subtitles,
"next_ep_airdate": nextAirdate "next_ep_airdate": nextAirdate
} }