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

Updated KAT urls.

Browse Source 
Fixed unicode issues with KAT, iptorrents, and TPB providers.

Fix for Newznab providers.

GIT Updates now perform auto-resets of branch on errors then attempt update again.
This commit is contained in:
echel0n 2014-12-11 16:09:02 -08:00
parent 0e34a41485
commit c678b96732
4 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sickbeard/providers/iptorrents.py
View File

@ -162,9 +162,11 @@ class IPTorrentsProvider(generic.TorrentProvider):
for mode in search_params.keys(): for mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
if isinstance(search_string, unicode):
search_string = unidecode(search_string)
# URL with 50 tv-show results, or max 150 if adjusted in IPTorrents profile # URL with 50 tv-show results, or max 150 if adjusted in IPTorrents profile
searchURL = self.urls['search'] % (self.categorie, freeleech, unidecode(search_string)) searchURL = self.urls['search'] % (self.categorie, freeleech, search_string)
searchURL += ';o=seeders' if mode != 'RSS' else '' searchURL += ';o=seeders' if mode != 'RSS' else ''
logger.log(u"" + self.name + " search page URL: " + searchURL, logger.DEBUG) logger.log(u"" + self.name + " search page URL: " + searchURL, logger.DEBUG)

4
sickbeard/providers/kat.py
View File

@ -225,10 +225,12 @@ class KATProvider(generic.TorrentProvider):
for mode in search_params.keys(): for mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
if isinstance(search_string, unicode):
search_string = unidecode(search_string)
entries = [] entries = []
for url in self.urls: for url in self.urls:
searchURL = url + 'usearch/%s/?field=seeders&sorder=desc&rss=1' % urllib.urlencode(search_string.encode('utf-8')) searchURL = url + 'usearch/%s/?field=seeders&sorder=desc&rss=1' % urllib.quote(search_string)
logger.log(u"Search string: " + searchURL, logger.DEBUG) logger.log(u"Search string: " + searchURL, logger.DEBUG)
entries = self.cache.getRSSFeed(url, items=['entries', 'feed'])['entries'] entries = self.cache.getRSSFeed(url, items=['entries', 'feed'])['entries']

4
sickbeard/providers/thepiratebay.py
View File

@ -230,9 +230,11 @@ class ThePirateBayProvider(generic.TorrentProvider):
for mode in search_params.keys(): for mode in search_params.keys():
for search_string in search_params[mode]: for search_string in search_params[mode]:
if isinstance(search_string, unicode):
search_string = unidecode(search_string)
if mode != 'RSS': if mode != 'RSS':
searchURL = self.proxy._buildURL(self.searchurl % (urllib.quote(unidecode(search_string)))) searchURL = self.proxy._buildURL(self.searchurl % (urllib.quote(search_string)))
else: else:
searchURL = self.proxy._buildURL(self.url + 'tv/latest/') searchURL = self.proxy._buildURL(self.url + 'tv/latest/')

17
sickbeard/versionChecker.py
View File

@ -557,6 +557,23 @@ class GitUpdateManager(UpdateManager):
if sickbeard.NOTIFY_ON_UPDATE: if sickbeard.NOTIFY_ON_UPDATE:
notifiers.notify_git_update(sickbeard.CUR_COMMIT_HASH if sickbeard.CUR_COMMIT_HASH else "") notifiers.notify_git_update(sickbeard.CUR_COMMIT_HASH if sickbeard.CUR_COMMIT_HASH else "")
return True return True
else:
# perform a hard reset to try and resolve the issue
if self.reset() and self.update():
return True
return False
def reset(self):
"""
Calls git reset --hard to perform a hard reset. Returns a bool depending
on the call's success.
"""
output, err, exit_status = self._run_git(self._git_path, 'reset --hard') # @UnusedVariable
if exit_status == 0:
return True
return False return False