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

support quality and lang

Browse source
This commit is contained in:
Romain Bignon 2010-08-13 11:16:48 +02:00
commit 700d77596a
2 changed files with 23 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
weboob/backends/arte/backend.py
View file

@ -35,8 +35,14 @@ class ArteBackend(BaseBackend, ICapVideo):
VERSION = '0.2' VERSION = '0.2'
DESCRIPTION = 'Arte french TV' DESCRIPTION = 'Arte french TV'
LICENSE = 'GPLv3' LICENSE = 'GPLv3'
CONFIG = {'lang': BaseBackend.ConfigField(default='fr', description='Lang of videos', choices=['fr', 'de', 'en']),
'quality': BaseBackend.ConfigField(default='hd', description='Quality of video', choices=['hd', 'sd']),
}
BROWSER = ArteBrowser BROWSER = ArteBrowser
def create_default_browser(self):
return self.create_browser(lang=self.config['lang'], quality=self.config['quality'])
def get_video(self, _id): def get_video(self, _id):
with self.browser: with self.browser:
return self.browser.get_video(_id) return self.browser.get_video(_id)

22
weboob/backends/arte/browser.py
View file

@ -29,15 +29,27 @@ __all__ = ['ArteBrowser']
class ArteBrowser(BaseBrowser): class ArteBrowser(BaseBrowser):
DOMAIN = u'videos.arte.tv' DOMAIN = u'videos.arte.tv'
ENCODING = None ENCODING = None
PAGES = {r'http://videos.arte.tv/fr/videos/arte7.*': IndexPage, PAGES = {r'http://videos.arte.tv/%(lang)s/videos/arte7.*': IndexPage,
r'http://videos.arte.tv/fr/do_search/videos/recherche.*': IndexPage, r'http://videos.arte.tv/%(lang)s/do_search/videos/%(searchlang)s.*': IndexPage,
r'http://videos.arte.tv/fr/videos/(?P<id>.+)\.html': VideoPage r'http://videos.arte.tv/%(lang)s/videos/(?P<id>.+)\.html': VideoPage
} }
SEARCH_LANG = {'fr': 'recherche', 'de':'suche', 'en': 'search'}
def __init__(self, lang, quality, *args, **kwargs):
last_pages = self.PAGES
self.PAGES = {}
for url, page in last_pages.iteritems():
self.PAGES[url % {'lang': lang, 'searchlang': self.SEARCH_LANG[lang]}] = page
BaseBrowser.__init__(self, *args, **kwargs)
self.lang = lang
self.quality = quality
@id2url(ArteVideo.id2url) @id2url(ArteVideo.id2url)
def get_video(self, url, video=None): def get_video(self, url, video=None):
self.location(url) self.location(url)
return self.page.get_video(video) return self.page.get_video(video, self.lang, self.quality)
def home(self): def home(self):
self.location('http://videos.arte.tv/fr/videos/arte7') self.location('http://videos.arte.tv/fr/videos/arte7')
@ -46,6 +58,6 @@ class ArteBrowser(BaseBrowser):
if not pattern: if not pattern:
self.home() self.home()
else: else:
self.location(self.buildurl('/fr/do_search/videos/recherche', q=pattern)) self.location(self.buildurl('/%s/do_search/videos/%s' % (self.lang, self.SEARCH_LANG[self.lang]), q=pattern))
assert self.is_on_page(IndexPage) assert self.is_on_page(IndexPage)
return self.page.iter_videos() return self.page.iter_videos()