Private GIT

Skip to content
Snippets Groups Projects
Commit aa7c1333 authored by supergonkas's avatar supergonkas
Browse files

Merge branch 'develop' into Change-dognzb-url-to-https

parents b0ccf296 fe01de39
No related branches found
No related tags found
No related merge requests found
...@@ -20,7 +20,6 @@ ...@@ -20,7 +20,6 @@
import re import re
import traceback import traceback
from six.moves import urllib from six.moves import urllib
from sickbeard import logger from sickbeard import logger
from sickbeard import tvcache from sickbeard import tvcache
from sickbeard.common import USER_AGENT from sickbeard.common import USER_AGENT
...@@ -63,14 +62,13 @@ class TORRENTZProvider(TorrentProvider): ...@@ -63,14 +62,13 @@ class TORRENTZProvider(TorrentProvider):
if mode != 'RSS': if mode != 'RSS':
search_url += '?q=' + urllib.parse.quote_plus(search_string) search_url += '?q=' + urllib.parse.quote_plus(search_string)
logger.log(search_url)
data = self.get_url(search_url) data = self.get_url(search_url)
if not data: if not data:
logger.log(u'Seems to be down right now!') logger.log(u"No data returned from provider", logger.DEBUG)
continue continue
if not data.startswith("<?xml"): if not data.startswith("<?xml"):
logger.log(u'Wrong data returned from: ' + search_url, logger.DEBUG) logger.log(u"Expected xml but got something else, is your mirror failing?", logger.INFO)
continue continue
try: try:
...@@ -98,7 +96,7 @@ class TORRENTZProvider(TorrentProvider): ...@@ -98,7 +96,7 @@ class TORRENTZProvider(TorrentProvider):
items[mode].append((title, download_url, size, seeders, leechers)) items[mode].append((title, download_url, size, seeders, leechers))
except (AttributeError, TypeError, KeyError, ValueError): except (AttributeError, TypeError, KeyError, ValueError):
logger.log(u"Failed parsing provider. Traceback: %r" % traceback.format_exc(), logger.WARNING) logger.log(u"Failed parsing provider. Traceback: %r" % traceback.format_exc(), logger.ERROR)
# For each search mode sort all the items by seeders if available # For each search mode sort all the items by seeders if available
items[mode].sort(key=lambda tup: tup[3], reverse=True) items[mode].sort(key=lambda tup: tup[3], reverse=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment