diff --git a/torrentSearch/jackett.py b/torrentSearch/jackett.py index ec8aa09..9738693 100644 --- a/torrentSearch/jackett.py +++ b/torrentSearch/jackett.py @@ -8,7 +8,6 @@ from xml.etree.ElementTree import fromstring from http_utils import build_url, fetch_url from torrent import Torrent -from utils import humansize, representsInteger logger = logging.getLogger('torrentSearch') @@ -89,7 +88,7 @@ class Jackett(object): title = self.find_xml_attribute(child, 'title') date = self.find_xml_attribute(child, 'pubDate') magnet = self.find_xml_attribute(child, 'link') - size = self.find_xml_attribute(child, 'size') + size = self.find_xml_attribute(child, 'size') files = self.find_xml_attribute(child, 'files') foundUploader = re.findall('-1? *\w*', title) if len(foundUploader) > 0: @@ -105,9 +104,6 @@ class Jackett(object): if elm.get('name') == 'peers': peers = elm.get('value') - if (size != '' and representsInteger(size)): - size = humansize(int(size)) - logger.debug('Found torrent with info: \n\ttitle: {}\n\tmagnet: {}\n\tsize: {}\n\tdate: {}\ \n\tseeders: {}\n\tpeers: {}'.format(title, magnet, size, date, seeders, peers)) torrent = Torrent(title, magnet=magnet, size=size, uploader=uploader, date=date, seed_count=seeders, leech_count=peers) diff --git a/torrentSearch/torrent.py b/torrentSearch/torrent.py index 72c5535..870272b 100644 --- a/torrentSearch/torrent.py +++ b/torrentSearch/torrent.py @@ -1,6 +1,7 @@ #!/usr/bin/env python3.6 from json import dumps +from utils import humansize, representsInteger RELEASE_TYPES = ('bdremux', 'brremux', 'remux', 'bdrip', 'brrip', 'blu-ray', 'bluray', 'bdmv', 'bdr', 'bd5', @@ -15,7 +16,7 @@ RELEASE_TYPES = ('bdremux', 'brremux', 'remux', class Torrent(object): def __init__(self, name, magnet=None, size=None, uploader=None, date=None, seed_count=None, leech_count=None, url=None): - self.name = name + self.name = name self.magnet = magnet self.size = size self.uploader = uploader @@ -24,6 +25,9 @@ class Torrent(object): self.leech_count = leech_count self.url = url + if (size != '' and representsInteger(size)): + self.human_size = humansize(int(size)) + def find_release_type(self): name = self.name.casefold() return [r_type for r_type in RELEASE_TYPES if r_type in name]