projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
77d9567
)
[ciscolive] Add support for new URL schema (closes #20320, #20351)
author
Austin de Coup-Crank
<austindcc@gmail.com>
Sun, 17 Mar 2019 00:18:54 +0000
(17:18 -0700)
committer
Sergey M
<dstftw@gmail.com>
Sun, 17 Mar 2019 00:18:54 +0000
(07:18 +0700)
youtube_dl/extractor/ciscolive.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/ciscolive.py
b/youtube_dl/extractor/ciscolive.py
index c99b6ee5818fe935ed75b6aedeaf060b161155c0..da404e4dc57b997834a61d217b39e84d497db173 100644
(file)
--- a/
youtube_dl/extractor/ciscolive.py
+++ b/
youtube_dl/extractor/ciscolive.py
@@
-65,8
+65,8
@@
class CiscoLiveBaseIE(InfoExtractor):
class CiscoLiveSessionIE(CiscoLiveBaseIE):
class CiscoLiveSessionIE(CiscoLiveBaseIE):
- _VALID_URL = r'https?://
ciscolive\.cisco\.com/on-demand-library/\??
[^#]*#/session/(?P<id>[^/?&]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://
(?:www\.)?ciscolive(?:\.cisco)?\.com/
[^#]*#/session/(?P<id>[^/?&]+)'
+ _TEST
S = [
{
'url': 'https://ciscolive.cisco.com/on-demand-library/?#/session/1423353499155001FoSs',
'md5': 'c98acf395ed9c9f766941c70f5352e22',
'info_dict': {
'url': 'https://ciscolive.cisco.com/on-demand-library/?#/session/1423353499155001FoSs',
'md5': 'c98acf395ed9c9f766941c70f5352e22',
'info_dict': {
@@
-79,7
+79,13
@@
class CiscoLiveSessionIE(CiscoLiveBaseIE):
'uploader_id': '5647924234001',
'location': '16B Mezz.',
},
'uploader_id': '5647924234001',
'location': '16B Mezz.',
},
- }
+ }, {
+ 'url': 'https://www.ciscolive.com/global/on-demand-library.html?search.event=ciscoliveemea2019#/session/15361595531500013WOU',
+ 'only_matching': True,
+ }, {
+ 'url': 'https://www.ciscolive.com/global/on-demand-library.html?#/session/1490051371645001kNaS',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
rf_id = self._match_id(url)
def _real_extract(self, url):
rf_id = self._match_id(url)
@@
-88,7
+94,7
@@
class CiscoLiveSessionIE(CiscoLiveBaseIE):
class CiscoLiveSearchIE(CiscoLiveBaseIE):
class CiscoLiveSearchIE(CiscoLiveBaseIE):
- _VALID_URL = r'https?://
ciscolive\.cisco\.com/on-demand-library/
'
+ _VALID_URL = r'https?://
(?:www\.)?ciscolive(?:\.cisco)?\.com/(?:global/)?on-demand-library(?:\.html|/)
'
_TESTS = [{
'url': 'https://ciscolive.cisco.com/on-demand-library/?search.event=ciscoliveus2018&search.technicallevel=scpsSkillLevel_aintroductory&search.focus=scpsSessionFocus_designAndDeployment#/',
'info_dict': {
_TESTS = [{
'url': 'https://ciscolive.cisco.com/on-demand-library/?search.event=ciscoliveus2018&search.technicallevel=scpsSkillLevel_aintroductory&search.focus=scpsSessionFocus_designAndDeployment#/',
'info_dict': {
@@
-98,6
+104,9
@@
class CiscoLiveSearchIE(CiscoLiveBaseIE):
}, {
'url': 'https://ciscolive.cisco.com/on-demand-library/?search.technology=scpsTechnology_applicationDevelopment&search.technology=scpsTechnology_ipv6&search.focus=scpsSessionFocus_troubleshootingTroubleshooting#/',
'only_matching': True,
}, {
'url': 'https://ciscolive.cisco.com/on-demand-library/?search.technology=scpsTechnology_applicationDevelopment&search.technology=scpsTechnology_ipv6&search.focus=scpsSessionFocus_troubleshootingTroubleshooting#/',
'only_matching': True,
+ }, {
+ 'url': 'https://www.ciscolive.com/global/on-demand-library.html?search.technicallevel=scpsSkillLevel_aintroductory&search.event=ciscoliveemea2019&search.technology=scpsTechnology_dataCenter&search.focus=scpsSessionFocus_bestPractices#/',
+ 'only_matching': True,
}]
@classmethod
}]
@classmethod