projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
df146eb
)
[svtplay] Share svtplay regex
author
Sergey M․
<dstftw@gmail.com>
Wed, 4 Apr 2018 17:28:36 +0000
(
00:28
+0700)
committer
Sergey M․
<dstftw@gmail.com>
Wed, 4 Apr 2018 17:29:13 +0000
(
00:29
+0700)
youtube_dl/extractor/svt.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/svt.py
b/youtube_dl/extractor/svt.py
index d1d601b1fd5b9fd03b7fabd46bce84d1d9f75888..b544da414e1113a88eef68e9b4652c3164033e89 100644
(file)
--- a/
youtube_dl/extractor/svt.py
+++ b/
youtube_dl/extractor/svt.py
@@
-128,7
+128,11
@@
class SVTIE(SVTBaseIE):
return info_dict
return info_dict
-class SVTPlayIE(SVTBaseIE):
+class SVTPlayBaseIE(SVTBaseIE):
+ _SVTPLAY_RE = r'root\s*\[\s*(["\'])_*svtplay\1\s*\]\s*=\s*(?P<json>{.+?})\s*;\s*\n'
+
+
+class SVTPlayIE(SVTPlayBaseIE):
IE_DESC = 'SVT Play and Öppet arkiv'
_VALID_URL = r'https?://(?:www\.)?(?:svtplay|oppetarkiv)\.se/(?:video|klipp)/(?P<id>[0-9]+)'
_TESTS = [{
IE_DESC = 'SVT Play and Öppet arkiv'
_VALID_URL = r'https?://(?:www\.)?(?:svtplay|oppetarkiv)\.se/(?:video|klipp)/(?P<id>[0-9]+)'
_TESTS = [{
@@
-163,8
+167,8
@@
class SVTPlayIE(SVTBaseIE):
data = self._parse_json(
self._search_regex(
data = self._parse_json(
self._search_regex(
-
r'root\["__svtplay"\]\s*=\s*([^;]+);
',
-
webpage, 'embedded data', default='{}
'),
+
self._SVTPLAY_RE, webpage, 'embedded data', default='{}
',
+
group='json
'),
video_id, fatal=False)
thumbnail = self._og_search_thumbnail(webpage)
video_id, fatal=False)
thumbnail = self._og_search_thumbnail(webpage)
@@
-197,7
+201,7
@@
class SVTPlayIE(SVTBaseIE):
return info_dict
return info_dict
-class SVTSeriesIE(
InfoExtractor
):
+class SVTSeriesIE(
SVTPlayBaseIE
):
_VALID_URL = r'https?://(?:www\.)?svtplay\.se/(?P<id>[^/?&#]+)'
_TESTS = [{
'url': 'https://www.svtplay.se/rederiet',
_VALID_URL = r'https?://(?:www\.)?svtplay\.se/(?P<id>[^/?&#]+)'
_TESTS = [{
'url': 'https://www.svtplay.se/rederiet',
@@
-235,8
+239,7
@@
class SVTSeriesIE(InfoExtractor):
root = self._parse_json(
self._search_regex(
root = self._parse_json(
self._search_regex(
- r'root\[\s*(["\'])_*svtplay\1\s*\]\s*=\s*(?P<json>{.+?})\s*;\s*\n',
- webpage, 'content', group='json'),
+ self._SVTPLAY_RE, webpage, 'content', group='json'),
series_id)
season_name = None
series_id)
season_name = None