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

move id2url to Video class

Browse source
This commit is contained in:
Christophe Benz 2010-04-28 14:49:50 +02:00
commit 7bd936c11b
14 changed files with 69 additions and 76 deletions
Download patch file Download diff file Expand all files Collapse all files

19
weboob/backends/youporn/pages/index.py
View file

@ -18,10 +18,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
"""
from weboob.capabilities.video import Video
from .. import tools
from .base import PornPage
from ..video import YoupornVideo
__all__ = ['IndexPage']
@ -66,11 +64,10 @@ class IndexPage(PornPage):
rating = float(p.text.strip())
rating_max = float(p.find('span').text.strip()[2:])
yield Video(int(_id),
title=title,
rating=rating,
rating_max=rating_max,
duration=duration,
thumbnail_url=thumbnail_url,
nsfw=True,
id2url=tools.id2url)
yield YoupornVideo(int(_id),
title=title,
rating=rating,
rating_max=rating_max,
duration=duration,
thumbnail_url=thumbnail_url,
nsfw=True)

10
weboob/backends/youporn/pages/video.py
View file

@ -23,7 +23,7 @@ import datetime
from logging import warning
from .base import PornPage
from weboob.capabilities.video import Video
from ..video import YoupornVideo
class VideoPage(PornPage):
URL_REGEXP = re.compile("https?://[w\.]*youporn.com/watch/(\d+)/?.*")
@ -32,10 +32,10 @@ class VideoPage(PornPage):
if not PornPage.on_loaded(self):
return
self.video = Video(self.get_id(),
self.get_title(),
self.get_url(),
nsfw=True)
self.video = YoupornVideo(self.get_id(),
self.get_title(),
self.get_url(),
nsfw=True)
self.set_details(self.video)