projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c59b61c
)
[prosiebensat1] Recognize DRM protected videos (#6334)
author
Sergey M․
<dstftw@gmail.com>
Wed, 22 Jul 2015 21:04:23 +0000
(
03:04
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 22 Jul 2015 21:04:23 +0000
(
03:04
+0600)
youtube_dl/extractor/prosiebensat1.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/prosiebensat1.py
b/youtube_dl/extractor/prosiebensat1.py
index fec008ce7687a0360d2e54e3130425245f30b4fc..0739234c6a0aa0eaffbd96ef3b4401d9200918bd 100644
(file)
--- a/
youtube_dl/extractor/prosiebensat1.py
+++ b/
youtube_dl/extractor/prosiebensat1.py
@@
-9,6
+9,7
@@
from ..compat import (
compat_urllib_parse,
)
from ..utils import (
compat_urllib_parse,
)
from ..utils import (
+ ExtractorError,
determine_ext,
int_or_none,
unified_strdate,
determine_ext,
int_or_none,
unified_strdate,
@@
-224,10
+225,13
@@
class ProSiebenSat1IE(InfoExtractor):
'ids': clip_id,
})
'ids': clip_id,
})
- video
s = self._download_json(videos_api_url, clip_id, 'Downloading videos JSON')
+ video
= self._download_json(videos_api_url, clip_id, 'Downloading videos JSON')[0]
- duration = float(videos[0]['duration'])
- source_ids = [source['id'] for source in videos[0]['sources']]
+ if video.get('is_protected') is True:
+ raise ExtractorError('This video is DRM protected.', expected=True)
+
+ duration = float(video['duration'])
+ source_ids = [source['id'] for source in video['sources']]
source_ids_str = ','.join(map(str, source_ids))
g = '01!8d8F_)r9]4s[qeuXfP%'
source_ids_str = ','.join(map(str, source_ids))
g = '01!8d8F_)r9]4s[qeuXfP%'