mirror of
https://github.com/ytdl-org/youtube-dl.git
synced 2024-09-08 09:35:01 +00:00
[vporn] Improve error detection and update _TESTS
This commit is contained in:
parent
55b2f099c0
commit
a225238530
|
@ -4,6 +4,7 @@ import re
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
from ..utils import (
|
from ..utils import (
|
||||||
|
ExtractorError,
|
||||||
parse_duration,
|
parse_duration,
|
||||||
str_to_int,
|
str_to_int,
|
||||||
)
|
)
|
||||||
|
@ -27,7 +28,8 @@ class VpornIE(InfoExtractor):
|
||||||
'duration': 393,
|
'duration': 393,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
'view_count': int,
|
'view_count': int,
|
||||||
}
|
},
|
||||||
|
'skip': 'video removed',
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
'url': 'http://www.vporn.com/female/hana-shower/523564/',
|
'url': 'http://www.vporn.com/female/hana-shower/523564/',
|
||||||
|
@ -40,7 +42,7 @@ class VpornIE(InfoExtractor):
|
||||||
'description': 'Hana showers at the bathroom.',
|
'description': 'Hana showers at the bathroom.',
|
||||||
'thumbnail': 're:^https?://.*\.jpg$',
|
'thumbnail': 're:^https?://.*\.jpg$',
|
||||||
'uploader': 'Hmmmmm',
|
'uploader': 'Hmmmmm',
|
||||||
'categories': ['Big Boobs', 'Erotic', 'Teen', 'Female'],
|
'categories': ['Big Boobs', 'Erotic', 'Teen', 'Female', '720p'],
|
||||||
'duration': 588,
|
'duration': 588,
|
||||||
'age_limit': 18,
|
'age_limit': 18,
|
||||||
'view_count': int,
|
'view_count': int,
|
||||||
|
@ -55,6 +57,10 @@ class VpornIE(InfoExtractor):
|
||||||
|
|
||||||
webpage = self._download_webpage(url, display_id)
|
webpage = self._download_webpage(url, display_id)
|
||||||
|
|
||||||
|
errmsg = 'This video has been deleted due to Copyright Infringement or by the account owner!'
|
||||||
|
if errmsg in webpage:
|
||||||
|
raise ExtractorError('%s said: %s' % (self.IE_NAME, errmsg), expected=True)
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r'videoname\s*=\s*\'([^\']+)\'', webpage, 'title').strip()
|
r'videoname\s*=\s*\'([^\']+)\'', webpage, 'title').strip()
|
||||||
description = self._html_search_regex(
|
description = self._html_search_regex(
|
||||||
|
|
Loading…
Reference in a new issue