Save size in bytes and compute & save human_size.
This commit is contained in:
@@ -8,7 +8,6 @@ from xml.etree.ElementTree import fromstring
|
|||||||
|
|
||||||
from http_utils import build_url, fetch_url
|
from http_utils import build_url, fetch_url
|
||||||
from torrent import Torrent
|
from torrent import Torrent
|
||||||
from utils import humansize, representsInteger
|
|
||||||
|
|
||||||
logger = logging.getLogger('torrentSearch')
|
logger = logging.getLogger('torrentSearch')
|
||||||
|
|
||||||
@@ -105,9 +104,6 @@ class Jackett(object):
|
|||||||
if elm.get('name') == 'peers':
|
if elm.get('name') == 'peers':
|
||||||
peers = elm.get('value')
|
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: {}\
|
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))
|
\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)
|
torrent = Torrent(title, magnet=magnet, size=size, uploader=uploader, date=date, seed_count=seeders, leech_count=peers)
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#!/usr/bin/env python3.6
|
#!/usr/bin/env python3.6
|
||||||
|
|
||||||
from json import dumps
|
from json import dumps
|
||||||
|
from utils import humansize, representsInteger
|
||||||
|
|
||||||
RELEASE_TYPES = ('bdremux', 'brremux', 'remux',
|
RELEASE_TYPES = ('bdremux', 'brremux', 'remux',
|
||||||
'bdrip', 'brrip', 'blu-ray', 'bluray', 'bdmv', 'bdr', 'bd5',
|
'bdrip', 'brrip', 'blu-ray', 'bluray', 'bdmv', 'bdr', 'bd5',
|
||||||
@@ -24,6 +25,9 @@ class Torrent(object):
|
|||||||
self.leech_count = leech_count
|
self.leech_count = leech_count
|
||||||
self.url = url
|
self.url = url
|
||||||
|
|
||||||
|
if (size != '' and representsInteger(size)):
|
||||||
|
self.human_size = humansize(int(size))
|
||||||
|
|
||||||
def find_release_type(self):
|
def find_release_type(self):
|
||||||
name = self.name.casefold()
|
name = self.name.casefold()
|
||||||
return [r_type for r_type in RELEASE_TYPES if r_type in name]
|
return [r_type for r_type in RELEASE_TYPES if r_type in name]
|
||||||
|
|||||||
Reference in New Issue
Block a user