projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
488ff2d
)
[svt] Improve (closes #15809)
author
Sergey M․
<dstftw@gmail.com>
Sat, 21 Apr 2018 22:33:08 +0000
(
05:33
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 21 Apr 2018 22:34:03 +0000
(
05:34
+0700)
youtube_dl/extractor/svt.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/svt.py
b/youtube_dl/extractor/svt.py
index d01f8542250db0f866a8f53d003952b728108d49..f71eab8b25014501aa6d123e70fba4506c095cea 100644
(file)
--- a/
youtube_dl/extractor/svt.py
+++ b/
youtube_dl/extractor/svt.py
@@
-137,7
+137,7
@@
class SVTPlayBaseIE(SVTBaseIE):
class SVTPlayIE(SVTPlayBaseIE):
IE_DESC = 'SVT Play and Öppet arkiv'
class SVTPlayIE(SVTPlayBaseIE):
IE_DESC = 'SVT Play and Öppet arkiv'
- _VALID_URL = r'https?://(?:www\.)?(?:svtplay|oppetarkiv)\.se/(?:video|klipp|kanaler)/(?P<id>
\w
+)'
+ _VALID_URL = r'https?://(?:www\.)?(?:svtplay|oppetarkiv)\.se/(?:video|klipp|kanaler)/(?P<id>
[^/?#&]
+)'
_TESTS = [{
'url': 'http://www.svtplay.se/video/5996901/flygplan-till-haile-selassie/flygplan-till-haile-selassie-2',
'md5': '2b6704fe4a28801e1a098bbf3c5ac611',
_TESTS = [{
'url': 'http://www.svtplay.se/video/5996901/flygplan-till-haile-selassie/flygplan-till-haile-selassie-2',
'md5': '2b6704fe4a28801e1a098bbf3c5ac611',
@@
-179,6
+179,10
@@
class SVTPlayIE(SVTPlayBaseIE):
thumbnail = self._og_search_thumbnail(webpage)
thumbnail = self._og_search_thumbnail(webpage)
+ def adjust_title(info):
+ if info['is_live']:
+ info['title'] = self._live_title(info['title'])
+
if data:
video_info = try_get(
data, lambda x: x['context']['dispatcher']['stores']['VideoTitlePageStore']['data']['video'],
if data:
video_info = try_get(
data, lambda x: x['context']['dispatcher']['stores']['VideoTitlePageStore']['data']['video'],
@@
-189,8
+193,7
@@
class SVTPlayIE(SVTPlayBaseIE):
'title': data['context']['dispatcher']['stores']['MetaStore']['title'],
'thumbnail': thumbnail,
})
'title': data['context']['dispatcher']['stores']['MetaStore']['title'],
'thumbnail': thumbnail,
})
- if info_dict['is_live']:
- info_dict['title'] = self._live_title(info_dict['title'])
+ adjust_title(info_dict)
return info_dict
video_id = self._search_regex(
return info_dict
video_id = self._search_regex(
@@
-206,8
+209,7
@@
class SVTPlayIE(SVTPlayBaseIE):
info_dict['title'] = re.sub(
r'\s*\|\s*.+?$', '',
info_dict.get('episode') or self._og_search_title(webpage))
info_dict['title'] = re.sub(
r'\s*\|\s*.+?$', '',
info_dict.get('episode') or self._og_search_title(webpage))
- if info_dict['is_live']:
- info_dict['title'] = self._live_title(info_dict['title'])
+ adjust_title(info_dict)
return info_dict
return info_dict