Private GIT

Skip to content
Snippets Groups Projects
Commit f75105bd authored by labrys's avatar labrys
Browse files

Fix file size conversion for btdigg

parent 238fc144
Branches
Tags
No related merge requests found
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
from urllib import urlencode from urllib import urlencode
from sickbeard import logger from sickbeard import logger
from sickbeard import tvcache from sickbeard import tvcache
from sickrage.helper.common import convert_size
from sickrage.providers.torrent.TorrentProvider import TorrentProvider from sickrage.providers.torrent.TorrentProvider import TorrentProvider
...@@ -70,6 +71,8 @@ class BTDIGGProvider(TorrentProvider): ...@@ -70,6 +71,8 @@ class BTDIGGProvider(TorrentProvider):
logger.log(u"No data returned to be parsed!!!", logger.DEBUG) logger.log(u"No data returned to be parsed!!!", logger.DEBUG)
continue continue
try:
for torrent in jdata: for torrent in jdata:
if not torrent['name']: if not torrent['name']:
logger.log(u"Ignoring result since it has no name", logger.DEBUG) logger.log(u"Ignoring result since it has no name", logger.DEBUG)
...@@ -83,29 +86,33 @@ class BTDIGGProvider(TorrentProvider): ...@@ -83,29 +86,33 @@ class BTDIGGProvider(TorrentProvider):
logger.log(u"Ignoring result for %s without files" % torrent['name'], logger.DEBUG) logger.log(u"Ignoring result for %s without files" % torrent['name'], logger.DEBUG)
continue continue
download_url = torrent['magnet'] + self._custom_trackers download_url = torrent['magnet'] + self._custom_trackers if torrent['magnet'] else None
if not download_url:
logger.log(u"Ignoring result for %s without a url" % torrent['name'], logger.DEBUG)
continue
# FIXME # Provider doesn't provide seeders/leechers
seeders = 1 seeders = 1
leechers = 0 leechers = 0
torrent_size = torrent['size']
size = convert_size(torrent_size) or -1
# # Filter unseeded torrent (Unsupported) if not all([title, download_url]):
continue
# Filter unseeded torrent (Unsupported)
#if seeders < self.minseed or leechers < self.minleech: #if seeders < self.minseed or leechers < self.minleech:
# if mode != 'RSS': # if mode != 'RSS':
# logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG) # logger.log(u"Discarding torrent because it doesn't meet the minimum seeders or leechers: {0} (S:{1} L:{2})".format(title, seeders, leechers), logger.DEBUG)
# continue # continue
item = title, download_url, size, seeders, leechers
if mode != 'RSS': if mode != 'RSS':
logger.log(u"Found result: %s" % torrent['name'], logger.DEBUG) logger.log(u"Found result: %s " % title, logger.DEBUG)
item = torrent['name'], download_url, torrent['size'], seeders, leechers
items[mode].append(item) items[mode].append(item)
# # For each search mode sort all the items by seeders if available (Unsupported) except Exception:
logger.log(u"Failed parsing provider. Traceback: %s" % traceback.format_exc(), logger.WARNING)
# 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)
results += items[mode] results += items[mode]
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment