projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix "invalid escape sequences" error on Python 3.6
[youtube-dl]
/
youtube_dl
/
extractor
/
einthusan.py
diff --git
a/youtube_dl/extractor/einthusan.py
b/youtube_dl/extractor/einthusan.py
index f7339702cad3ed2804fe276b9d1fc6857c368206..6ca07a13d736b3909269aa1314d6e868150f8aa0 100644
(file)
--- a/
youtube_dl/extractor/einthusan.py
+++ b/
youtube_dl/extractor/einthusan.py
@@
-14,24
+14,24
@@
class EinthusanIE(InfoExtractor):
_TESTS = [
{
'url': 'http://www.einthusan.com/movies/watch.php?id=2447',
_TESTS = [
{
'url': 'http://www.einthusan.com/movies/watch.php?id=2447',
- 'md5': '
af244f4458cd667205e513d75da5b8b
1',
+ 'md5': '
d71379996ff5b7f217eca034c34e346
1',
'info_dict': {
'id': '2447',
'ext': 'mp4',
'title': 'Ek Villain',
'info_dict': {
'id': '2447',
'ext': 'mp4',
'title': 'Ek Villain',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
'description': 'md5:9d29fc91a7abadd4591fb862fa560d93',
}
},
{
'url': 'http://www.einthusan.com/movies/watch.php?id=1671',
'description': 'md5:9d29fc91a7abadd4591fb862fa560d93',
}
},
{
'url': 'http://www.einthusan.com/movies/watch.php?id=1671',
- 'md5': '
ef63c7a803e22315880ed182c10d1c5c
',
+ 'md5': '
b16a6fd3c67c06eb7c79c8a8615f4213
',
'info_dict': {
'id': '1671',
'ext': 'mp4',
'title': 'Soodhu Kavvuum',
'info_dict': {
'id': '1671',
'ext': 'mp4',
'title': 'Soodhu Kavvuum',
- 'thumbnail': 're:^https?://.*\.jpg$',
- 'description': 'md5:
05d8a0c0281a4240d86d76e14f2f4d51
',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
+ 'description': 'md5:
b40f2bf7320b4f9414f3780817b2af8c
',
}
},
]
}
},
]
@@
-50,9
+50,11
@@
class EinthusanIE(InfoExtractor):
video_id = self._search_regex(
r'data-movieid=["\'](\d+)', webpage, 'video id', default=video_id)
video_id = self._search_regex(
r'data-movieid=["\'](\d+)', webpage, 'video id', default=video_id)
-
video
_url = self._download_webpage(
+
m3u8
_url = self._download_webpage(
'http://cdn.einthusan.com/geturl/%s/hd/London,Washington,Toronto,Dallas,San,Sydney/'
'http://cdn.einthusan.com/geturl/%s/hd/London,Washington,Toronto,Dallas,San,Sydney/'
- % video_id, video_id)
+ % video_id, video_id, headers={'Referer': url})
+ formats = self._extract_m3u8_formats(
+ m3u8_url, video_id, ext='mp4', entry_protocol='m3u8_native')
description = self._html_search_meta('description', webpage)
thumbnail = self._html_search_regex(
description = self._html_search_meta('description', webpage)
thumbnail = self._html_search_regex(
@@
-64,7
+66,7
@@
class EinthusanIE(InfoExtractor):
return {
'id': video_id,
'title': title,
return {
'id': video_id,
'title': title,
- '
url': video_url
,
+ '
formats': formats
,
'thumbnail': thumbnail,
'description': description,
}
'thumbnail': thumbnail,
'description': description,
}