mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 02:07:07 -05:00 
			
		
		
		
	[eporner] Extract JSON-LD (closes #17519)
This commit is contained in:
		@@ -9,6 +9,7 @@ from ..utils import (
 | 
			
		||||
    encode_base_n,
 | 
			
		||||
    ExtractorError,
 | 
			
		||||
    int_or_none,
 | 
			
		||||
    merge_dicts,
 | 
			
		||||
    parse_duration,
 | 
			
		||||
    str_to_int,
 | 
			
		||||
    url_or_none,
 | 
			
		||||
@@ -25,10 +26,16 @@ class EpornerIE(InfoExtractor):
 | 
			
		||||
            'display_id': 'Infamous-Tiffany-Teen-Strip-Tease-Video',
 | 
			
		||||
            'ext': 'mp4',
 | 
			
		||||
            'title': 'Infamous Tiffany Teen Strip Tease Video',
 | 
			
		||||
            'description': 'md5:764f39abf932daafa37485eb46efa152',
 | 
			
		||||
            'timestamp': 1232520922,
 | 
			
		||||
            'upload_date': '20090121',
 | 
			
		||||
            'duration': 1838,
 | 
			
		||||
            'view_count': int,
 | 
			
		||||
            'age_limit': 18,
 | 
			
		||||
        },
 | 
			
		||||
        'params': {
 | 
			
		||||
            'proxy': '127.0.0.1:8118'
 | 
			
		||||
        }
 | 
			
		||||
    }, {
 | 
			
		||||
        # New (May 2016) URL layout
 | 
			
		||||
        'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0/Star-Wars-XXX-Parody/',
 | 
			
		||||
@@ -104,12 +111,15 @@ class EpornerIE(InfoExtractor):
 | 
			
		||||
                    })
 | 
			
		||||
        self._sort_formats(formats)
 | 
			
		||||
 | 
			
		||||
        duration = parse_duration(self._html_search_meta('duration', webpage))
 | 
			
		||||
        json_ld = self._search_json_ld(webpage, display_id, default={})
 | 
			
		||||
 | 
			
		||||
        duration = parse_duration(self._html_search_meta(
 | 
			
		||||
            'duration', webpage, default=None))
 | 
			
		||||
        view_count = str_to_int(self._search_regex(
 | 
			
		||||
            r'id="cinemaviews">\s*([0-9,]+)\s*<small>views',
 | 
			
		||||
            webpage, 'view count', fatal=False))
 | 
			
		||||
 | 
			
		||||
        return {
 | 
			
		||||
        return merge_dicts(json_ld, {
 | 
			
		||||
            'id': video_id,
 | 
			
		||||
            'display_id': display_id,
 | 
			
		||||
            'title': title,
 | 
			
		||||
@@ -117,4 +127,4 @@ class EpornerIE(InfoExtractor):
 | 
			
		||||
            'view_count': view_count,
 | 
			
		||||
            'formats': formats,
 | 
			
		||||
            'age_limit': 18,
 | 
			
		||||
        }
 | 
			
		||||
        })
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user