Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-12 01:20:01 +08:00
Code Issues Releases Wiki Activity

[openload] improvement for determinating file extension

Browse Source
This commit is contained in:
Enes 2018-06-01 01:05:41 +03:00
parent 99036a1298
commit 85c99fbc70
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
youtube_dl/extractor/openload.py
View File

@ -301,6 +301,10 @@ class OpenloadIE(InfoExtractor):
}, { }, {
'url': 'https://oload.xyz/f/WwRBpzW8Wtk', 'url': 'https://oload.xyz/f/WwRBpzW8Wtk',
'only_matching': True, 'only_matching': True,
}, {
# Its title has not got its extension but url has it
'url': 'https://oload.download/f/N4Otkw39VCw/Tomb.Raider.2018.HDRip.XviD.AC3-EVO.avi.mp4',
'only_matching': True,
}] }]
_USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36' _USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36'
@ -354,13 +358,19 @@ class OpenloadIE(InfoExtractor):
entry = entries[0] if entries else {} entry = entries[0] if entries else {}
subtitles = entry.get('subtitles') subtitles = entry.get('subtitles')
# Some videos have special name and some of these
# have not got their extension on their title
# If url has their file name, it has always its extension
video_ext = determine_ext(title, None)
if video_ext is None:
video_ext = determine_ext(url, 'mp4')
info_dict = { info_dict = {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'thumbnail': entry.get('thumbnail') or self._og_search_thumbnail(webpage, default=None), 'thumbnail': entry.get('thumbnail') or self._og_search_thumbnail(webpage, default=None),
'url': video_url, 'url': video_url,
# Seems all videos have extensions in their titles 'ext': video_ext,
'ext': determine_ext(title, 'mp4'),
'subtitles': subtitles, 'subtitles': subtitles,
'http_headers': headers, 'http_headers': headers,
} }

2
youtube_dl/utils.py
View File

@ -1228,7 +1228,7 @@ def unified_timestamp(date_str, day_first=True):
def determine_ext(url, default_ext='unknown_video'): def determine_ext(url, default_ext='unknown_video'):
if url is None: if url is None or '.' not in url:
return default_ext return default_ext
guess = url.partition('?')[0].rpartition('.')[2] guess = url.partition('?')[0].rpartition('.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess): if re.match(r'^[A-Za-z0-9]+$', guess):