projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
36399e8
)
[generic] Support double slash URLs (Fixes #1309)
author
Philipp Hagemeister
<phihag@phihag.de>
Sat, 24 Aug 2013 20:49:52 +0000
(22:49 +0200)
committer
Philipp Hagemeister
<phihag@phihag.de>
Sat, 24 Aug 2013 20:52:45 +0000
(22:52 +0200)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index da016f7ee86635c114bb4328742971c8082e5491..ccbbdd255588f5085b7c85cddc86863d8eeeabe3 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-7,12
+7,14
@@
from .common import InfoExtractor
from ..utils import (
compat_urllib_error,
compat_urllib_parse,
from ..utils import (
compat_urllib_error,
compat_urllib_parse,
+ compat_urllib_parse_urlparse,
compat_urllib_request,
ExtractorError,
)
from .brightcove import BrightcoveIE
compat_urllib_request,
ExtractorError,
)
from .brightcove import BrightcoveIE
+
class GenericIE(InfoExtractor):
IE_DESC = u'Generic downloader that works on some sites'
_VALID_URL = r'.*'
class GenericIE(InfoExtractor):
IE_DESC = u'Generic downloader that works on some sites'
_VALID_URL = r'.*'
@@
-23,7
+25,7
@@
class GenericIE(InfoExtractor):
u'file': u'13601338388002.mp4',
u'md5': u'85b90ccc9d73b4acd9138d3af4c27f89',
u'info_dict': {
u'file': u'13601338388002.mp4',
u'md5': u'85b90ccc9d73b4acd9138d3af4c27f89',
u'info_dict': {
- u"uploader": u"www.hodiho.fr",
+ u"uploader": u"www.hodiho.fr",
u"title": u"R\u00e9gis plante sa Jeep"
}
},
u"title": u"R\u00e9gis plante sa Jeep"
}
},
@@
-161,6
+163,8
@@
class GenericIE(InfoExtractor):
raise ExtractorError(u'Invalid URL: %s' % url)
video_url = compat_urllib_parse.unquote(mobj.group(1))
raise ExtractorError(u'Invalid URL: %s' % url)
video_url = compat_urllib_parse.unquote(mobj.group(1))
+ if video_url.startswith('//'):
+ video_url = compat_urllib_parse_urlparse(url).scheme + ':' + video_url
video_id = os.path.basename(video_url)
# here's a fun little line of code for you:
video_id = os.path.basename(video_url)
# here's a fun little line of code for you: