moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00
Code Issues Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
echel0n 2014-12-02 03:21:40 -08:00
commit 8674a61039
3 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
readme.md
View File

@ -24,6 +24,10 @@ Video File Manager for TV Shows, It watches for new episodes of your favorite sh
- Your tvshow.nfo files are now tagged with a indexer key so that SickBeard can easily tell if the shows info comes from TheTVDB or TVRage.
- Sports shows are now able to be searched for..
## Screenshots
[Desktop (Full-HD)](http://imgur.com/a/4fpBk)<br>
[Mobile](http://imgur.com/a/WPyG6)
## Dependencies
To run SickRage from source you will need Python 2.6+ and Cheetah 2.1.0+.

20
sickbeard/providers/ezrss.py
View File

@ -55,7 +55,10 @@ class EZRSSProvider(generic.TorrentProvider):
def getQuality(self, item, anime=False):
filename = item.fileName
if not 'filename' in item:
return Quality.UNKNOWN
filename = item.filename
quality = Quality.sceneQuality(filename, anime)
return quality
@ -137,7 +140,7 @@ class EZRSSProvider(generic.TorrentProvider):
results.append(curItem)
else:
logger.log(
u"The XML returned from the " + self.name + " RSS feed is incomplete, this result is unusable",
u"The XML returned from the " + self.name + " RSS feed is empty or incomplete, this result is unusable",
logger.ERROR)
return results
@ -145,12 +148,13 @@ class EZRSSProvider(generic.TorrentProvider):
def _get_title_and_url(self, item):
(title, url) = generic.TorrentProvider._get_title_and_url(self, item)
filename = item.fileName
if filename:
new_title = self._extract_name_from_filename(filename)
if new_title:
title = new_title
logger.log(u"Extracted the name " + title + " from the torrent link", logger.DEBUG)
if 'filename' in item:
filename = item.filename
if filename:
new_title = self._extract_name_from_filename(filename)
if new_title:
title = new_title
logger.log(u"Extracted the name " + title + " from the torrent link", logger.DEBUG)
return (title, url)

6
sickbeard/webapi.py
View File

@ -2827,7 +2827,7 @@ class CMD_Shows(ApiCall):
showDict['next_ep_airdate'] = ''
showDict["cache"] = \
CMD_ShowCache(self.handler, (), {"indexerid or tvdbid or tvrageid": curShow.indexerid}).run()["data"]
CMD_ShowCache(self.handler, (), {"indexerid": curShow.indexerid}).run()["data"]
if not showDict["network"]:
showDict["network"] = ""
if self.sort == "name":
@ -2861,6 +2861,10 @@ class CMD_ShowsStats(ApiCall):
[str(show) for show in
Quality.DOWNLOADED + [ARCHIVED]]) + ") AND season != 0 and episode != 0 AND airdate <= " + today + "")[0][
0]
stats["ep_snatched"] = myDB.select("SELECT COUNT(*) FROM tv_episodes WHERE status IN (" + ",".join(
[str(show) for show in
Quality.SNATCHED + Quality.SNATCHED_PROPER]) + ") AND season != 0 and episode != 0 AND airdate <= " + today + "")[0][
0]
stats["ep_total"] = myDB.select(
"SELECT COUNT(*) FROM tv_episodes WHERE season != 0 AND episode != 0 AND (airdate != 1 OR status IN (" + ",".join(
[str(show) for show in (Quality.DOWNLOADED + Quality.SNATCHED + Quality.SNATCHED_PROPER) + [