projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
05c7fee
)
[nationalgeographic] add support Adobe Pass auth
author
Remita Amine
<remitamine@gmail.com>
Sat, 2 Jul 2016 20:22:08 +0000
(21:22 +0100)
committer
Remita Amine
<remitamine@gmail.com>
Sat, 2 Jul 2016 20:24:22 +0000
(21:24 +0100)
youtube_dl/extractor/nationalgeographic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/nationalgeographic.py
b/youtube_dl/extractor/nationalgeographic.py
index 72251866303885f6cd9b040ec9ad3f042d8add6a..ed76798aa6f85d4edaff439cad1cfed442e7f8f0 100644
(file)
--- a/
youtube_dl/extractor/nationalgeographic.py
+++ b/
youtube_dl/extractor/nationalgeographic.py
@@
-1,6
+1,7
@@
from __future__ import unicode_literals
from .common import InfoExtractor
from __future__ import unicode_literals
from .common import InfoExtractor
+from .theplatform import ThePlatformIE
from ..utils import (
smuggle_url,
url_basename,
from ..utils import (
smuggle_url,
url_basename,
@@
-61,7
+62,7
@@
class NationalGeographicIE(InfoExtractor):
}
}
-class NationalGeographicChannelIE(
InfoExtractor
):
+class NationalGeographicChannelIE(
ThePlatformIE
):
IE_NAME = 'natgeo:channel'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?[^/]+/videos/(?P<id>[^/?]+)'
IE_NAME = 'natgeo:channel'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?[^/]+/videos/(?P<id>[^/?]+)'
@@
-102,12
+103,22
@@
class NationalGeographicChannelIE(InfoExtractor):
release_url = self._search_regex(
r'video_auth_playlist_url\s*=\s*"([^"]+)"',
webpage, 'release url')
release_url = self._search_regex(
r'video_auth_playlist_url\s*=\s*"([^"]+)"',
webpage, 'release url')
+ query = {
+ 'mbr': 'true',
+ 'manifest': 'm3u',
+ }
+ is_auth = self._search_regex(r'video_is_auth\s*=\s*"([^"]+)"', webpage, 'is auth', fatal=False)
+ if is_auth == 'auth':
+ auth_resource_id = self._search_regex(
+ r"video_auth_resourceId\s*=\s*'([^']+)'",
+ webpage, 'auth resource id')
+ query['auth'] = self._extract_mvpd_auth(url, display_id, 'natgeo', auth_resource_id) or ''
return {
'_type': 'url_transparent',
'ie_key': 'ThePlatform',
'url': smuggle_url(
return {
'_type': 'url_transparent',
'ie_key': 'ThePlatform',
'url': smuggle_url(
- update_url_query(release_url,
{'mbr': 'true', 'switch': 'http'}
),
+ update_url_query(release_url,
query
),
{'force_smil_url': True}),
'display_id': display_id,
}
{'force_smil_url': True}),
'display_id': display_id,
}