From a73b27cdd1ed4b7170c2ad19fddfab357a97bf2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pierre=20Mazi=C3=A8re?= Date: Sat, 21 Dec 2013 23:35:02 +0100 Subject: [PATCH] modify nolifetv module to use the new BaseVideo/ICapVideo classes --- modules/nolifetv/pages/index.py | 6 ++++-- modules/nolifetv/pages/video.py | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/nolifetv/pages/index.py b/modules/nolifetv/pages/index.py index f55e3235..aff1c9fa 100644 --- a/modules/nolifetv/pages/index.py +++ b/modules/nolifetv/pages/index.py @@ -22,8 +22,8 @@ from datetime import datetime import re from weboob.tools.browser import BasePage, BrokenPageError -from weboob.tools.capabilities.thumbnail import Thumbnail from weboob.capabilities.base import NotAvailable +from weboob.capabilities.image import BaseImage from ..video import NolifeTVVideo @@ -47,7 +47,9 @@ class IndexPage(BasePage): except IndexError: video.description = NotAvailable - video.thumbnail = Thumbnail(unicode(img.attrib['src'])) + url = img.attrib['src'] + video.thumbnail = BaseImage(url) + video.thumbnail.url = video.thumbnail.id try: dparts = self.parser.select(div, 'span.date_emission', 1).text.strip().split('/') hparts = self.parser.select(div, 'span.hour_emission', 1).text.strip().split('h') diff --git a/modules/nolifetv/pages/video.py b/modules/nolifetv/pages/video.py index 2d2cec21..ffd437a2 100644 --- a/modules/nolifetv/pages/video.py +++ b/modules/nolifetv/pages/video.py @@ -24,7 +24,7 @@ from dateutil.parser import parse as parse_dt import urllib from weboob.capabilities.base import NotAvailable, UserError -from weboob.tools.capabilities.thumbnail import Thumbnail +from weboob.capabilities.image import BaseImage from weboob.tools.browser import BasePage, BrokenPageError from weboob.tools.misc import to_unicode @@ -67,7 +67,8 @@ class VideoPage(BasePage): meta = self.parser.select(self.document.getroot(), 'meta[property="og:image"]', 1) try: - video.thumbnail = Thumbnail(unicode(meta.attrib['content'])) + video.thumbnail = BaseImage(meta.attrib['content']) + video.thumbnail.url = video.thumbnail.id except BrokenPageError: video.thumbnail = NotAvailable