KevinMidboe/torrent_search
1
0
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases 1 Wiki Activity

Save size in bytes and compute & save human_size.

Browse Source
This commit is contained in:
Kevin
2021-07-03 18:40:13 +02:00
parent 2112147e3c
commit bd91939121
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
torrentSearch/jackett.py
View File

@@ -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')
@@ -89,7 +88,7 @@ class Jackett(object):
title = self.find_xml_attribute(child, 'title') title = self.find_xml_attribute(child, 'title')
date = self.find_xml_attribute(child, 'pubDate') date = self.find_xml_attribute(child, 'pubDate')
magnet = self.find_xml_attribute(child, 'link') 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') files = self.find_xml_attribute(child, 'files')
foundUploader = re.findall('-1? *\w*', title) foundUploader = re.findall('-1? *\w*', title)
if len(foundUploader) > 0: if len(foundUploader) > 0:
@@ -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)

6
torrentSearch/torrent.py
View File

@@ -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',
@@ -15,7 +16,7 @@ RELEASE_TYPES = ('bdremux', 'brremux', 'remux',
class Torrent(object): class Torrent(object):
def __init__(self, name, magnet=None, size=None, uploader=None, date=None, def __init__(self, name, magnet=None, size=None, uploader=None, date=None,
seed_count=None, leech_count=None, url=None): seed_count=None, leech_count=None, url=None):
self.name = name self.name = name
self.magnet = magnet self.magnet = magnet
self.size = size self.size = size
self.uploader = uploader self.uploader = uploader
@@ -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]