diff options
| author | spvkgn <spvkgn@users.noreply.github.com> | 2020-12-13 17:56:28 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-13 19:56:28 +0700 |
| commit | e665fcd4da18dc0d487e4aaac51e696e381814e9 (patch) | |
| tree | 12d9c8335a7d844b979464f1f042da39c23e4dfc | |
| parent | aae737d4af1093249e36783d3f86d39e08de8761 (diff) | |
| download | youtube-dl-e665fcd4da18dc0d487e4aaac51e696e381814e9.tar.gz youtube-dl-e665fcd4da18dc0d487e4aaac51e696e381814e9.tar.xz youtube-dl-e665fcd4da18dc0d487e4aaac51e696e381814e9.zip | |
[eporner] Fix hash extraction and extend _VALID_URL (#27396)
Co-authored-by: Sergey M <dstftw@gmail.com>
| -rw-r--r-- | youtube_dl/extractor/eporner.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/youtube_dl/extractor/eporner.py b/youtube_dl/extractor/eporner.py index fe42821c7..709925471 100644 --- a/youtube_dl/extractor/eporner.py +++ b/youtube_dl/extractor/eporner.py @@ -16,7 +16,7 @@ from ..utils import ( class EpornerIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?eporner\.com/(?:hd-porn|embed)/(?P<id>\w+)(?:/(?P<display_id>[\w-]+))?' + _VALID_URL = r'https?://(?:www\.)?eporner\.com/(?:(?:hd-porn|embed)/|video-)(?P<id>\w+)(?:/(?P<display_id>[\w-]+))?' _TESTS = [{ 'url': 'http://www.eporner.com/hd-porn/95008/Infamous-Tiffany-Teen-Strip-Tease-Video/', 'md5': '39d486f046212d8e1b911c52ab4691f8', @@ -45,6 +45,9 @@ class EpornerIE(InfoExtractor): }, { 'url': 'http://www.eporner.com/hd-porn/3YRUtzMcWn0', 'only_matching': True, + }, { + 'url': 'https://www.eporner.com/video-FJsA19J3Y3H/one-of-the-greats/', + 'only_matching': True, }] def _real_extract(self, url): @@ -57,7 +60,7 @@ class EpornerIE(InfoExtractor): video_id = self._match_id(urlh.geturl()) hash = self._search_regex( - r'hash\s*:\s*["\']([\da-f]{32})', webpage, 'hash') + r'hash\s*[:=]\s*["\']([\da-f]{32})', webpage, 'hash') title = self._og_search_title(webpage, default=None) or self._html_search_regex( r'<title>(.+?) - EPORNER', webpage, 'title') |