btmon speeded up, all ICapTorrent backends clarified and fillobj cleaned
This commit is contained in:
parent
f6e2f0a657
commit
b907c8b266
10 changed files with 101 additions and 39 deletions
|
|
@ -21,7 +21,7 @@
|
|||
import string
|
||||
|
||||
from weboob.capabilities.torrent import Torrent
|
||||
from weboob.capabilities.base import NotAvailable
|
||||
from weboob.capabilities.base import NotAvailable, NotLoaded
|
||||
from weboob.tools.browser import BasePage
|
||||
from weboob.tools.misc import get_bytes_size
|
||||
|
||||
|
|
@ -32,22 +32,50 @@ __all__ = ['TorrentsPage','TorrentPage']
|
|||
class TorrentsPage(BasePage):
|
||||
def iter_torrents(self):
|
||||
for div in self.parser.select(self.document.getroot(),'div.list_tor'):
|
||||
name = NotAvailable
|
||||
size = NotAvailable
|
||||
seeders = NotAvailable
|
||||
leechers = NotAvailable
|
||||
right_div = self.parser.select(div,'div.list_tor_right',1)
|
||||
try:
|
||||
seeders = int(self.parser.select(right_div,'b.green',1).text)
|
||||
except ValueError:
|
||||
seeders = 0
|
||||
try:
|
||||
leechers = int(self.parser.select(right_div,'b.red',1).text)
|
||||
except ValueError:
|
||||
leechers = 0
|
||||
sizep = self.parser.select(right_div,'p')[0]
|
||||
sizespan = self.parser.select(sizep,'span')[0]
|
||||
nsize = float(sizespan.text_content().split(':')[1].split()[0])
|
||||
usize = sizespan.text_content().split()[-1].upper()
|
||||
size = get_bytes_size(nsize,usize)
|
||||
a = self.parser.select(div,'a.list_tor_title',1)
|
||||
href = a.attrib.get('href','')
|
||||
self.browser.location('http://%s%s'%(self.browser.DOMAIN,href))
|
||||
assert self.browser.is_on_page(TorrentPage)
|
||||
yield self.browser.page.get_torrent()
|
||||
name = unicode(a.text_content())
|
||||
id = unicode(href.strip('/').split('.html')[0])
|
||||
torrent = Torrent(id,name)
|
||||
torrent.url = NotLoaded
|
||||
torrent.filename = id
|
||||
torrent.magnet = NotLoaded
|
||||
torrent.size = size
|
||||
torrent.seeders = seeders
|
||||
torrent.leechers = leechers
|
||||
torrent.description = NotLoaded
|
||||
torrent.files = NotLoaded
|
||||
yield torrent
|
||||
|
||||
|
||||
|
||||
class TorrentPage(BasePage):
|
||||
def get_torrent(self):
|
||||
seed = 0
|
||||
leech = 0
|
||||
description = NotAvailable.__unicode__()
|
||||
description = NotAvailable
|
||||
url = NotAvailable
|
||||
magnet = NotAvailable
|
||||
title = NotAvailable
|
||||
id = self.browser.geturl().split('.html')[0].split('/')[-1]
|
||||
id = unicode(self.browser.geturl().split('.html')[0].split('/')[-1])
|
||||
|
||||
div = self.parser.select(self.document.getroot(),'div#middle_content',1)
|
||||
title = u'%s'%self.parser.select(self.document.getroot(),'div#middle_content > h1',1).text
|
||||
|
|
@ -56,8 +84,8 @@ class TorrentPage(BasePage):
|
|||
seed = slblock_values[0].text
|
||||
leech = slblock_values[1].text
|
||||
href_t = self.parser.select(div,'a.down',1).attrib.get('href','')
|
||||
url = 'http://%s%s'%(self.browser.DOMAIN,href_t)
|
||||
magnet = self.parser.select(div,'a.magnet',1).attrib.get('href','')
|
||||
url = u'http://%s%s'%(self.browser.DOMAIN,href_t)
|
||||
magnet = unicode(self.parser.select(div,'a.magnet',1).attrib.get('href',''))
|
||||
|
||||
divtabs = self.parser.select(div,'div#tabs',1)
|
||||
files_div = self.parser.select(divtabs,'div.body > div.doubleblock > div.leftblock')
|
||||
|
|
@ -74,7 +102,7 @@ class TorrentPage(BasePage):
|
|||
u = size_text.split(',')[1].strip().translate(None,string.digits).strip('.').strip().upper()
|
||||
div_desc = self.parser.select(divtabs,'div#descriptionContent')
|
||||
if len(div_desc) > 0:
|
||||
description = div_desc[0].text_content()
|
||||
description = unicode(div_desc[0].text_content())
|
||||
|
||||
torrent = Torrent(id, title)
|
||||
torrent.url = url
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue