Private GIT

Skip to content
Snippets Groups Projects
Commit 57c6da6d authored by medariox's avatar medariox
Browse files

Fixed TPB RSS search, added logging to some providers

parent 3abc4278
Branches
No related tags found
No related merge requests found
...@@ -62,8 +62,11 @@ class BitSnoopProvider(TorrentProvider): # pylint: disable=too-many-instance-at ...@@ -62,8 +62,11 @@ class BitSnoopProvider(TorrentProvider): # pylint: disable=too-many-instance-at
logger.log(u"Search string: %s " % search_string, logger.DEBUG) logger.log(u"Search string: %s " % search_string, logger.DEBUG)
try: try:
url = (self.urls['rss'], self.urls['search'] + search_string + '/s/d/1/?fmt=rss')[mode != 'RSS'] search_url = (self.urls['rss'], self.urls['search'] + search_string + '/s/d/1/?fmt=rss')[mode != 'RSS']
data = self.get_url(url)
logger.log(u"Search URL: %s" % search_url, logger.DEBUG)
data = self.get_url(search_url)
if not data: if not data:
logger.log(u"No data returned from provider", logger.DEBUG) logger.log(u"No data returned from provider", logger.DEBUG)
continue continue
......
...@@ -63,8 +63,11 @@ class ExtraTorrentProvider(TorrentProvider): # pylint: disable=too-many-instanc ...@@ -63,8 +63,11 @@ class ExtraTorrentProvider(TorrentProvider): # pylint: disable=too-many-instanc
logger.log(u"Search string: %s " % search_string, logger.DEBUG) logger.log(u"Search string: %s " % search_string, logger.DEBUG)
self.search_params.update({'type': ('search', 'rss')[mode == 'RSS'], 'search': search_string}) self.search_params.update({'type': ('search', 'rss')[mode == 'RSS'], 'search': search_string})
url = self.urls['rss'] if not self.custom_url else self.urls['rss'].replace(self.urls['index'], self.custom_url) search_url = self.urls['rss'] if not self.custom_url else self.urls['rss'].replace(self.urls['index'], self.custom_url)
data = self.get_url(url, params=self.search_params)
logger.log(u"Search URL: %s" % search_url, logger.DEBUG)
data = self.get_url(search_url, params=self.search_params)
if not data: if not data:
logger.log(u"No data returned from provider", logger.DEBUG) logger.log(u"No data returned from provider", logger.DEBUG)
continue continue
......
...@@ -64,9 +64,11 @@ class LimeTorrentsProvider(TorrentProvider): # pylint: disable=too-many-instanc ...@@ -64,9 +64,11 @@ class LimeTorrentsProvider(TorrentProvider): # pylint: disable=too-many-instanc
logger.log(u"Search string: %s " % search_string, logger.DEBUG) logger.log(u"Search string: %s " % search_string, logger.DEBUG)
try: try:
url = (self.urls['rss'], self.urls['search'] + search_string)[mode != 'RSS'] search_url = (self.urls['rss'], self.urls['search'] + search_string)[mode != 'RSS']
logger.log(u"URL: %r " % url, logger.DEBUG)
data = self.get_url(url) logger.log(u"Search URL: %s" % search_url, logger.DEBUG)
data = self.get_url(search_url)
if not data: if not data:
logger.log(u"No data returned from provider", logger.DEBUG) logger.log(u"No data returned from provider", logger.DEBUG)
continue continue
......
...@@ -42,12 +42,12 @@ class ThePirateBayProvider(TorrentProvider): # pylint: disable=too-many-instanc ...@@ -42,12 +42,12 @@ class ThePirateBayProvider(TorrentProvider): # pylint: disable=too-many-instanc
self.minseed = None self.minseed = None
self.minleech = None self.minleech = None
self.cache = tvcache.TVCache(self, min_time=30) # only poll ThePirateBay every 30 minutes max self.cache = tvcache.TVCache(self, min_time=1) # only poll ThePirateBay every 30 minutes max
self.url = 'https://thepiratebay.se/' self.url = 'https://thepiratebay.se/'
self.urls = { self.urls = {
'search': self.url + 's/', 'search': self.url + 's/',
'rss': self.url + 'tv/latest' 'rss': self.url + 'browse/205'
} }
self.custom_url = None self.custom_url = None
...@@ -75,7 +75,7 @@ class ThePirateBayProvider(TorrentProvider): # pylint: disable=too-many-instanc ...@@ -75,7 +75,7 @@ class ThePirateBayProvider(TorrentProvider): # pylint: disable=too-many-instanc
search_params['q'] = search_string.strip() search_params['q'] = search_string.strip()
search_url = self.urls[('search', 'rss')[mode == 'RSS']] + '?' + urlencode(search_params) search_url = self.urls['search'] + '?' + urlencode(search_params) if mode != 'RSS' else self.urls['rss']
if self.custom_url: if self.custom_url:
search_url = posixpath.join(self.custom_url, search_url.split(self.url)[1].lstrip('/')) # Must use posixpath search_url = posixpath.join(self.custom_url, search_url.split(self.url)[1].lstrip('/')) # Must use posixpath
......
...@@ -61,11 +61,16 @@ class TorrentzProvider(TorrentProvider): # pylint: disable=too-many-instance-at ...@@ -61,11 +61,16 @@ class TorrentzProvider(TorrentProvider): # pylint: disable=too-many-instance-at
for mode in search_strings: for mode in search_strings:
items = [] items = []
logger.log(u"Search Mode: %s" % mode, logger.DEBUG)
for search_string in search_strings[mode]: for search_string in search_strings[mode]:
search_url = self.urls['verified'] if self.confirmed else self.urls['feed'] search_url = self.urls['verified'] if self.confirmed else self.urls['feed']
if mode != 'RSS': if mode != 'RSS':
logger.log(u"Search string: %s " % search_string, logger.DEBUG)
search_url += '?q=' + urllib.parse.quote_plus(search_string) search_url += '?q=' + urllib.parse.quote_plus(search_string)
logger.log(u"Search URL: %s" % search_url, logger.DEBUG)
data = self.get_url(search_url) data = self.get_url(search_url)
if not data: if not data:
logger.log(u"No data returned from provider", logger.DEBUG) logger.log(u"No data returned from provider", logger.DEBUG)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment