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

fixes

Browse source 
- parse video xml with lxml instead of regexpes
- add a prefix to IDs to know what kind of object it is
This commit is contained in:
Romain Bignon 2013-05-24 18:19:51 +02:00
commit 4ee284b2ab
5 changed files with 38 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

23
modules/arte/backend.py
View file

@ -46,9 +46,22 @@ class ArteBackend(BaseBackend, ICapVideo, ICapCollection):
def create_default_browser(self):
return self.create_browser(lang=self.config['lang'].get(), quality=self.config['quality'].get())
def split_id(self, _id):
try:
site, _id = _id.split('.', 1)
except ValueError:
site = 'videos'
return site, _id
def get_video(self, _id):
with self.browser:
return self.browser.get_video(_id)
site, _id = self.split_id(_id)
if site == 'live':
return self.browser.get_live_video(_id)
else:
return self.browser.get_video(_id)
def search_videos(self, pattern, sortby=ICapVideo.SEARCH_RELEVANCE, nsfw=False, max_results=None):
with self.browser:
@ -58,10 +71,12 @@ class ArteBackend(BaseBackend, ICapVideo, ICapCollection):
if fields != ['thumbnail']:
# if we don't want only the thumbnail, we probably want also every fields
with self.browser:
site, _id = self.split_id(video.id)
if isinstance(video,ArteVideo):
video = self.browser.get_video(ArteVideo.id2url(video.id), video)
video = self.browser.get_video(_id, video)
if isinstance(video,ArteLiveVideo):
video = self.browser.get_live_video(ArteLiveVideo.id2url(video.id), video)
video = self.browser.get_live_video(_id, video)
if 'thumbnail' in fields and video and video.thumbnail:
with self.browser:
video.thumbnail.data = self.browser.readurl(video.thumbnail.url)
@ -84,7 +99,7 @@ class ArteBackend(BaseBackend, ICapVideo, ICapCollection):
yield categorie
if collection.path_level == 2:
if collection.split_path[0] == u'live':
for video in self.browser.live_videos(ArteLiveCollection.id2url(collection.basename)):
for video in self.browser.live_videos(ArteLiveCollection.id2url(collection.basename, self.browser.lang)):
yield video
def validate_collection(self, objs, collection):