mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-04 05:17:06 -05:00 
			
		
		
		
	[vshare] Fix extraction (closes #14473)
This commit is contained in:
		@@ -102,6 +102,7 @@ from .joj import JojIE
 | 
			
		||||
from .megaphone import MegaphoneIE
 | 
			
		||||
from .vzaar import VzaarIE
 | 
			
		||||
from .channel9 import Channel9IE
 | 
			
		||||
from .vshare import VShareIE
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
class GenericIE(InfoExtractor):
 | 
			
		||||
@@ -1921,6 +1922,16 @@ class GenericIE(InfoExtractor):
 | 
			
		||||
                'title': 'Rescue Kit 14 Free Edition - Getting started',
 | 
			
		||||
            },
 | 
			
		||||
            'playlist_count': 4,
 | 
			
		||||
        },
 | 
			
		||||
        {
 | 
			
		||||
            # vshare embed
 | 
			
		||||
            'url': 'https://youtube-dl-demo.neocities.org/vshare.html',
 | 
			
		||||
            'md5': '17b39f55b5497ae8b59f5fbce8e35886',
 | 
			
		||||
            'info_dict': {
 | 
			
		||||
                'id': '0f64ce6',
 | 
			
		||||
                'title': 'vl14062007715967',
 | 
			
		||||
                'ext': 'mp4',
 | 
			
		||||
            }
 | 
			
		||||
        }
 | 
			
		||||
        # {
 | 
			
		||||
        #     # TODO: find another test
 | 
			
		||||
@@ -2879,6 +2890,11 @@ class GenericIE(InfoExtractor):
 | 
			
		||||
            return self.playlist_from_matches(
 | 
			
		||||
                channel9_urls, video_id, video_title, ie=Channel9IE.ie_key())
 | 
			
		||||
 | 
			
		||||
        vshare_urls = VShareIE._extract_urls(webpage)
 | 
			
		||||
        if vshare_urls:
 | 
			
		||||
            return self.playlist_from_matches(
 | 
			
		||||
                vshare_urls, video_id, video_title, ie=VShareIE.ie_key())
 | 
			
		||||
 | 
			
		||||
        def merge_dicts(dict1, dict2):
 | 
			
		||||
            merged = {}
 | 
			
		||||
            for k, v in dict1.items():
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user