Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-10 16:39:59 +08:00
Code Issues Releases Wiki Activity

Fixed funnyordie extraction

Browse Source
This commit is contained in:
Erez Volk 2019-12-24 15:31:20 +02:00
parent 04a93ac37a
commit 3ae0a780ab
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
test/test_subtitles.py
View File

@ -26,9 +26,9 @@ from youtube_dl.extractor import (
ThePlatformIE, ThePlatformIE,
ThePlatformFeedIE, ThePlatformFeedIE,
RTVEALaCartaIE, RTVEALaCartaIE,
FunnyOrDieIE,
DemocracynowIE, DemocracynowIE,
LinkedInLearningIE, LinkedInLearningIE,
VoxMediaIE,
) )
@ -337,8 +337,9 @@ class TestRtveSubtitles(BaseTestSubtitles):
class TestFunnyOrDieSubtitles(BaseTestSubtitles): class TestFunnyOrDieSubtitles(BaseTestSubtitles):
url = 'http://www.funnyordie.com/videos/224829ff6d/judd-apatow-will-direct-your-vine' url = 'http://www.funnyordie.com/videos/224829ff6d/judd-apatow-will-direct-your-vine'
IE = FunnyOrDieIE IE = VoxMediaIE
@unittest.skip('This stopped working.')
def test_allsubtitles(self): def test_allsubtitles(self):
self.DL.params['writesubtitles'] = True self.DL.params['writesubtitles'] = True
self.DL.params['allsubtitles'] = True self.DL.params['allsubtitles'] = True

6
youtube_dl/extractor/voxmedia.py
View File

@ -17,9 +17,9 @@ class VoxMediaVolumeIE(OnceIE):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id) webpage = self._download_webpage(url, video_id)
setup = self._parse_json(self._search_regex( setup_str = self._search_regex(r'setup\s*=\s*({.+});', webpage, 'setup')
r'setup\s*=\s*({.+});', webpage, 'setup'), video_id) setup = self._parse_json(setup_str, video_id)
video_data = setup.get('video') or {} video_data = setup.get('video') or setup.get('player_setup', {}).get('video') or {}
info = { info = {
'id': video_id, 'id': video_id,
'title': video_data.get('title_short'), 'title': video_data.get('title_short'),