mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-11-14 05:17:25 +00:00
Merge pull request #9400 from inondle/master
[liveleak] Adds support for thumbnails and updates tests
This commit is contained in:
commit
401d147893
@ -17,7 +17,8 @@ class LiveLeakIE(InfoExtractor):
|
|||||||
'ext': 'flv',
|
'ext': 'flv',
|
||||||
'description': 'extremely bad day for this guy..!',
|
'description': 'extremely bad day for this guy..!',
|
||||||
'uploader': 'ljfriel2',
|
'uploader': 'ljfriel2',
|
||||||
'title': 'Most unlucky car accident'
|
'title': 'Most unlucky car accident',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$'
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.liveleak.com/view?i=f93_1390833151',
|
'url': 'http://www.liveleak.com/view?i=f93_1390833151',
|
||||||
@ -28,6 +29,7 @@ class LiveLeakIE(InfoExtractor):
|
|||||||
'description': 'German Television Channel NDR does an exclusive interview with Edward Snowden.\r\nUploaded on LiveLeak cause German Television thinks the rest of the world isn\'t intereseted in Edward Snowden.',
|
'description': 'German Television Channel NDR does an exclusive interview with Edward Snowden.\r\nUploaded on LiveLeak cause German Television thinks the rest of the world isn\'t intereseted in Edward Snowden.',
|
||||||
'uploader': 'ARD_Stinkt',
|
'uploader': 'ARD_Stinkt',
|
||||||
'title': 'German Television does first Edward Snowden Interview (ENGLISH)',
|
'title': 'German Television does first Edward Snowden Interview (ENGLISH)',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$'
|
||||||
}
|
}
|
||||||
}, {
|
}, {
|
||||||
'url': 'http://www.liveleak.com/view?i=4f7_1392687779',
|
'url': 'http://www.liveleak.com/view?i=4f7_1392687779',
|
||||||
@ -49,7 +51,8 @@ class LiveLeakIE(InfoExtractor):
|
|||||||
'ext': 'mp4',
|
'ext': 'mp4',
|
||||||
'description': 'Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.',
|
'description': 'Happened on 27.7.2014. \r\nAt 0:53 you can see people still swimming at near beach.',
|
||||||
'uploader': 'bony333',
|
'uploader': 'bony333',
|
||||||
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia'
|
'title': 'Crazy Hungarian tourist films close call waterspout in Croatia',
|
||||||
|
'thumbnail': 're:^https?://.*\.jpg$'
|
||||||
}
|
}
|
||||||
}]
|
}]
|
||||||
|
|
||||||
@ -72,6 +75,7 @@ class LiveLeakIE(InfoExtractor):
|
|||||||
age_limit = int_or_none(self._search_regex(
|
age_limit = int_or_none(self._search_regex(
|
||||||
r'you confirm that you are ([0-9]+) years and over.',
|
r'you confirm that you are ([0-9]+) years and over.',
|
||||||
webpage, 'age limit', default=None))
|
webpage, 'age limit', default=None))
|
||||||
|
video_thumbnail = self._og_search_thumbnail(webpage)
|
||||||
|
|
||||||
sources_raw = self._search_regex(
|
sources_raw = self._search_regex(
|
||||||
r'(?s)sources:\s*(\[.*?\]),', webpage, 'video URLs', default=None)
|
r'(?s)sources:\s*(\[.*?\]),', webpage, 'video URLs', default=None)
|
||||||
@ -124,4 +128,5 @@ class LiveLeakIE(InfoExtractor):
|
|||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
'formats': formats,
|
'formats': formats,
|
||||||
'age_limit': age_limit,
|
'age_limit': age_limit,
|
||||||
|
'thumbnail': video_thumbnail,
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user