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

Put Thumbnail in a tools.capabilities

Browse source
This commit is contained in:
Noe Rubinstein 2011-05-02 00:51:09 +02:00
commit afe5db74b4
6 changed files with 44 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

17
weboob/capabilities/gallery.py
View file

@ -19,27 +19,12 @@
from datetime import datetime
from weboob.tools.capabilities.thumbnail import Thumbnail
from .base import IBaseCap, CapBaseObject, NotLoaded
__all__ = ['Thumbnail', 'ICapGallery', 'BaseGallery', 'BaseImage']
class Thumbnail(CapBaseObject):
def __init__(self, url):
CapBaseObject.__init__(self, url)
self.add_field('url', basestring, url.replace(' ', '%20'))
self.add_field('data', str)
def __str__(self):
return self.url
def __repr__(self):
return '<Thumbnail url="%s">' % self.url
def __iscomplete__(self):
return self.data is not NotLoaded
class BaseGallery(CapBaseObject):
"""
Represents a gallery.

22
weboob/capabilities/video.py
View file

@ -21,27 +21,11 @@
from datetime import datetime, timedelta
from .base import IBaseCap, CapBaseObject, NotLoaded
from weboob.tools.capabilities.thumbnail import Thumbnail
__all__ = ['BaseVideo', 'ICapVideo']
class VideoThumbnail(CapBaseObject):
def __init__(self, url):
CapBaseObject.__init__(self, url)
self.add_field('url', basestring, url.replace(' ', '%20'))
self.add_field('data', str)
def __str__(self):
return self.url
def __repr__(self):
return '<Thumbnail url="%s">' % self.url
def __iscomplete__(self):
return self.data is not NotLoaded
class BaseVideo(CapBaseObject):
"""
Represents a video.
@ -60,12 +44,12 @@ class BaseVideo(CapBaseObject):
self.add_field('date', datetime, date)
self.add_field('rating', (int,long,float), rating)
self.add_field('rating_max', (int,long,float), rating_max)
self.add_field('thumbnail', VideoThumbnail, thumbnail)
self.add_field('thumbnail', Thumbnail, thumbnail)
self.add_field('nsfw', bool, nsfw)
# XXX remove this and fix all backends
if thumbnail_url is not None and self.thumbnail is NotLoaded:
self.thumbnail = VideoThumbnail(thumbnail_url)
self.thumbnail = Thumbnail(thumbnail_url)
@classmethod
def id2url(cls, _id):