projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[ChangeLog] Actualize
[youtube-dl]
/
youtube_dl
/
extractor
/
zapiks.py
diff --git
a/youtube_dl/extractor/zapiks.py
b/youtube_dl/extractor/zapiks.py
index 12810637ef7617e2672ab79c338293aff70cd8fc..bacb82eeeb2a549edbb0cbf6d0a67e07f28b595b 100644
(file)
--- a/
youtube_dl/extractor/zapiks.py
+++ b/
youtube_dl/extractor/zapiks.py
@@
-14,7
+14,7
@@
from ..utils import (
class ZapiksIE(InfoExtractor):
class ZapiksIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?zapiks\.
fr/(?:
(?P<display_id>.+?)\.html|index\.php\?.*\bmedia_id=(?P<id>\d+))'
+ _VALID_URL = r'https?://(?:www\.)?zapiks\.
(?:fr|com)/(?:(?:[a-z]{2}/)?
(?P<display_id>.+?)\.html|index\.php\?.*\bmedia_id=(?P<id>\d+))'
_TESTS = [
{
'url': 'http://www.zapiks.fr/ep2s3-bon-appetit-eh-be-viva.html',
_TESTS = [
{
'url': 'http://www.zapiks.fr/ep2s3-bon-appetit-eh-be-viva.html',
@@
-24,7
+24,7
@@
class ZapiksIE(InfoExtractor):
'ext': 'mp4',
'title': 'EP2S3 - Bon Appétit - Eh bé viva les pyrénées con!',
'description': 'md5:7054d6f6f620c6519be1fe710d4da847',
'ext': 'mp4',
'title': 'EP2S3 - Bon Appétit - Eh bé viva les pyrénées con!',
'description': 'md5:7054d6f6f620c6519be1fe710d4da847',
- 'thumbnail': 're:^https?://.*\.jpg$',
+ 'thumbnail':
r
're:^https?://.*\.jpg$',
'duration': 528,
'timestamp': 1359044972,
'upload_date': '20130124',
'duration': 528,
'timestamp': 1359044972,
'upload_date': '20130124',
@@
-32,6
+32,14
@@
class ZapiksIE(InfoExtractor):
'comment_count': int,
},
},
'comment_count': int,
},
},
+ {
+ 'url': 'http://www.zapiks.com/ep3s5-bon-appetit-baqueira-m-1.html',
+ 'only_matching': True,
+ },
+ {
+ 'url': 'http://www.zapiks.com/nl/ep3s5-bon-appetit-baqueira-m-1.html',
+ 'only_matching': True,
+ },
{
'url': 'http://www.zapiks.fr/index.php?action=playerIframe&media_id=118046&width=640&height=360&autoStart=false&language=fr',
'only_matching': True,
{
'url': 'http://www.zapiks.fr/index.php?action=playerIframe&media_id=118046&width=640&height=360&autoStart=false&language=fr',
'only_matching': True,