[tele5] Prefer jwplatform over nexx (closes #25533)
This commit is contained in:
		
							parent
							
								
									b37e47a3f9
								
							
						
					
					
						commit
						0b1eaec3bc
					
				
					 1 changed files with 17 additions and 17 deletions
				
			
		| 
						 | 
					@ -6,14 +6,8 @@ import re
 | 
				
			||||||
from .common import InfoExtractor
 | 
					from .common import InfoExtractor
 | 
				
			||||||
from .jwplatform import JWPlatformIE
 | 
					from .jwplatform import JWPlatformIE
 | 
				
			||||||
from .nexx import NexxIE
 | 
					from .nexx import NexxIE
 | 
				
			||||||
from ..compat import (
 | 
					from ..compat import compat_urlparse
 | 
				
			||||||
    compat_str,
 | 
					from ..utils import NO_DEFAULT
 | 
				
			||||||
    compat_urlparse,
 | 
					 | 
				
			||||||
)
 | 
					 | 
				
			||||||
from ..utils import (
 | 
					 | 
				
			||||||
    NO_DEFAULT,
 | 
					 | 
				
			||||||
    try_get,
 | 
					 | 
				
			||||||
)
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
class Tele5IE(InfoExtractor):
 | 
					class Tele5IE(InfoExtractor):
 | 
				
			||||||
| 
						 | 
					@ -30,6 +24,21 @@ class Tele5IE(InfoExtractor):
 | 
				
			||||||
        'params': {
 | 
					        'params': {
 | 
				
			||||||
            'skip_download': True,
 | 
					            'skip_download': True,
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
 | 
					    }, {
 | 
				
			||||||
 | 
					        # jwplatform, nexx unavailable
 | 
				
			||||||
 | 
					        'url': 'https://www.tele5.de/filme/ghoul-das-geheimnis-des-friedhofmonsters/',
 | 
				
			||||||
 | 
					        'info_dict': {
 | 
				
			||||||
 | 
					            'id': 'WJuiOlUp',
 | 
				
			||||||
 | 
					            'ext': 'mp4',
 | 
				
			||||||
 | 
					            'upload_date': '20200603',
 | 
				
			||||||
 | 
					            'timestamp': 1591214400,
 | 
				
			||||||
 | 
					            'title': 'Ghoul - Das Geheimnis des Friedhofmonsters',
 | 
				
			||||||
 | 
					            'description': 'md5:42002af1d887ff3d5b2b3ca1f8137d97',
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        'params': {
 | 
				
			||||||
 | 
					            'skip_download': True,
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        'add_ie': [JWPlatformIE.ie_key()],
 | 
				
			||||||
    }, {
 | 
					    }, {
 | 
				
			||||||
        'url': 'https://www.tele5.de/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
 | 
					        'url': 'https://www.tele5.de/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
 | 
				
			||||||
        'only_matching': True,
 | 
					        'only_matching': True,
 | 
				
			||||||
| 
						 | 
					@ -88,15 +97,6 @@ class Tele5IE(InfoExtractor):
 | 
				
			||||||
            if not jwplatform_id:
 | 
					            if not jwplatform_id:
 | 
				
			||||||
                jwplatform_id = extract_id(JWPLATFORM_ID_RE, 'jwplatform id')
 | 
					                jwplatform_id = extract_id(JWPLATFORM_ID_RE, 'jwplatform id')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
            media = self._download_json(
 | 
					 | 
				
			||||||
                'https://cdn.jwplayer.com/v2/media/' + jwplatform_id,
 | 
					 | 
				
			||||||
                display_id)
 | 
					 | 
				
			||||||
            nexx_id = try_get(
 | 
					 | 
				
			||||||
                media, lambda x: x['playlist'][0]['nexx_id'], compat_str)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
            if nexx_id:
 | 
					 | 
				
			||||||
                return nexx_result(nexx_id)
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        return self.url_result(
 | 
					        return self.url_result(
 | 
				
			||||||
            'jwplatform:%s' % jwplatform_id, ie=JWPlatformIE.ie_key(),
 | 
					            'jwplatform:%s' % jwplatform_id, ie=JWPlatformIE.ie_key(),
 | 
				
			||||||
            video_id=jwplatform_id)
 | 
					            video_id=jwplatform_id)
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue