projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ba55168
)
[generic] Add support for Cinerama player (Fixes #4752)
author
Philipp Hagemeister
<phihag@phihag.de>
Fri, 23 Jan 2015 11:00:25 +0000
(12:00 +0100)
committer
Philipp Hagemeister
<phihag@phihag.de>
Fri, 23 Jan 2015 11:00:25 +0000
(12:00 +0100)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index b893d8149f2c63e081341d2dec2d71ba05f3e64c..a028c4ed4e47a780a3a2f04e03a37997af003e4e 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-489,6
+489,16
@@
class GenericIE(InfoExtractor):
'title': 'Jack Tips: 5 Steps to Permanent Gut Healing',
}
},
'title': 'Jack Tips: 5 Steps to Permanent Gut Healing',
}
},
+ # Cinerama player
+ {
+ 'url': 'http://www.abc.net.au/7.30/content/2015/s4164797.htm',
+ 'info_dict': {
+ 'id': '730m_DandD_1901_512k',
+ 'ext': 'mp4',
+ 'uploader': 'www.abc.net.au',
+ 'title': 'Game of Thrones with dice - Dungeons and Dragons fantasy role-playing game gets new life - 19/01/2015',
+ }
+ }
]
def report_following_redirect(self, new_url):
]
def report_following_redirect(self, new_url):
@@
-1046,6
+1056,10
@@
class GenericIE(InfoExtractor):
\s*{[^}]+? ["']?clip["']?\s*:\s*\{\s*
["']?url["']?\s*:\s*["']([^"']+)["']
''', webpage))
\s*{[^}]+? ["']?clip["']?\s*:\s*\{\s*
["']?url["']?\s*:\s*["']([^"']+)["']
''', webpage))
+ if not found:
+ # Cinerama player
+ found = re.findall(
+ r"cinerama\.embedPlayer\(\s*\'[^']+\',\s*'([^']+)'", webpage)
if not found:
# Try to find twitter cards info
found = filter_video(re.findall(
if not found:
# Try to find twitter cards info
found = filter_video(re.findall(