From 4d628112d51a60546c6c19d1c2fa30513fc965d1 Mon Sep 17 00:00:00 2001 From: Laurent Bachelier Date: Fri, 16 Mar 2012 01:28:49 +0100 Subject: [PATCH] Fix getting youjizz video URLs, better test --- modules/youjizz/pages/video.py | 2 +- modules/youjizz/test.py | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/modules/youjizz/pages/video.py b/modules/youjizz/pages/video.py index cc5f8ca8..7e2507f9 100644 --- a/modules/youjizz/pages/video.py +++ b/modules/youjizz/pages/video.py @@ -54,7 +54,7 @@ class VideoPage(BasePage): else: 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: raise BrokenPageError('Video URL not found') elif len(video_file_urls) > 1: diff --git a/modules/youjizz/test.py b/modules/youjizz/test.py index 8cdfb371..5a6de6b8 100644 --- a/modules/youjizz/test.py +++ b/modules/youjizz/test.py @@ -20,6 +20,7 @@ from weboob.tools.test import BackendTest + class YoujizzTest(BackendTest): BACKEND = 'youjizz' @@ -31,3 +32,4 @@ class YoujizzTest(BackendTest): v = l[0] 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.backend.browser.openurl(v.url)