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

4
weboob/capabilities/__init__.py
View file

@ -1 +1,5 @@
# -*- coding: utf-8 -*-
from .base import NotLoaded, NotAvailable, CapBaseObject, IBaseCap
__all__ = ['NotLoaded', 'NotAvailable', 'CapBaseObject', 'IBaseCap']

28
weboob/capabilities/video.py
View file

@ -20,7 +20,7 @@
from datetime import datetime, timedelta
from .base import IBaseCap, CapBaseObject, NotLoaded
from .base import IBaseCap, CapBaseObject, NotAvailable
from weboob.tools.capabilities.thumbnail import Thumbnail
@ -31,25 +31,21 @@ class BaseVideo(CapBaseObject):
Represents a video.
This object has to be inherited to specify how to calculate the URL of the video from its ID.
"""
def __init__(self, _id, title=NotLoaded, url=NotLoaded, author=NotLoaded, duration=NotLoaded, date=NotLoaded,
rating=NotLoaded, rating_max=NotLoaded, thumbnail=NotLoaded, thumbnail_url=None, nsfw=False):
def __init__(self, _id):
CapBaseObject.__init__(self, unicode(_id))
self.add_field('title', basestring, title)
self.add_field('url', basestring, url)
self.add_field('title', basestring)
self.add_field('url', basestring)
self.add_field('ext', basestring)
self.add_field('author', basestring, author)
self.add_field('author', basestring)
self.add_field('description', basestring)
self.add_field('duration', (int,long,timedelta), duration)
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', 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 = Thumbnail(thumbnail_url)
self.add_field('duration', (int,long,timedelta))
self.add_field('date', datetime)
self.add_field('rating', (int,long,float), NotAvailable)
self.add_field('rating_max', (int,long,float), NotAvailable)
self.add_field('thumbnail', Thumbnail)
self.add_field('nsfw', bool, False)
@classmethod
def id2url(cls, _id):