projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[byutv:event] Add extractor
[youtube-dl]
/
youtube_dl
/
extractor
/
nationalgeographic.py
diff --git
a/youtube_dl/extractor/nationalgeographic.py
b/youtube_dl/extractor/nationalgeographic.py
index 0027ff1b8d33e2bf67b20ca9201a6e3ee85736a9..1dcf27afef331ceb3b09d6ade66cde65e92e3cd6 100644
(file)
--- a/
youtube_dl/extractor/nationalgeographic.py
+++ b/
youtube_dl/extractor/nationalgeographic.py
@@
-3,7
+3,7
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
-from .
theplatform import ThePlatform
IE
+from .
adobepass import AdobePass
IE
from ..utils import (
smuggle_url,
url_basename,
from ..utils import (
smuggle_url,
url_basename,
@@
-65,7
+65,7
@@
class NationalGeographicVideoIE(InfoExtractor):
}
}
-class NationalGeographicIE(
ThePlatform
IE):
+class NationalGeographicIE(
AdobePass
IE):
IE_NAME = 'natgeo'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?[^/]+/(?:videos|episodes)/(?P<id>[^/?]+)'
IE_NAME = 'natgeo'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?[^/]+/(?:videos|episodes)/(?P<id>[^/?]+)'
@@
-119,7
+119,7
@@
class NationalGeographicIE(ThePlatformIE):
auth_resource_id = self._search_regex(
r"video_auth_resourceId\s*=\s*'([^']+)'",
webpage, 'auth resource id')
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 ''
+ query['auth'] = self._extract_mvpd_auth(url, display_id, 'natgeo', auth_resource_id)
return {
'_type': 'url_transparent',
return {
'_type': 'url_transparent',
@@
-131,7
+131,7
@@
class NationalGeographicIE(ThePlatformIE):
}
}
-class NationalGeographicEpisodeGuideIE(
ThePlatformIE
):
+class NationalGeographicEpisodeGuideIE(
InfoExtractor
):
IE_NAME = 'natgeo:episodeguide'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?(?P<id>[^/]+)/episode-guide'
_TESTS = [
IE_NAME = 'natgeo:episodeguide'
_VALID_URL = r'https?://channel\.nationalgeographic\.com/(?:wild/)?(?P<id>[^/]+)/episode-guide'
_TESTS = [