From 75cb2fe4a1f3347c4ae9b8ca043f3c150d4f378f Mon Sep 17 00:00:00 2001 From: theGeekPirate Date: Sat, 26 Mar 2016 20:12:26 -0700 Subject: [PATCH] RTMP all .flv & url_id for _download_webpage() --- youtube_dl/extractor/camwithher.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/youtube_dl/extractor/camwithher.py b/youtube_dl/extractor/camwithher.py index 1eb80b7f1..fa4ec351f 100644 --- a/youtube_dl/extractor/camwithher.py +++ b/youtube_dl/extractor/camwithher.py @@ -4,7 +4,7 @@ from .common import InfoExtractor class CamWithHerIE(InfoExtractor): - _VALID_URL = r'https?://(?:www\.)?camwithher\.tv/view_video\.php\?viewkey=*' + _VALID_URL = r'https?://(?:www\.)?camwithher\.tv/view_video\.php\?viewkey=(?P\w+).*' _TESTS = [ { @@ -36,16 +36,16 @@ class CamWithHerIE(InfoExtractor): ] def _real_extract(self, url): - webpage = self._download_webpage(url, '') + url_id = self._match_id(url) + + webpage = self._download_webpage(url, url_id) video_id = self._html_search_regex(r'\s+

(.+?)

', webpage, 'title') @@ -53,6 +53,6 @@ class CamWithHerIE(InfoExtractor): 'id': video_id, 'url': rtmp_url, 'no_resume': True, - 'ext': ext, + 'ext': 'flv', 'title': title, }