projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
55b2f09
)
[vporn] Improve error detection and update _TESTS
author
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 10 Jun 2016 07:12:53 +0000
(15:12 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 10 Jun 2016 07:12:53 +0000
(15:12 +0800)
youtube_dl/extractor/vporn.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vporn.py
b/youtube_dl/extractor/vporn.py
index 92c90e5172e89b98c3309bb01dc9787f15c24859..1557a0e0406ebfb75c2b5b4583c74f05c5dd2cc7 100644
(file)
--- a/
youtube_dl/extractor/vporn.py
+++ b/
youtube_dl/extractor/vporn.py
@@
-4,6
+4,7
@@
import re
from .common import InfoExtractor
from ..utils import (
from .common import InfoExtractor
from ..utils import (
+ ExtractorError,
parse_duration,
str_to_int,
)
parse_duration,
str_to_int,
)
@@
-27,7
+28,8
@@
class VpornIE(InfoExtractor):
'duration': 393,
'age_limit': 18,
'view_count': int,
'duration': 393,
'age_limit': 18,
'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.',
'thumbnail': 're:^https?://.*\.jpg$',
'uploader': 'Hmmmmm',
'description': 'Hana showers at the bathroom.',
'thumbnail': 're:^https?://.*\.jpg$',
'uploader': 'Hmmmmm',
- 'categories': ['Big Boobs', 'Erotic', 'Teen', 'Female'],
+ 'categories': ['Big Boobs', 'Erotic', 'Teen', 'Female'
, '720p'
],
'duration': 588,
'age_limit': 18,
'view_count': int,
'duration': 588,
'age_limit': 18,
'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(
r'videoname\s*=\s*\'([^\']+)\'', webpage, 'title').strip()
description = self._html_search_regex(
title = self._html_search_regex(
r'videoname\s*=\s*\'([^\']+)\'', webpage, 'title').strip()
description = self._html_search_regex(