From 3e039cffa0265e96b7d3cd22c834e3b456df2678 Mon Sep 17 00:00:00 2001 From: miigotu <miigotu@gmail.com> Date: Mon, 11 Jan 2016 12:01:18 -0800 Subject: [PATCH] Small performance tweak --- sickbeard/providers/alpharatio.py | 28 ++++++++++++++-------------- sickbeard/providers/morethantv.py | 23 +++++++++++------------ sickbeard/providers/speedcd.py | 1 + 3 files changed, 26 insertions(+), 26 deletions(-) diff --git a/sickbeard/providers/alpharatio.py b/sickbeard/providers/alpharatio.py index 4375ca8a4..b080b4e20 100644 --- a/sickbeard/providers/alpharatio.py +++ b/sickbeard/providers/alpharatio.py @@ -132,26 +132,26 @@ class AlphaRatioProvider(TorrentProvider): # pylint: disable=too-many-instance- try: title = cells[labels.index('Name /Year')].find('a', dir='ltr').get_text(strip=True) download_url = self.url + cells[labels.index('Name /Year')].find('a', title='Download')['href'] + if not all([title, download_url]): + continue + seeders = try_int(cells[labels.index('Seeders')].get_text(strip=True)) leechers = try_int(cells[labels.index('Leechers')].get_text(strip=True)) - size = convert_size(cells[labels.index('Size')].get_text(strip=True)) or -1 - except StandardError: - continue + if seeders < self.minseed or leechers < self.minleech: + 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) + continue - if not all([title, download_url]): - continue + torrent_size = cells[labels.index('Size')].get_text(strip=True) + size = convert_size(torrent_size) or -1 - # Filter unseeded torrent - if seeders < self.minseed or leechers < self.minleech: + item = title, download_url, size, seeders, leechers 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) - continue - - item = title, download_url, size, seeders, leechers - if mode != 'RSS': - logger.log(u"Found result: %s " % title, logger.DEBUG) + logger.log(u"Found result: %s " % title, logger.DEBUG) - items.append(item) + items.append(item) + except StandardError: + continue # For each search mode sort all the items by seeders if available items.sort(key=lambda tup: tup[3], reverse=True) diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py index 9d1f8840d..e5dfac46d 100644 --- a/sickbeard/providers/morethantv.py +++ b/sickbeard/providers/morethantv.py @@ -147,22 +147,21 @@ class MoreThanTVProvider(TorrentProvider): # pylint: disable=too-many-instance- cells = result.find_all('td') seeders = try_int(cells[labels.index('Seeders')].get_text(strip=True)) leechers = try_int(cells[labels.index('Leechers')].get_text(strip=True)) + if seeders < self.minseed or leechers < self.minleech: + 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) + continue + torrent_size = cells[labels.index('Size')].get_text(strip=True) - except StandardError: - continue + size = convert_size(torrent_size) or -1 - # Filter unseeded torrent - if seeders < self.minseed or leechers < self.minleech: + item = title, download_url, size, seeders, leechers 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) - continue - - size = convert_size(torrent_size) or -1 - item = title, download_url, size, seeders, leechers - if mode != 'RSS': - logger.log(u"Found result: %s " % title, logger.DEBUG) + logger.log(u"Found result: %s " % title, logger.DEBUG) - items.append(item) + items.append(item) + except StandardError: + continue # For each search mode sort all the items by seeders if available items.sort(key=lambda tup: tup[3], reverse=True) diff --git a/sickbeard/providers/speedcd.py b/sickbeard/providers/speedcd.py index 286ec8bed..924dbcc0d 100644 --- a/sickbeard/providers/speedcd.py +++ b/sickbeard/providers/speedcd.py @@ -149,6 +149,7 @@ class SpeedCDProvider(TorrentProvider): # pylint: disable=too-many-instance-att # TODO: Make convert_size work with 123.12GB torrent_size = torrent_size[:-2] + ' ' + torrent_size[-2:] size = convert_size(torrent_size) or -1 + item = title, download_url, size, seeders, leechers if mode != 'RSS': logger.log(u"Found result: %s " % title, logger.DEBUG) -- GitLab