Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'codesparkle/master'

Browse Source
This commit is contained in:
Philipp Hagemeister 2015-01-30 10:56:53 +01:00
commit 7b6c60393e
6 changed files with 4 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
youtube_dl/YoutubeDL.py
View File

@ -1075,7 +1075,6 @@ class YoutubeDL(object):
'requested_formats': formats_info, 'requested_formats': formats_info,
'format': rf, 'format': rf,
'format_id': rf, 'format_id': rf,
'ext': formats_info[0]['ext'],
'width': formats_info[0].get('width'), 'width': formats_info[0].get('width'),
'height': formats_info[0].get('height'), 'height': formats_info[0].get('height'),
'resolution': formats_info[0].get('resolution'), 'resolution': formats_info[0].get('resolution'),

1
youtube_dl/extractor/appletrailers.py
View File

@ -122,7 +122,6 @@ class AppleTrailersIE(InfoExtractor):
playlist.append({ playlist.append({
'_type': 'video', '_type': 'video',
'id': video_id, 'id': video_id,
'title': title,
'formats': formats, 'formats': formats,
'title': title, 'title': title,
'duration': duration, 'duration': duration,

7
youtube_dl/extractor/cinchcast.py
View File

@ -28,12 +28,7 @@ class CinchcastIE(InfoExtractor):
item, './{http://developer.longtailvideo.com/trac/}date') item, './{http://developer.longtailvideo.com/trac/}date')
upload_date = unified_strdate(date_str, day_first=False) upload_date = unified_strdate(date_str, day_first=False)
# duration is present but wrong # duration is present but wrong
formats = [] formats = [{'format_id': 'main', 'url': item.find('./{http://search.yahoo.com/mrss/}content').attrib['url']}]
formats.append({
'format_id': 'main',
'url': item.find(
'./{http://search.yahoo.com/mrss/}content').attrib['url'],
})
backup_url = xpath_text( backup_url = xpath_text(
item, './{http://developer.longtailvideo.com/trac/}backupContent') item, './{http://developer.longtailvideo.com/trac/}backupContent')
if backup_url: if backup_url:

2
youtube_dl/extractor/generic.py
View File

@ -1073,7 +1073,7 @@ class GenericIE(InfoExtractor):
found = filter_video(re.findall(r'''(?xs) found = filter_video(re.findall(r'''(?xs)
flowplayer\("[^"]+",\s* flowplayer\("[^"]+",\s*
\{[^}]+?\}\s*, \{[^}]+?\}\s*,
\s*{[^}]+? ["']?clip["']?\s*:\s*\{\s* \s*\{[^}]+? ["']?clip["']?\s*:\s*\{\s*
["']?url["']?\s*:\s*["']([^"']+)["'] ["']?url["']?\s*:\s*["']([^"']+)["']
''', webpage)) ''', webpage))
if not found: if not found:

2
youtube_dl/extractor/grooveshark.py
View File

@ -83,7 +83,7 @@ class GroovesharkIE(InfoExtractor):
return compat_urlparse.urlunparse((uri.scheme, uri.netloc, obj['attrs']['data'], None, None, None)) return compat_urlparse.urlunparse((uri.scheme, uri.netloc, obj['attrs']['data'], None, None, None))
def _transform_bootstrap(self, js): def _transform_bootstrap(self, js):
return re.split('(?m)^\s*try\s*{', js)[0] \ return re.split('(?m)^\s*try\s*\{', js)[0] \
.split(' = ', 1)[1].strip().rstrip(';') .split(' = ', 1)[1].strip().rstrip(';')
def _transform_meta(self, js): def _transform_meta(self, js):

5
youtube_dl/extractor/smotri.py
View File

@ -108,7 +108,7 @@ class SmotriIE(InfoExtractor):
# swf player # swf player
{ {
'url': 'http://pics.smotri.com/scrubber_custom8.swf?file=v9188090500', 'url': 'http://pics.smotri.com/scrubber_custom8.swf?file=v9188090500',
'md5': '4d47034979d9390d14acdf59c4935bc2', 'md5': '31099eeb4bc906712c5f40092045108d',
'info_dict': { 'info_dict': {
'id': 'v9188090500', 'id': 'v9188090500',
'ext': 'mp4', 'ext': 'mp4',
@ -139,9 +139,6 @@ class SmotriIE(InfoExtractor):
def _search_meta(self, name, html, display_name=None): def _search_meta(self, name, html, display_name=None):
if display_name is None: if display_name is None:
display_name = name display_name = name
return self._html_search_regex(
r'<meta itemprop="%s" content="([^"]+)" />' % re.escape(name),
html, display_name, fatal=False)
return self._html_search_meta(name, html, display_name) return self._html_search_meta(name, html, display_name)
def _real_extract(self, url): def _real_extract(self, url):