projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'baidu' of https://github.com/remitamine/youtube-dl into remitamine...
[youtube-dl]
/
youtube_dl
/
extractor
/
cbsnews.py
diff --git
a/youtube_dl/extractor/cbsnews.py
b/youtube_dl/extractor/cbsnews.py
index f9a64a0a2ec77ec75daeb3024fadcbbc80e6e9e8..d211ec23befd0eaa037efedb9024cd7c0b32864a 100644
(file)
--- a/
youtube_dl/extractor/cbsnews.py
+++ b/
youtube_dl/extractor/cbsnews.py
@@
-5,6
+5,7
@@
import re
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
+from ..utils import remove_start
class CBSNewsIE(InfoExtractor):
class CBSNewsIE(InfoExtractor):
@@
-62,6
+63,7
@@
class CBSNewsIE(InfoExtractor):
uri = item.get('media' + format_id + 'URI')
if not uri:
continue
uri = item.get('media' + format_id + 'URI')
if not uri:
continue
+ uri = remove_start(uri, '{manifest:none}')
fmt = {
'url': uri,
'format_id': format_id,
fmt = {
'url': uri,
'format_id': format_id,
@@
-70,6
+72,8
@@
class CBSNewsIE(InfoExtractor):
play_path = re.sub(
r'{slistFilePath}', '',
uri.split('<break>')[-1].split('{break}')[-1])
play_path = re.sub(
r'{slistFilePath}', '',
uri.split('<break>')[-1].split('{break}')[-1])
+ play_path = re.sub(
+ r'{manifest:.+}.*$', '', play_path)
fmt.update({
'app': 'ondemand?auth=cbs',
'play_path': 'mp4:' + play_path,
fmt.update({
'app': 'ondemand?auth=cbs',
'play_path': 'mp4:' + play_path,