projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[youtube] Fix controversy videos extraction (closes #14027, closes #14029)
[youtube-dl]
/
youtube_dl
/
extractor
/
viewlift.py
diff --git
a/youtube_dl/extractor/viewlift.py
b/youtube_dl/extractor/viewlift.py
index 19500eba84f1bf7b4fdf7c59b8b56ca7e5b91efc..1f29c273f814bcefbacc4678fe0079686adb1ea6 100644
(file)
--- a/
youtube_dl/extractor/viewlift.py
+++ b/
youtube_dl/extractor/viewlift.py
@@
-14,7
+14,7
@@
from ..utils import (
class ViewLiftBaseIE(InfoExtractor):
class ViewLiftBaseIE(InfoExtractor):
- _DOMAINS_REGEX = '(?:snagfilms|snagxtreme|funnyforfree|kiddovid|winnersview|monumentalsportsnetwork|vayafilm)\.com|kesari\.tv'
+ _DOMAINS_REGEX =
r
'(?:snagfilms|snagxtreme|funnyforfree|kiddovid|winnersview|monumentalsportsnetwork|vayafilm)\.com|kesari\.tv'
class ViewLiftEmbedIE(ViewLiftBaseIE):
class ViewLiftEmbedIE(ViewLiftBaseIE):
@@
-68,7
+68,7
@@
class ViewLiftEmbedIE(ViewLiftBaseIE):
type_ = source.get('type')
ext = determine_ext(file_)
format_id = source.get('label') or ext
type_ = source.get('type')
ext = determine_ext(file_)
format_id = source.get('label') or ext
- if all(v
== 'm3u8' or v == 'hls'
for v in (type_, ext)):
+ if all(v
in ('m3u8', 'hls')
for v in (type_, ext)):
formats.extend(self._extract_m3u8_formats(
file_, video_id, 'mp4', m3u8_id='hls'))
else:
formats.extend(self._extract_m3u8_formats(
file_, video_id, 'mp4', m3u8_id='hls'))
else:
@@
-110,7
+110,7
@@
class ViewLiftIE(ViewLiftBaseIE):
'ext': 'mp4',
'title': 'Lost for Life',
'description': 'md5:fbdacc8bb6b455e464aaf98bc02e1c82',
'ext': 'mp4',
'title': 'Lost for Life',
'description': 'md5:fbdacc8bb6b455e464aaf98bc02e1c82',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'duration': 4489,
'categories': ['Documentary', 'Crime', 'Award Winning', 'Festivals']
}
'duration': 4489,
'categories': ['Documentary', 'Crime', 'Award Winning', 'Festivals']
}
@@
-123,7
+123,7
@@
class ViewLiftIE(ViewLiftBaseIE):
'ext': 'mp4',
'title': 'India',
'description': 'md5:5c168c5a8f4719c146aad2e0dfac6f5f',
'ext': 'mp4',
'title': 'India',
'description': 'md5:5c168c5a8f4719c146aad2e0dfac6f5f',
- 'thumbnail': 're:^https?://.*\.jpg',
+ 'thumbnail':
r
're:^https?://.*\.jpg',
'duration': 979,
'categories': ['Documentary', 'Sports', 'Politics']
}
'duration': 979,
'categories': ['Documentary', 'Sports', 'Politics']
}
@@
-160,7
+160,7
@@
class ViewLiftIE(ViewLiftBaseIE):
snag = self._parse_json(
self._search_regex(
snag = self._parse_json(
self._search_regex(
- 'Snag\.page\.data\s*=\s*(\[.+?\]);', webpage, 'snag'),
+
r
'Snag\.page\.data\s*=\s*(\[.+?\]);', webpage, 'snag'),
display_id)
for item in snag:
display_id)
for item in snag: