From b584592916eeab04e1133b4c1e5bcec567c32743 Mon Sep 17 00:00:00 2001 From: labrys <labrys@users.noreply.github.com> Date: Thu, 7 Jan 2016 06:34:58 -0500 Subject: [PATCH] Fix file size conversion for scc --- sickbeard/providers/scc.py | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/sickbeard/providers/scc.py b/sickbeard/providers/scc.py index 0aac6ce59..9d57d04ae 100644 --- a/sickbeard/providers/scc.py +++ b/sickbeard/providers/scc.py @@ -26,6 +26,7 @@ import sickbeard from sickbeard.common import cpu_presets from sickbeard import logger from sickbeard import tvcache +from sickrage.helper.common import convert_size from sickbeard.bs4_parser import BS4Parser from sickrage.providers.torrent.TorrentProvider import TorrentProvider @@ -136,7 +137,9 @@ class SCCProvider(TorrentProvider): # pylint: disable=too-many-instance-attribu download_url = self.urls['download'] % url['href'] seeders = int(result.find('td', attrs={'class': 'ttr_seeders'}).string) leechers = int(result.find('td', attrs={'class': 'ttr_leechers'}).string) - size = self._convertSize(result.find('td', attrs={'class': 'ttr_size'}).contents[0]) + torrent_size = result.find('td', attrs={'class': 'ttr_size'}).contents[0] + + size = convert_size(torrent_size) or -1 except (AttributeError, TypeError): continue @@ -165,20 +168,6 @@ class SCCProvider(TorrentProvider): # pylint: disable=too-many-instance-attribu def seed_ratio(self): return self.ratio - @staticmethod - def _convertSize(size): - size, base = size.split() - size = float(size) - if base in 'KB': - size *= 1024 ** 1 - elif base in 'MB': - size *= 1024 ** 2 - elif base in 'GB': - size *= 1024 ** 3 - elif base in 'TB': - size *= 1024 ** 4 - return long(size) - class SCCCache(tvcache.TVCache): def __init__(self, provider_obj): -- GitLab