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

support URLs and IDs with '-' in

Browse source
This commit is contained in:
Romain Bignon 2010-04-26 17:14:15 +02:00
commit 31863d3171
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
weboob/backends/youtube/backend.py
View file

@ -46,7 +46,7 @@ class YoutubeBackend(BaseBackend, ICapVideoProvider):
def need_url(func): def need_url(func):
def inner(self, *args, **kwargs): def inner(self, *args, **kwargs):
url = args[0] url = args[0]
if (u'youtube.com' not in url) and not re.match('^\w+$', url): if (u'youtube.com' not in url) and not re.match('^[\w-]+$', url):
return None return None
return func(self, *args, **kwargs) return func(self, *args, **kwargs)
return inner return inner

2
weboob/backends/youtube/browser.py
View file

@ -44,7 +44,7 @@ class YoutubeBrowser(BaseBrowser):
return self.page.iter_videos() return self.page.iter_videos()
def get_video(self, _id): def get_video(self, _id):
if re.match('^\w+$', _id): if re.match('^[\w-]+$', _id):
url = 'http://www.youtube.com/watch?v=%s' % _id url = 'http://www.youtube.com/watch?v=%s' % _id
else: else:
url = _id url = _id

2
weboob/backends/youtube/pages/results.py
View file

@ -24,7 +24,7 @@ from weboob.tools.browser import BasePage
from weboob.capabilities.video import Video from weboob.capabilities.video import Video
class ResultsPage(BasePage): class ResultsPage(BasePage):
WATCH_RE = re.compile('/watch\?v=(\w+)') WATCH_RE = re.compile('/watch\?v=([\w-]+)')
def iter_videos(self): def iter_videos(self):
for div in self.document.getroot().cssselect("div[class^=video-entry]"): for div in self.document.getroot().cssselect("div[class^=video-entry]"):
a = div.find('a') a = div.find('a')

2
weboob/backends/youtube/pages/video.py
View file

@ -25,7 +25,7 @@ from weboob.tools.browser import BasePage
from weboob.capabilities.video import Video from weboob.capabilities.video import Video
class VideoPage(BasePage): class VideoPage(BasePage):
URL_REGEX = re.compile(r"https?://[w\.]*youtube.com/watch\?v=(\w+)") URL_REGEX = re.compile(r"https?://[w\.]*youtube.com/watch\?v=([\w-]+)")
VIDEO_SIGNATURE_REGEX = re.compile(r'&t=([^ ,&]*)') VIDEO_SIGNATURE_REGEX = re.compile(r'&t=([^ ,&]*)')
def on_loaded(self): def on_loaded(self):