diff options
| author | Rogério Brito <rbrito@ime.usp.br> | 2017-03-08 22:53:10 -0300 |
|---|---|---|
| committer | Rogério Brito <rbrito@ime.usp.br> | 2017-03-08 22:53:10 -0300 |
| commit | 2b4515201a54c38e34434ea2817d606be134a7c9 (patch) | |
| tree | e7dcb445c80be55c497615529800ff74bb950c63 /youtube_dl/extractor/xhamster.py | |
| parent | 3cd33af594d34a8809318ebd0be4d606d212a7a0 (diff) | |
| parent | 1d3fd83f473663fce3e0a10303473a38d80cc3d0 (diff) | |
| download | youtube-dl-2b4515201a54c38e34434ea2817d606be134a7c9.zip youtube-dl-2b4515201a54c38e34434ea2817d606be134a7c9.tar.gz youtube-dl-2b4515201a54c38e34434ea2817d606be134a7c9.tar.bz2 | |
Merge tag 'upstream/2017.03.07'
Upstream version 2017.03.07
Diffstat (limited to 'youtube_dl/extractor/xhamster.py')
| -rw-r--r-- | youtube_dl/extractor/xhamster.py | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/youtube_dl/extractor/xhamster.py b/youtube_dl/extractor/xhamster.py index 36a8c98..7b67037 100644 --- a/youtube_dl/extractor/xhamster.py +++ b/youtube_dl/extractor/xhamster.py @@ -5,6 +5,7 @@ import re from .common import InfoExtractor from ..utils import ( dict_get, + ExtractorError, int_or_none, parse_duration, unified_strdate, @@ -57,6 +58,10 @@ class XHamsterIE(InfoExtractor): }, { 'url': 'https://xhamster.com/movies/2272726/amber_slayed_by_the_knight.html', 'only_matching': True, + }, { + # This video is visible for marcoalfa123456's friends only + 'url': 'https://it.xhamster.com/movies/7263980/la_mia_vicina.html', + 'only_matching': True, }] def _real_extract(self, url): @@ -78,6 +83,12 @@ class XHamsterIE(InfoExtractor): mrss_url = '%s://xhamster.com/movies/%s/%s.html' % (proto, video_id, seo) webpage = self._download_webpage(mrss_url, video_id) + error = self._html_search_regex( + r'<div[^>]+id=["\']videoClosed["\'][^>]*>(.+?)</div>', + webpage, 'error', default=None) + if error: + raise ExtractorError(error, expected=True) + title = self._html_search_regex( [r'<h1[^>]*>([^<]+)</h1>', r'<meta[^>]+itemprop=".*?caption.*?"[^>]+content="(.+?)"', |