mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 18:47:06 -05:00 
			
		
		
		
	[screencastomatic] Fix extraction (Closes #9136)
This commit is contained in:
		@@ -1,15 +1,11 @@
 | 
			
		||||
# coding: utf-8
 | 
			
		||||
from __future__ import unicode_literals
 | 
			
		||||
 | 
			
		||||
from .common import InfoExtractor
 | 
			
		||||
from ..compat import compat_urlparse
 | 
			
		||||
from ..utils import (
 | 
			
		||||
    ExtractorError,
 | 
			
		||||
    js_to_json,
 | 
			
		||||
)
 | 
			
		||||
from .jwplatform import JWPlatformBaseIE
 | 
			
		||||
from ..utils import js_to_json
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class ScreencastOMaticIE(InfoExtractor):
 | 
			
		||||
class ScreencastOMaticIE(JWPlatformBaseIE):
 | 
			
		||||
    _VALID_URL = r'https?://screencast-o-matic\.com/watch/(?P<id>[0-9a-zA-Z]+)'
 | 
			
		||||
    _TEST = {
 | 
			
		||||
        'url': 'http://screencast-o-matic.com/watch/c2lD3BeOPl',
 | 
			
		||||
@@ -27,23 +23,14 @@ class ScreencastOMaticIE(InfoExtractor):
 | 
			
		||||
        video_id = self._match_id(url)
 | 
			
		||||
        webpage = self._download_webpage(url, video_id)
 | 
			
		||||
 | 
			
		||||
        setup_js = self._search_regex(
 | 
			
		||||
            r"(?s)jwplayer\('mp4Player'\).setup\((\{.*?\})\);",
 | 
			
		||||
            webpage, 'setup code')
 | 
			
		||||
        data = self._parse_json(setup_js, video_id, transform_source=js_to_json)
 | 
			
		||||
        try:
 | 
			
		||||
            video_data = next(
 | 
			
		||||
                m for m in data['modes'] if m.get('type') == 'html5')
 | 
			
		||||
        except StopIteration:
 | 
			
		||||
            raise ExtractorError('Could not find any video entries!')
 | 
			
		||||
        video_url = compat_urlparse.urljoin(url, video_data['config']['file'])
 | 
			
		||||
        thumbnail = data.get('image')
 | 
			
		||||
        jwplayer_data = self._parse_json(
 | 
			
		||||
            self._search_regex(
 | 
			
		||||
                r"(?s)jwplayer\('mp4Player'\).setup\((\{.*?\})\);", webpage, 'setup code'),
 | 
			
		||||
            video_id, transform_source=js_to_json)
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
            'id': video_id,
 | 
			
		||||
        info_dict = self._parse_jwplayer_data(jwplayer_data, video_id, require_title=False)
 | 
			
		||||
        info_dict.update({
 | 
			
		||||
            'title': self._og_search_title(webpage),
 | 
			
		||||
            'description': self._og_search_description(webpage),
 | 
			
		||||
            'url': video_url,
 | 
			
		||||
            'ext': 'mp4',
 | 
			
		||||
            'thumbnail': thumbnail,
 | 
			
		||||
        }
 | 
			
		||||
        })
 | 
			
		||||
        return info_dict
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user