mirror of
				https://code.hackerspace.pl/q3k/youtube-dl
				synced 2025-03-16 11:43:02 +00:00 
			
		
		
		
	[dropbox] Recognize 'https://www.dropbox.com/sh/*' urls (fixes #3795)
And extract the title from the url last path component.
This commit is contained in:
		
							parent
							
								
									522c55b7f2
								
							
						
					
					
						commit
						7bd4b4229a
					
				| @ -5,24 +5,29 @@ import os.path | |||||||
| import re | import re | ||||||
| 
 | 
 | ||||||
| from .common import InfoExtractor | from .common import InfoExtractor | ||||||
| from ..utils import compat_urllib_parse_unquote | from ..utils import compat_urllib_parse_unquote, url_basename | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
| class DropboxIE(InfoExtractor): | class DropboxIE(InfoExtractor): | ||||||
|     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/s/(?P<id>[a-zA-Z0-9]{15})/(?P<title>[^?#]*)' |     _VALID_URL = r'https?://(?:www\.)?dropbox[.]com/sh?/(?P<id>[a-zA-Z0-9]{15})/.*' | ||||||
|     _TEST = { |     _TESTS = [{ | ||||||
|         'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0', |         'url': 'https://www.dropbox.com/s/nelirfsxnmcfbfh/youtube-dl%20test%20video%20%27%C3%A4%22BaW_jenozKc.mp4?dl=0', | ||||||
|         'info_dict': { |         'info_dict': { | ||||||
|             'id': 'nelirfsxnmcfbfh', |             'id': 'nelirfsxnmcfbfh', | ||||||
|             'ext': 'mp4', |             'ext': 'mp4', | ||||||
|             'title': 'youtube-dl test video \'ä"BaW_jenozKc' |             'title': 'youtube-dl test video \'ä"BaW_jenozKc' | ||||||
|         } |         } | ||||||
|     } |     }, | ||||||
|  |     { | ||||||
|  |         'url': 'https://www.dropbox.com/sh/662glsejgzoj9sr/AAByil3FGH9KFNZ13e08eSa1a/Pregame%20Ceremony%20Program%20PA%2020140518.m4v', | ||||||
|  |         'only_matching': True, | ||||||
|  |     }, | ||||||
|  |     ] | ||||||
| 
 | 
 | ||||||
|     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') | ||||||
|         fn = compat_urllib_parse_unquote(mobj.group('title')) |         fn = compat_urllib_parse_unquote(url_basename(url)) | ||||||
|         title = os.path.splitext(fn)[0] |         title = os.path.splitext(fn)[0] | ||||||
|         video_url = ( |         video_url = ( | ||||||
|             re.sub(r'[?&]dl=0', '', url) + |             re.sub(r'[?&]dl=0', '', url) + | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user
	 Jaime Marquínez Ferrándiz
						Jaime Marquínez Ferrándiz