projects
/
youtube-dl
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'rrooij-gamekings_fix'
[youtube-dl]
/
youtube_dl
/
extractor
/
allocine.py
diff --git
a/youtube_dl/extractor/allocine.py
b/youtube_dl/extractor/allocine.py
index 34f0cd49bafa104d3e3c175a4bd0ab6bf2494c1c..7d65b81931fb2d9b3acb5dd4ab2961a2aec52bea 100644
(file)
--- a/
youtube_dl/extractor/allocine.py
+++ b/
youtube_dl/extractor/allocine.py
@@
-5,15
+5,14
@@
import re
import json
from .common import InfoExtractor
import json
from .common import InfoExtractor
+from ..compat import compat_str
from ..utils import (
from ..utils import (
- compat_str,
qualities,
qualities,
- determine_ext,
)
class AllocineIE(InfoExtractor):
)
class AllocineIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?allocine\.fr/(?P<typ>article|video|film)/(fichearticle_gen_carticle=|player_gen_cmedia=|fichefilm_gen_cfilm=)(?P<id>[0-9]+)(?:\.html)?'
+ _VALID_URL = r'https?://(?:www\.)?allocine\.fr/(?P<typ>article|video|film)/(fichearticle_gen_carticle=|player_gen_cmedia=|fichefilm_gen_cfilm=
|video-
)(?P<id>[0-9]+)(?:\.html)?'
_TESTS = [{
'url': 'http://www.allocine.fr/article/fichearticle_gen_carticle=18635087.html',
_TESTS = [{
'url': 'http://www.allocine.fr/article/fichearticle_gen_carticle=18635087.html',
@@
-22,7
+21,7
@@
class AllocineIE(InfoExtractor):
'id': '19546517',
'ext': 'mp4',
'title': 'Astérix - Le Domaine des Dieux Teaser VF',
'id': '19546517',
'ext': 'mp4',
'title': 'Astérix - Le Domaine des Dieux Teaser VF',
- 'description': 'md5:
4a754271d9c6f16c72629a8a993ee884
',
+ 'description': 'md5:
abcd09ce503c6560512c14ebfdb720d2
',
'thumbnail': 're:http://.*\.jpg',
},
}, {
'thumbnail': 're:http://.*\.jpg',
},
}, {
@@
-32,7
+31,7
@@
class AllocineIE(InfoExtractor):
'id': '19540403',
'ext': 'mp4',
'title': 'Planes 2 Bande-annonce VF',
'id': '19540403',
'ext': 'mp4',
'title': 'Planes 2 Bande-annonce VF',
- 'description': 'md5:
c4b1f7bd682a91de6491ada267ec0f4d
',
+ 'description': 'md5:
eeaffe7c2d634525e21159b93acf3b1e
',
'thumbnail': 're:http://.*\.jpg',
},
}, {
'thumbnail': 're:http://.*\.jpg',
},
}, {
@@
-42,9
+41,12
@@
class AllocineIE(InfoExtractor):
'id': '19544709',
'ext': 'mp4',
'title': 'Dragons 2 - Bande annonce finale VF',
'id': '19544709',
'ext': 'mp4',
'title': 'Dragons 2 - Bande annonce finale VF',
- 'description': 'md5:
e74a4dc750894bac300ece46c7036490
',
+ 'description': 'md5:
71742e3a74b0d692c7fce0dd2017a4ac
',
'thumbnail': 're:http://.*\.jpg',
},
'thumbnail': 're:http://.*\.jpg',
},
+ }, {
+ 'url': 'http://www.allocine.fr/video/video-19550147/',
+ 'only_matching': True,
}]
def _real_extract(self, url):
}]
def _real_extract(self, url):
@@
-75,9
+77,7
@@
class AllocineIE(InfoExtractor):
'format_id': format_id,
'quality': quality(format_id),
'url': v,
'format_id': format_id,
'quality': quality(format_id),
'url': v,
- 'ext': determine_ext(v),
})
})
-
self._sort_formats(formats)
return {
self._sort_formats(formats)
return {