projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4eda104
)
[23video] Relax _VALID_URL (#26870)
author
Hannu Hartikainen
<hannu.hartikainen@gmail.com>
Mon, 19 Oct 2020 17:56:23 +0000
(17:56 +0000)
committer
GitHub
<noreply@github.com>
Mon, 19 Oct 2020 17:56:23 +0000
(
00:56
+0700)
youtube_dl/extractor/twentythreevideo.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/twentythreevideo.py
b/youtube_dl/extractor/twentythreevideo.py
index aa0c6e90fe0eb0bc9da97f4e6ff8460d33b50f7e..dc56091925e7c50c7f6b2f182a14d9ebbb679aba 100644
(file)
--- a/
youtube_dl/extractor/twentythreevideo.py
+++ b/
youtube_dl/extractor/twentythreevideo.py
@@
-8,8
+8,8
@@
from ..utils import int_or_none
class TwentyThreeVideoIE(InfoExtractor):
IE_NAME = '23video'
class TwentyThreeVideoIE(InfoExtractor):
IE_NAME = '23video'
- _VALID_URL = r'https?://
video\.(?P<domain>twentythree\.net|23video\.com|filmweb\.no
)/v\.ihtml/player\.html\?(?P<query>.*?\bphoto(?:_|%5f)id=(?P<id>\d+).*)'
- _TEST
=
{
+ _VALID_URL = r'https?://
(?P<domain>[^.]+\.(?:twentythree\.net|23video\.com|filmweb\.no)
)/v\.ihtml/player\.html\?(?P<query>.*?\bphoto(?:_|%5f)id=(?P<id>\d+).*)'
+ _TEST
S = [
{
'url': 'https://video.twentythree.net/v.ihtml/player.html?showDescriptions=0&source=site&photo%5fid=20448876&autoPlay=1',
'md5': '75fcf216303eb1dae9920d651f85ced4',
'info_dict': {
'url': 'https://video.twentythree.net/v.ihtml/player.html?showDescriptions=0&source=site&photo%5fid=20448876&autoPlay=1',
'md5': '75fcf216303eb1dae9920d651f85ced4',
'info_dict': {
@@
-21,11
+21,14
@@
class TwentyThreeVideoIE(InfoExtractor):
'uploader_id': '12258964',
'uploader': 'Rasmus Bysted',
}
'uploader_id': '12258964',
'uploader': 'Rasmus Bysted',
}
- }
+ }, {
+ 'url': 'https://bonnier-publications-danmark.23video.com/v.ihtml/player.html?token=f0dc46476e06e13afd5a1f84a29e31e8&source=embed&photo%5fid=36137620',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
domain, query, photo_id = re.match(self._VALID_URL, url).groups()
def _real_extract(self, url):
domain, query, photo_id = re.match(self._VALID_URL, url).groups()
- base_url = 'https://
video.
%s' % domain
+ base_url = 'https://%s' % domain
photo_data = self._download_json(
base_url + '/api/photo/list?' + query, photo_id, query={
'format': 'json',
photo_data = self._download_json(
base_url + '/api/photo/list?' + query, photo_id, query={
'format': 'json',