projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
974739a
)
[cnn] Improve regexes and fix test
author
Sergey M․
<dstftw@gmail.com>
Mon, 29 Dec 2014 14:27:09 +0000
(20:27 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 29 Dec 2014 14:27:09 +0000
(20:27 +0600)
youtube_dl/extractor/cnn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/cnn.py
b/youtube_dl/extractor/cnn.py
index cddcacdf1173c4b5fbfa1dc0ae69ef03cfe5e265..1bff005d64ff72f00f0cd85871df2ee1c79c236b 100644
(file)
--- a/
youtube_dl/extractor/cnn.py
+++ b/
youtube_dl/extractor/cnn.py
@@
-11,14
+11,14
@@
from ..utils import (
class CNNIE(InfoExtractor):
class CNNIE(InfoExtractor):
- _VALID_URL = r'''(?x)https?://(
(edition|www)\.)?cnn\.com/video/(
data/.+?|\?)/
- (?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn(-ap)?|(?=&)))'''
+ _VALID_URL = r'''(?x)https?://(
?:(?:edition|www)\.)?cnn\.com/video/(?:
data/.+?|\?)/
+ (?P<path>.+?/(?P<title>[^/]+?)(?:\.cnn(
?:
-ap)?|(?=&)))'''
_TESTS = [{
'url': 'http://edition.cnn.com/video/?/video/sports/2013/06/09/nadal-1-on-1.cnn',
'md5': '3e6121ea48df7e2259fe73a0628605c4',
'info_dict': {
_TESTS = [{
'url': 'http://edition.cnn.com/video/?/video/sports/2013/06/09/nadal-1-on-1.cnn',
'md5': '3e6121ea48df7e2259fe73a0628605c4',
'info_dict': {
- 'id': 'sports
_2013_06_09_
nadal-1-on-1.cnn',
+ 'id': 'sports
/2013/06/09/
nadal-1-on-1.cnn',
'ext': 'mp4',
'title': 'Nadal wins 8th French Open title',
'description': 'World Sport\'s Amanda Davies chats with 2013 French Open champion Rafael Nadal.',
'ext': 'mp4',
'title': 'Nadal wins 8th French Open title',
'description': 'World Sport\'s Amanda Davies chats with 2013 French Open champion Rafael Nadal.',
@@
-130,7
+130,7
@@
class CNNBlogsIE(InfoExtractor):
class CNNArticleIE(InfoExtractor):
class CNNArticleIE(InfoExtractor):
- _VALID_URL = r'https?://(
(
edition|www)\.)?cnn\.com/(?!video/)'
+ _VALID_URL = r'https?://(
?:(?:
edition|www)\.)?cnn\.com/(?!video/)'
_TEST = {
'url': 'http://www.cnn.com/2014/12/21/politics/obama-north-koreas-hack-not-war-but-cyber-vandalism/',
'md5': '275b326f85d80dff7592a9820f5dc887',
_TEST = {
'url': 'http://www.cnn.com/2014/12/21/politics/obama-north-koreas-hack-not-war-but-cyber-vandalism/',
'md5': '275b326f85d80dff7592a9820f5dc887',
@@
-149,6
+149,6
@@
class CNNArticleIE(InfoExtractor):
cnn_url = self._html_search_regex(r"video:\s*'([^']+)'", webpage, 'cnn url')
return {
'_type': 'url',
cnn_url = self._html_search_regex(r"video:\s*'([^']+)'", webpage, 'cnn url')
return {
'_type': 'url',
- 'url':
r
'http://cnn.com/video/?/video/' + cnn_url,
+ 'url': 'http://cnn.com/video/?/video/' + cnn_url,
'ie_key': CNNIE.ie_key(),
}
'ie_key': CNNIE.ie_key(),
}