diff options
| author | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-05-02 13:39:56 +0200 |
|---|---|---|
| committer | Jaime Marquínez Ferrándiz <jaime.marquinez.ferrandiz@gmail.com> | 2013-05-02 13:39:56 +0200 |
| commit | feecf2251190ef7969ba58146f058e87fa237abb (patch) | |
| tree | 828c2a7a2ed593c46d26e2a7d91869adbca1bbae | |
| parent | 4c4f15eb7856fb93c85322fa31bfab023439c261 (diff) | |
InfoExtractors: fix some regular expressions where dots weren't escaped
| -rwxr-xr-x | youtube_dl/InfoExtractors.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index 7dfd0c5c7..1f66cc5a5 100755 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -3554,7 +3554,7 @@ class FunnyOrDieIE(InfoExtractor): return [info] class SteamIE(InfoExtractor): - _VALID_URL = r"""http://store.steampowered.com/ + _VALID_URL = r"""http://store\.steampowered\.com/ (agecheck/)? (?P<urltype>video|app)/ #If the page is only for videos or for a game (?P<gameID>\d+)/? @@ -3988,7 +3988,7 @@ class KeekIE(InfoExtractor): return [info] class TEDIE(InfoExtractor): - _VALID_URL=r'''http://www.ted.com/ + _VALID_URL=r'''http://www\.ted\.com/ ( ((?P<type_playlist>playlists)/(?P<playlist_id>\d+)) # We have a playlist | @@ -4244,7 +4244,7 @@ class ARDIE(InfoExtractor): return [info] class TumblrIE(InfoExtractor): - _VALID_URL = r'http://(?P<blog_name>.*?).tumblr.com/((post)|(video))/(?P<id>\d*)/(.*?)' + _VALID_URL = r'http://(?P<blog_name>.*?)\.tumblr\.com/((post)|(video))/(?P<id>\d*)/(.*?)' def _real_extract(self, url): m_url = re.match(self._VALID_URL, url) @@ -4254,7 +4254,7 @@ class TumblrIE(InfoExtractor): url = 'http://%s.tumblr.com/post/%s/' % (blog, video_id) webpage = self._download_webpage(url, video_id) - re_video = r'src=\\x22(?P<video_url>http://%s.tumblr.com/video_file/%s/(.*?))\\x22 type=\\x22video/(?P<ext>.*?)\\x22' % (blog, video_id) + re_video = r'src=\\x22(?P<video_url>http://%s\.tumblr\.com/video_file/%s/(.*?))\\x22 type=\\x22video/(?P<ext>.*?)\\x22' % (blog, video_id) video = re.search(re_video, webpage) if video is None: self.to_screen("No video founded") @@ -4278,7 +4278,7 @@ class TumblrIE(InfoExtractor): }] class BandcampIE(InfoExtractor): - _VALID_URL = r'http://.*?.bandcamp.com/track/(?P<title>.*)' + _VALID_URL = r'http://.*?\.bandcamp\.com/track/(?P<title>.*)' def _real_extract(self, url): mobj = re.match(self._VALID_URL, url) @@ -4303,7 +4303,7 @@ class BandcampIE(InfoExtractor): mp3_info = info[u'downloads'][u'mp3-320'] # If we try to use this url it says the link has expired initial_url = mp3_info[u'url'] - re_url = r'(?P<server>http://(.*?).bandcamp.com)/download/track\?enc=mp3-320&fsig=(?P<fsig>.*?)&id=(?P<id>.*?)&ts=(?P<ts>.*)$' + re_url = r'(?P<server>http://(.*?)\.bandcamp\.com)/download/track\?enc=mp3-320&fsig=(?P<fsig>.*?)&id=(?P<id>.*?)&ts=(?P<ts>.*)$' m_url = re.match(re_url, initial_url) #We build the url we will use to get the final track url # This url is build in Bandcamp in the script download_bunde_*.js |