Browse Source

[youtube] Support jwplayer with YouTube URLs (Closes #2075)

totalwebcasting
Philipp Hagemeister 11 years ago
parent
commit
fc9713a1d2
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      youtube_dl/extractor/generic.py

+ 8
- 3
youtube_dl/extractor/generic.py View File

@ -4,6 +4,7 @@ import os
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from .youtube import YoutubeIE
from ..utils import ( from ..utils import (
compat_urllib_error, compat_urllib_error,
compat_urllib_parse, compat_urllib_parse,
@ -339,12 +340,16 @@ class GenericIE(InfoExtractor):
video_url = compat_urlparse.urljoin(url, video_url) video_url = compat_urlparse.urljoin(url, video_url)
video_id = compat_urllib_parse.unquote(os.path.basename(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: # here's a fun little line of code for you:
video_id = os.path.splitext(video_id)[0] video_id = os.path.splitext(video_id)[0]
return { 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,
} }

Loading…
Cancel
Save