From 2c89cc582dda07dfaf5eb53076966e7b84ce00f5 Mon Sep 17 00:00:00 2001 From: labrys <labrys@users.noreply.github.com> Date: Thu, 7 Jan 2016 06:30:29 -0500 Subject: [PATCH] Fix file size conversion for gftracker --- sickbeard/providers/gftracker.py | 23 ++--------------------- 1 file changed, 2 insertions(+), 21 deletions(-) diff --git a/sickbeard/providers/gftracker.py b/sickbeard/providers/gftracker.py index 79da127b9..888426c31 100644 --- a/sickbeard/providers/gftracker.py +++ b/sickbeard/providers/gftracker.py @@ -24,6 +24,7 @@ import traceback from sickbeard import logger from sickbeard import tvcache from sickbeard.bs4_parser import BS4Parser +from sickrage.helper.common import convert_size from sickrage.helper.exceptions import AuthException from sickrage.providers.torrent.TorrentProvider import TorrentProvider @@ -126,10 +127,7 @@ class GFTrackerProvider(TorrentProvider): leechers = int(shares[1]) torrent_size = cells[7].get_text().split("/", 1)[0] - if re.match(r"\d+([,\.]\d+)?\s*[KkMmGgTt]?[Bb]", torrent_size): - size = self._convertSize(torrent_size.strip()) - else: - size = -1 + size = convert_size(torrent_size) or -1 except (AttributeError, TypeError): continue @@ -162,23 +160,6 @@ class GFTrackerProvider(TorrentProvider): def seed_ratio(self): return self.ratio - def _convertSize(self, sizeString): - size = sizeString[:-2].strip() - modifier = sizeString[-2:].upper() - try: - size = float(size) - if modifier in 'KB': - size *= 1024 ** 1 - elif modifier in 'MB': - size *= 1024 ** 2 - elif modifier in 'GB': - size *= 1024 ** 3 - elif modifier in 'TB': - size *= 1024 ** 4 - except Exception: - size = -1 - return long(size) - class GFTrackerCache(tvcache.TVCache): def __init__(self, provider_obj): -- GitLab