projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
7f98863
)
[youtube] Support jwplayer with YouTube URLs (Closes #2075)
author
Philipp Hagemeister
<phihag@phihag.de>
Mon, 6 Jan 2014 00:42:58 +0000
(
01:42
+0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Mon, 6 Jan 2014 00:42:58 +0000
(
01:42
+0100)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 8534c6f90c3ca984e43dfa03786c5d99082f7182..62c918b6aa3cd0b3459b7b0ab7f0e85ad96f0459 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-4,6
+4,7
@@
import os
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from .youtube import YoutubeIE
from ..utils import (
compat_urllib_error,
compat_urllib_parse,
from ..utils import (
compat_urllib_error,
compat_urllib_parse,
@@
-339,12
+340,16
@@
class GenericIE(InfoExtractor):
video_url = compat_urlparse.urljoin(url, video_url)
video_id = compat_urllib_parse.unquote(os.path.basename(video_url))
video_url = compat_urlparse.urljoin(url, video_url)
video_id = compat_urllib_parse.unquote(os.path.basename(video_url))
+ # Sometimes, jwplayer extraction will result in a YouTube URL
+ if YoutubeIE.suitable(video_url):
+ return self.url_result(video_url, 'Youtube')
+
# here's a fun little line of code for you:
video_id = os.path.splitext(video_id)[0]
return {
# here's a fun little line of code for you:
video_id = os.path.splitext(video_id)[0]
return {
- 'id':
video_id,
- 'url':
video_url,
+ 'id': video_id,
+ 'url': video_url,
'uploader': video_uploader,
'uploader': video_uploader,
- 'title':
video_title,
+ 'title': video_title,
}
}