mirror of
				https://github.com/yt-dlp/yt-dlp.git
				synced 2025-11-04 08:35:12 +00:00 
			
		
		
		
	[dbtv] Simplify, modernize, extract all formats
This commit is contained in:
		@@ -4,73 +4,71 @@ from __future__ import unicode_literals
 | 
				
			|||||||
import re
 | 
					import re
 | 
				
			||||||
 | 
					
 | 
				
			||||||
from .common import InfoExtractor
 | 
					from .common import InfoExtractor
 | 
				
			||||||
 | 
					 | 
				
			||||||
from ..utils import (
 | 
					from ..utils import (
 | 
				
			||||||
  ExtractorError
 | 
					    float_or_none,
 | 
				
			||||||
 | 
					    int_or_none,
 | 
				
			||||||
 | 
					    clean_html,
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class DBTVIE(InfoExtractor):
 | 
					class DBTVIE(InfoExtractor):
 | 
				
			||||||
  _VALID_URL = r'http://dbtv.no/(?P<id>[0-9]+)/?(?P<slug>.*)$'
 | 
					    _VALID_URL = r'http://dbtv\.no/(?P<id>[0-9]+)#(?P<display_id>.+)'
 | 
				
			||||||
    _TEST = {
 | 
					    _TEST = {
 | 
				
			||||||
        'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
 | 
					        'url': 'http://dbtv.no/3649835190001#Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
 | 
				
			||||||
        'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc',
 | 
					        'md5': 'b89953ed25dacb6edb3ef6c6f430f8bc',
 | 
				
			||||||
        'info_dict': {
 | 
					        'info_dict': {
 | 
				
			||||||
      'id': '3649835190001',
 | 
					            'id': '33100',
 | 
				
			||||||
 | 
					            'display_id': 'Skulle_teste_ut_fornøyelsespark,_men_kollegaen_var_bare_opptatt_av_bikinikroppen',
 | 
				
			||||||
            'ext': 'mp4',
 | 
					            'ext': 'mp4',
 | 
				
			||||||
            'title': 'Skulle teste ut fornøyelsespark, men kollegaen var bare opptatt av bikinikroppen',
 | 
					            'title': 'Skulle teste ut fornøyelsespark, men kollegaen var bare opptatt av bikinikroppen',
 | 
				
			||||||
      'description': 'md5:d681bf2bb7dd3503892cedb9c2d0e6f2',
 | 
					            'description': 'md5:1504a54606c4dde3e4e61fc97aa857e0',
 | 
				
			||||||
      'thumbnail': 'http://gfx.dbtv.no/thumbs/still/33100.jpg',
 | 
					            'thumbnail': 're:https?://.*\.jpg$',
 | 
				
			||||||
      'timestamp': 1404039863,
 | 
					            'timestamp': 1404039863.438,
 | 
				
			||||||
            'upload_date': '20140629',
 | 
					            'upload_date': '20140629',
 | 
				
			||||||
      'duration': 69544,
 | 
					            'duration': 69.544,
 | 
				
			||||||
 | 
					            'view_count': int,
 | 
				
			||||||
 | 
					            'categories': list,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
    }
 | 
					    }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def _real_extract(self, url):
 | 
					    def _real_extract(self, url):
 | 
				
			||||||
        mobj = re.match(self._VALID_URL, url)
 | 
					        mobj = re.match(self._VALID_URL, url)
 | 
				
			||||||
        video_id = mobj.group('id')
 | 
					        video_id = mobj.group('id')
 | 
				
			||||||
 | 
					        display_id = mobj.group('display_id')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        data = self._download_json(
 | 
				
			||||||
 | 
					            'http://api.dbtv.no/discovery/%s' % video_id, display_id)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Download JSON file containing video info.
 | 
					 | 
				
			||||||
    data = self._download_json('http://api.dbtv.no/discovery/%s' % video_id, video_id, 'Downloading media JSON')
 | 
					 | 
				
			||||||
    # We only want the first video in the JSON API file.
 | 
					 | 
				
			||||||
        video = data['playlist'][0]
 | 
					        video = data['playlist'][0]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Check for full HD video, else use the standard video URL
 | 
					        formats = [{
 | 
				
			||||||
    for i in range(0, len(video['renditions'])):
 | 
					            'url': f['URL'],
 | 
				
			||||||
      if int(video['renditions'][i]['width']) == 1280:
 | 
					            'vcodec': f.get('container'),
 | 
				
			||||||
        video_url = video['renditions'][i]['URL']
 | 
					            'width': int_or_none(f.get('width')),
 | 
				
			||||||
        break
 | 
					            'height': int_or_none(f.get('height')),
 | 
				
			||||||
      else:
 | 
					            'vbr': float_or_none(f.get('rate'), 1000),
 | 
				
			||||||
        video_url = video['URL']
 | 
					            'filesize': int_or_none(f.get('size')),
 | 
				
			||||||
 | 
					        } for f in video['renditions'] if 'URL' in f]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    # Add access token to image or it will fail.
 | 
					        if not formats:
 | 
				
			||||||
    thumbnail = video['splash']
 | 
					            for url_key, format_id in [('URL', 'mp4'), ('HLSURL', 'hls')]:
 | 
				
			||||||
 | 
					                if url_key in video:
 | 
				
			||||||
    # Duration int.
 | 
					 | 
				
			||||||
    duration = int(video['length'])
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    # Timestamp is given in milliseconds.
 | 
					 | 
				
			||||||
    timestamp = float(str(video['publishedAt'])[0:-3])
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    formats = []
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
    # Video URL.
 | 
					 | 
				
			||||||
    if video['URL'] is not None:
 | 
					 | 
				
			||||||
                    formats.append({
 | 
					                    formats.append({
 | 
				
			||||||
        'url': video_url,
 | 
					                        'url': video[url_key],
 | 
				
			||||||
        'format_id': 'mp4',
 | 
					                        'format_id': format_id,
 | 
				
			||||||
        'ext': 'mp4'
 | 
					 | 
				
			||||||
                    })
 | 
					                    })
 | 
				
			||||||
    else:
 | 
					
 | 
				
			||||||
      raise ExtractorError('No download URL found for video: %s.' % video_id, expected=True)
 | 
					        self._sort_formats(formats)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        return {
 | 
					        return {
 | 
				
			||||||
      'id': video_id,
 | 
					            'id': video['id'],
 | 
				
			||||||
 | 
					            'display_id': display_id,
 | 
				
			||||||
            'title': video['title'],
 | 
					            'title': video['title'],
 | 
				
			||||||
      'description': video['desc'],
 | 
					            'description': clean_html(video['desc']),
 | 
				
			||||||
      'thumbnail': thumbnail,
 | 
					            'thumbnail': video.get('splash') or video.get('thumb'),
 | 
				
			||||||
      'timestamp': timestamp,
 | 
					            'timestamp': float_or_none(video.get('publishedAt'), 1000),
 | 
				
			||||||
      'duration': duration,
 | 
					            'duration': float_or_none(video.get('length'), 1000),
 | 
				
			||||||
      'view_count': video['views'],
 | 
					            'view_count': int_or_none(video.get('views')),
 | 
				
			||||||
 | 
					            'categories': video.get('tags'),
 | 
				
			||||||
            'formats': formats,
 | 
					            'formats': formats,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user