aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl
diff options
context:
space:
mode:
authorEnes <enessolak99@gmail.com>2018-06-01 20:16:22 +0300
committerSergey M <dstftw@gmail.com>2018-06-02 00:16:22 +0700
commit85750f897293b5a56e6be521f8b0be3eec082899 (patch)
tree16390d25bf14ce611ebe13af04ee90652f5e3c7f /youtube_dl
parent926d97fc6b018a25ea777dfcfb9a84a10920c2b7 (diff)
[openload] Improve ext extraction
Diffstat (limited to 'youtube_dl')
-rw-r--r--youtube_dl/extractor/openload.py7
-rw-r--r--youtube_dl/utils.py2
2 files changed, 6 insertions, 3 deletions
diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py
index 702f86b44..d264fe206 100644
--- a/youtube_dl/extractor/openload.py
+++ b/youtube_dl/extractor/openload.py
@@ -307,6 +307,10 @@ class OpenloadIE(InfoExtractor):
}, {
'url': 'https://oload.download/f/kUEfGclsU9o',
'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'
@@ -368,8 +372,7 @@ class OpenloadIE(InfoExtractor):
'title': title,
'thumbnail': entry.get('thumbnail') or self._og_search_thumbnail(webpage, default=None),
'url': video_url,
- # Seems all videos have extensions in their titles
- 'ext': determine_ext(title, 'mp4'),
+ 'ext': determine_ext(title, None) or determine_ext(url, 'mp4'),
'subtitles': subtitles,
'http_headers': headers,
}
diff --git a/youtube_dl/utils.py b/youtube_dl/utils.py
index 63f24c0b6..6a3199fb9 100644
--- a/youtube_dl/utils.py
+++ b/youtube_dl/utils.py
@@ -1228,7 +1228,7 @@ def unified_timestamp(date_str, day_first=True):
def determine_ext(url, default_ext='unknown_video'):
- if url is None:
+ if url is None or '.' not in url:
return default_ext
guess = url.partition('?')[0].rpartition('.')[2]
if re.match(r'^[A-Za-z0-9]+$', guess):