nojhan/weboob-devel
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

do not use thumbnail_url anymore (closes #810), use set_empty_fields() method, do not give fields in constructor of BaseVideo anymore

Browse source
This commit is contained in:
Romain Bignon 2012-03-12 17:05:55 +01:00
commit ef07a9e795
11 changed files with 79 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

28
modules/youporn/pages/index.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright(C) 2010-2011 Romain Bignon
# Copyright(C) 2010-2012 Romain Bignon
#
# This file is part of weboob.
#
@ -21,6 +21,9 @@
import re
import datetime
from weboob.capabilities.base import NotAvailable
from weboob.tools.capabilities.thumbnail import Thumbnail
from .base import PornPage
from ..video import YoupornVideo
@ -45,7 +48,10 @@ class IndexPage(PornPage):
url = a.attrib['href']
_id = url[len('/watch/'):]
_id = _id[:_id.find('/')]
title = a.text.strip()
video = YoupornVideo(int(_id))
video.title = a.text.strip()
video.thumbnail = Thumbnail(thumbnail_url)
hours = minutes = seconds = 0
div = li.cssselect('h2[class=duration]')
@ -56,19 +62,15 @@ class IndexPage(PornPage):
elif len(pack) == 2:
minutes, seconds = pack
rating = 0
rating_max = 0
video.duration = datetime.timedelta(hours=hours, minutes=minutes, seconds=seconds)
div = li.cssselect('div.stars')
if div:
m = re.match('.*star-(\d).*', div[0].attrib.get('class', ''))
if m:
rating = int(m.group(1))
rating_max = 5
video.rating = int(m.group(1))
video.rating_max = 5
yield YoupornVideo(int(_id),
title=title,
rating=rating,
rating_max=rating_max,
duration=datetime.timedelta(hours=hours, minutes=minutes, seconds=seconds),
thumbnail_url=thumbnail_url,
)
video.set_empty_fields(NotAvailable, ('url', 'author'))
yield video

5
modules/youporn/pages/video.py
View file

@ -1,6 +1,6 @@
# -*- coding: utf-8 -*-
# Copyright(C) 2010-2011 Romain Bignon
# Copyright(C) 2010-2012 Romain Bignon
#
# This file is part of weboob.
#
@ -22,6 +22,7 @@ import re
import datetime
from dateutil.parser import parse as parse_dt
from weboob.capabilities.base import NotAvailable
from weboob.tools.browser import BrokenPageError
from .base import PornPage
@ -37,6 +38,8 @@ class VideoPage(PornPage):
video.title = self.get_title()
video.url, video.ext = self.get_url()
self.set_details(video)
video.set_empty_fields(NotAvailable)
return video
def get_url(self):