Private GIT

Skip to content
Snippets Groups Projects
Commit d3f8db7d authored by labrys's avatar labrys
Browse files

Fix file size conversion for morethantv

parent c148dc6c
No related branches found
No related tags found
No related merge requests found
...@@ -28,6 +28,7 @@ import traceback ...@@ -28,6 +28,7 @@ import traceback
from sickbeard import logger from sickbeard import logger
from sickbeard import tvcache from sickbeard import tvcache
from sickbeard.bs4_parser import BS4Parser from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size
from sickrage.helper.exceptions import AuthException from sickrage.helper.exceptions import AuthException
from sickrage.providers.torrent.TorrentProvider import TorrentProvider from sickrage.providers.torrent.TorrentProvider import TorrentProvider
...@@ -145,12 +146,10 @@ class MoreThanTVProvider(TorrentProvider): ...@@ -145,12 +146,10 @@ class MoreThanTVProvider(TorrentProvider):
download_url = self.urls['download'] % torrent_id_long download_url = self.urls['download'] % torrent_id_long
seeders = cells[6].contents[0] seeders = cells[6].contents[0]
leechers = cells[7].contents[0] leechers = cells[7].contents[0]
torrent_size = cells[4].text.strip()
size = -1 size = convert_size(torrent_size) or -1
if re.match(r'\d+([,\.]\d+)?\s*[KkMmGgTt]?[Bb]', cells[4].contents[0]):
size = self._convertSize(cells[4].text.strip())
except (AttributeError, TypeError): except (AttributeError, TypeError):
continue continue
...@@ -183,23 +182,6 @@ class MoreThanTVProvider(TorrentProvider): ...@@ -183,23 +182,6 @@ class MoreThanTVProvider(TorrentProvider):
def seed_ratio(self): def seed_ratio(self):
return self.ratio 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): class MoreThanTVCache(tvcache.TVCache):
def __init__(self, provider_obj): def __init__(self, provider_obj):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment