projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1d6ae56
)
[hellporno] Add support for hellporno.net and improve ext extraction
author
Andy Savicki
<lao.lav@gmail.com>
Sat, 19 Nov 2016 23:12:22 +0000
(
02:12
+0300)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 22 Nov 2016 15:16:10 +0000
(22:16 +0700)
youtube_dl/extractor/hellporno.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/hellporno.py
b/youtube_dl/extractor/hellporno.py
index 7a1c75b655439a953e46f1692cd672c6c27374ef..10da1406787c51fc56d7fb55f120bb6908a5b49a 100644
(file)
--- a/
youtube_dl/extractor/hellporno.py
+++ b/
youtube_dl/extractor/hellporno.py
@@
-6,12
+6,13
@@
from .common import InfoExtractor
from ..utils import (
js_to_json,
remove_end,
from ..utils import (
js_to_json,
remove_end,
+ determine_ext,
)
class HellPornoIE(InfoExtractor):
)
class HellPornoIE(InfoExtractor):
- _VALID_URL = r'https?://(?:www\.)?hellporno\.
com/videos
/(?P<id>[^/]+)'
- _TEST
=
{
+ _VALID_URL = r'https?://(?:www\.)?hellporno\.
(?:com/videos|net/v)
/(?P<id>[^/]+)'
+ _TEST
S = [
{
'url': 'http://hellporno.com/videos/dixie-is-posing-with-naked-ass-very-erotic/',
'md5': '1fee339c610d2049699ef2aa699439f1',
'info_dict': {
'url': 'http://hellporno.com/videos/dixie-is-posing-with-naked-ass-very-erotic/',
'md5': '1fee339c610d2049699ef2aa699439f1',
'info_dict': {
@@
-22,7
+23,10
@@
class HellPornoIE(InfoExtractor):
'thumbnail': 're:https?://.*\.jpg$',
'age_limit': 18,
}
'thumbnail': 're:https?://.*\.jpg$',
'age_limit': 18,
}
- }
+ }, {
+ 'url': 'http://hellporno.net/v/186271/',
+ 'only_matching': True,
+ }]
def _real_extract(self, url):
display_id = self._match_id(url)
def _real_extract(self, url):
display_id = self._match_id(url)
@@
-38,7
+42,7
@@
class HellPornoIE(InfoExtractor):
video_id = flashvars.get('video_id')
thumbnail = flashvars.get('preview_url')
video_id = flashvars.get('video_id')
thumbnail = flashvars.get('preview_url')
- ext =
flashvars.get('postfix', '.mp4')[1:]
+ ext =
determine_ext(flashvars.get('postfix'), 'mp4')
formats = []
for video_url_key in ['video_url', 'video_alt_url']:
formats = []
for video_url_key in ['video_url', 'video_alt_url']: