From 91e856dbadee38e58b7042df3006cf604fb9137a Mon Sep 17 00:00:00 2001
From: labrys <labrys@users.noreply.github.com>
Date: Thu, 7 Jan 2016 06:34:33 -0500
Subject: [PATCH] Fix file size conversion for pretome
---
sickbeard/providers/pretome.py | 22 +++-------------------
1 file changed, 3 insertions(+), 19 deletions(-)
diff --git a/sickbeard/providers/pretome.py b/sickbeard/providers/pretome.py
index 96fcf5ede..851a3def1 100644
--- a/sickbeard/providers/pretome.py
+++ b/sickbeard/providers/pretome.py
@@ -24,11 +24,11 @@ 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.providers.torrent.TorrentProvider import TorrentProvider
class PretomeProvider(TorrentProvider):
-
def __init__(self):
TorrentProvider.__init__(self, "Pretome")
@@ -134,10 +134,8 @@ class PretomeProvider(TorrentProvider):
# Need size for failed downloads handling
if size is None:
- if re.match(r'[0-9]+,?\.?[0-9]*[KkMmGg]+[Bb]+', cells[7].text):
- size = self._convertSize(cells[7].text)
- if not size:
- size = -1
+ torrent_size = cells[7].text
+ size = convert_size(torrent_size) or -1
except (AttributeError, TypeError):
continue
@@ -170,20 +168,6 @@ class PretomeProvider(TorrentProvider):
def seed_ratio(self):
return self.ratio
- def _convertSize(self, sizeString):
- size = sizeString[:-2]
- modifier = sizeString[-2:]
- 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
- return long(size)
-
class PretomeCache(tvcache.TVCache):
def __init__(self, provider_obj):
--
GitLab