projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
352d08e
)
Properly escape ‘.’ in some _VALID_URL properties
author
Jaime Marquínez Ferrándiz
<jaime.marquinez.ferrandiz@gmail.com>
Sat, 25 Jan 2014 10:48:08 +0000
(11:48 +0100)
committer
Jaime Marquínez Ferrándiz
<jaime.marquinez.ferrandiz@gmail.com>
Sat, 25 Jan 2014 10:48:08 +0000
(11:48 +0100)
youtube_dl/extractor/condenast.py
patch
|
blob
|
history
youtube_dl/extractor/freespeech.py
patch
|
blob
|
history
youtube_dl/extractor/hotnewhiphop.py
patch
|
blob
|
history
youtube_dl/extractor/vimeo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/condenast.py
b/youtube_dl/extractor/condenast.py
index 03b75b80d3b3019a75f89f2a773c4c4753afe2eb..91c1c1348f587798131459676ffe5444727c5c3b 100644
(file)
--- a/
youtube_dl/extractor/condenast.py
+++ b/
youtube_dl/extractor/condenast.py
@@
-30,7
+30,7
@@
class CondeNastIE(InfoExtractor):
'vanityfair': 'Vanity Fair',
}
'vanityfair': 'Vanity Fair',
}
- _VALID_URL = r'http://(video|www)
.(?P<site>%s)
.com/(?P<type>watch|series|video)/(?P<id>.+)' % '|'.join(_SITES.keys())
+ _VALID_URL = r'http://(video|www)
\.(?P<site>%s)\
.com/(?P<type>watch|series|video)/(?P<id>.+)' % '|'.join(_SITES.keys())
IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
_TEST = {
IE_DESC = 'Condé Nast media group: %s' % ', '.join(sorted(_SITES.values()))
_TEST = {
diff --git
a/youtube_dl/extractor/freespeech.py
b/youtube_dl/extractor/freespeech.py
index bb253ebba07b994ffdfb5bdd5ebc8fcc59b95916..c210177f7297e174d38988a2e62f379a9a478305 100644
(file)
--- a/
youtube_dl/extractor/freespeech.py
+++ b/
youtube_dl/extractor/freespeech.py
@@
-8,7
+8,7
@@
from .common import InfoExtractor
class FreespeechIE(InfoExtractor):
IE_NAME = 'freespeech.org'
class FreespeechIE(InfoExtractor):
IE_NAME = 'freespeech.org'
- _VALID_URL = r'https://www
.freespeech
.org/video/(?P<title>.+)'
+ _VALID_URL = r'https://www
\.freespeech\
.org/video/(?P<title>.+)'
_TEST = {
'add_ie': ['Youtube'],
'url': 'https://www.freespeech.org/video/obama-romney-campaign-colorado-ahead-debate-0',
_TEST = {
'add_ie': ['Youtube'],
'url': 'https://www.freespeech.org/video/obama-romney-campaign-colorado-ahead-debate-0',
diff --git
a/youtube_dl/extractor/hotnewhiphop.py
b/youtube_dl/extractor/hotnewhiphop.py
index a106f81d2b24ef3589f4ef98cbbaa930dfe5fc0b..80b48b1b3605a18fa11547ab890897b6b47ccaa5 100644
(file)
--- a/
youtube_dl/extractor/hotnewhiphop.py
+++ b/
youtube_dl/extractor/hotnewhiphop.py
@@
-13,7
+13,7
@@
from ..utils import (
class HotNewHipHopIE(InfoExtractor):
class HotNewHipHopIE(InfoExtractor):
- _VALID_URL = r'http://www\.hotnewhiphop.com/.*\.(?P<id>.*)\.html'
+ _VALID_URL = r'http://www\.hotnewhiphop
\
.com/.*\.(?P<id>.*)\.html'
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
'file': '1435540.mp3',
_TEST = {
'url': 'http://www.hotnewhiphop.com/freddie-gibbs-lay-it-down-song.1435540.html',
'file': '1435540.mp3',
diff --git
a/youtube_dl/extractor/vimeo.py
b/youtube_dl/extractor/vimeo.py
index 1936755499ceca890c7b4513298a64444293b71d..a50170ce76923837717dec6df19a558734d46e4e 100644
(file)
--- a/
youtube_dl/extractor/vimeo.py
+++ b/
youtube_dl/extractor/vimeo.py
@@
-291,7
+291,7
@@
class VimeoIE(InfoExtractor):
class VimeoChannelIE(InfoExtractor):
IE_NAME = 'vimeo:channel'
class VimeoChannelIE(InfoExtractor):
IE_NAME = 'vimeo:channel'
- _VALID_URL = r'(?:https?://)?vimeo
.\
com/channels/(?P<id>[^/]+)'
+ _VALID_URL = r'(?:https?://)?vimeo
\.
com/channels/(?P<id>[^/]+)'
_MORE_PAGES_INDICATOR = r'<a.+?rel="next"'
_TITLE_RE = r'<link rel="alternate"[^>]+?title="(.*?)"'
_MORE_PAGES_INDICATOR = r'<a.+?rel="next"'
_TITLE_RE = r'<link rel="alternate"[^>]+?title="(.*?)"'
@@
-327,7
+327,7
@@
class VimeoChannelIE(InfoExtractor):
class VimeoUserIE(VimeoChannelIE):
IE_NAME = 'vimeo:user'
class VimeoUserIE(VimeoChannelIE):
IE_NAME = 'vimeo:user'
- _VALID_URL = r'(?:https?://)?vimeo
.\
com/(?P<name>[^/]+)(?:/videos|[#?]|$)'
+ _VALID_URL = r'(?:https?://)?vimeo
\.
com/(?P<name>[^/]+)(?:/videos|[#?]|$)'
_TITLE_RE = r'<a[^>]+?class="user">([^<>]+?)</a>'
@classmethod
_TITLE_RE = r'<a[^>]+?class="user">([^<>]+?)</a>'
@classmethod
@@
-344,7
+344,7
@@
class VimeoUserIE(VimeoChannelIE):
class VimeoAlbumIE(VimeoChannelIE):
IE_NAME = 'vimeo:album'
class VimeoAlbumIE(VimeoChannelIE):
IE_NAME = 'vimeo:album'
- _VALID_URL = r'(?:https?://)?vimeo
.\
com/album/(?P<id>\d+)'
+ _VALID_URL = r'(?:https?://)?vimeo
\.
com/album/(?P<id>\d+)'
_TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>'
def _page_url(self, base_url, pagenum):
_TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>'
def _page_url(self, base_url, pagenum):
@@
-358,7
+358,7
@@
class VimeoAlbumIE(VimeoChannelIE):
class VimeoGroupsIE(VimeoAlbumIE):
IE_NAME = 'vimeo:group'
class VimeoGroupsIE(VimeoAlbumIE):
IE_NAME = 'vimeo:group'
- _VALID_URL = r'(?:https?://)?vimeo
.\
com/groups/(?P<name>[^/]+)'
+ _VALID_URL = r'(?:https?://)?vimeo
\.
com/groups/(?P<name>[^/]+)'
def _extract_list_title(self, webpage):
return self._og_search_title(webpage)
def _extract_list_title(self, webpage):
return self._og_search_title(webpage)
@@
-372,7
+372,7
@@
class VimeoGroupsIE(VimeoAlbumIE):
class VimeoReviewIE(InfoExtractor):
IE_NAME = 'vimeo:review'
IE_DESC = 'Review pages on vimeo'
class VimeoReviewIE(InfoExtractor):
IE_NAME = 'vimeo:review'
IE_DESC = 'Review pages on vimeo'
- _VALID_URL = r'(?:https?://)?vimeo
.\
com/[^/]+/review/(?P<id>[^/]+)'
+ _VALID_URL = r'(?:https?://)?vimeo
\.
com/[^/]+/review/(?P<id>[^/]+)'
_TEST = {
'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d',
'file': '75524534.mp4',
_TEST = {
'url': 'https://vimeo.com/user21297594/review/75524534/3c257a1b5d',
'file': '75524534.mp4',