projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[videomore] Improve extraction and fix season extractor (closes #18908)
[youtube-dl]
/
youtube_dl
/
extractor
/
adultswim.py
diff --git
a/youtube_dl/extractor/adultswim.py
b/youtube_dl/extractor/adultswim.py
index 9c37ea33cd92c15d98841cea49887d76c763110a..88c96a95060738833f1cc7c85a251f1a26f4962e 100644
(file)
--- a/
youtube_dl/extractor/adultswim.py
+++ b/
youtube_dl/extractor/adultswim.py
@@
-7,6
+7,7
@@
from .turner import TurnerBaseIE
from ..utils import (
int_or_none,
strip_or_none,
from ..utils import (
int_or_none,
strip_or_none,
+ url_or_none,
)
)
@@
-98,7
+99,7
@@
class AdultSwimIE(TurnerBaseIE):
if not video_id:
entries = []
for episode in video_data.get('archiveEpisodes', []):
if not video_id:
entries = []
for episode in video_data.get('archiveEpisodes', []):
- episode_url =
episode.get('url'
)
+ episode_url =
url_or_none(episode.get('url')
)
if not episode_url:
continue
entries.append(self.url_result(
if not episode_url:
continue
entries.append(self.url_result(
@@
-126,7
+127,7
@@
class AdultSwimIE(TurnerBaseIE):
video_id = video_data['id']
info = self._extract_cvp_info(
video_id = video_data['id']
info = self._extract_cvp_info(
- 'http://www.adultswim.com/videos/api/v0/assets?id=' + video_id,
+ 'http://www.adultswim.com/videos/api/v0/assets?
platform=desktop&
id=' + video_id,
video_id, {
'secure': {
'media_src': 'http://androidhls-secure.cdn.turner.com/adultswim/big',
video_id, {
'secure': {
'media_src': 'http://androidhls-secure.cdn.turner.com/adultswim/big',