From d3f8db7d6c719b00e832fa6dbcaefcbca765ef7f Mon Sep 17 00:00:00 2001
From: labrys <labrys@users.noreply.github.com>
Date: Thu, 7 Jan 2016 06:32:55 -0500
Subject: [PATCH] Fix file size conversion for morethantv
---
sickbeard/providers/morethantv.py | 24 +++---------------------
1 file changed, 3 insertions(+), 21 deletions(-)
diff --git a/sickbeard/providers/morethantv.py b/sickbeard/providers/morethantv.py
index 71892f1e7..d1b847603 100644
--- a/sickbeard/providers/morethantv.py
+++ b/sickbeard/providers/morethantv.py
@@ -28,6 +28,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
@@ -145,12 +146,10 @@ class MoreThanTVProvider(TorrentProvider):
download_url = self.urls['download'] % torrent_id_long
seeders = cells[6].contents[0]
-
leechers = cells[7].contents[0]
+ torrent_size = cells[4].text.strip()
- size = -1
- if re.match(r'\d+([,\.]\d+)?\s*[KkMmGgTt]?[Bb]', cells[4].contents[0]):
- size = self._convertSize(cells[4].text.strip())
+ size = convert_size(torrent_size) or -1
except (AttributeError, TypeError):
continue
@@ -183,23 +182,6 @@ class MoreThanTVProvider(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 MoreThanTVCache(tvcache.TVCache):
def __init__(self, provider_obj):
--
GitLab