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

Fix getting youjizz video URLs, better test

Browse source
This commit is contained in:
Laurent Bachelier 2012-03-16 01:28:49 +01:00 • committed by Romain Bignon
commit 4d628112d5
2 changed files with 3 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/youjizz/pages/video.py
View file

@ -54,7 +54,7 @@ class VideoPage(BasePage):
else: else:
raise BrokenPageError('Unable to retrieve video duration') raise BrokenPageError('Unable to retrieve video duration')
video_file_urls = re.findall(r'"(http://[^",]+\.youjizz\.com[^",]+\.flv)[\?"]', data) video_file_urls = re.findall(r'"(http://[^",]+\.youjizz\.com[^",]+\.flv(?:\?[^"]*)?)"', data)
if len(video_file_urls) == 0: if len(video_file_urls) == 0:
raise BrokenPageError('Video URL not found') raise BrokenPageError('Video URL not found')
elif len(video_file_urls) > 1: elif len(video_file_urls) > 1:

2
modules/youjizz/test.py
View file

@ -20,6 +20,7 @@
from weboob.tools.test import BackendTest from weboob.tools.test import BackendTest
class YoujizzTest(BackendTest): class YoujizzTest(BackendTest):
BACKEND = 'youjizz' BACKEND = 'youjizz'
@ -31,3 +32,4 @@ class YoujizzTest(BackendTest):
v = l[0] v = l[0]
self.backend.fillobj(v, ('url',)) self.backend.fillobj(v, ('url',))
self.assertTrue(v.url and v.url.startswith('http://'), 'URL for video "%s" not found: %s' % (v.id, v.url)) self.assertTrue(v.url and v.url.startswith('http://'), 'URL for video "%s" not found: %s' % (v.id, v.url))
self.backend.browser.openurl(v.url)