R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

RTMP all .flv & url_id for _download_webpage()

Browse Source
This commit is contained in:
theGeekPirate 2016-03-26 20:12:26 -07:00
parent 7f9994ad04
commit 75cb2fe4a1
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
youtube_dl/extractor/camwithher.py
View File

@ -4,7 +4,7 @@ from .common import InfoExtractor
class CamWithHerIE(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<id>\w+).*'
_TESTS = [ _TESTS = [
{ {
@ -36,16 +36,16 @@ class CamWithHerIE(InfoExtractor):
] ]
def _real_extract(self, url): 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'<a href="/download/\?v=(.+?)\.', webpage, 'id') video_id = self._html_search_regex(r'<a href="/download/\?v=(.+?)\.', webpage, 'id')
if int(video_id) > 2010: if int(video_id) > 2010:
rtmp_url = 'rtmp://camwithher.tv/clipshare/mp4:' + video_id + '.mp4' rtmp_url = 'rtmp://camwithher.tv/clipshare/mp4:' + video_id + '.mp4'
ext = 'mp4'
else: else:
rtmp_url = 'rtmp://camwithher.tv/clipshare/' + video_id rtmp_url = 'rtmp://camwithher.tv/clipshare/' + video_id
ext = 'flv'
title = self._html_search_regex(r'<div style="float:left">\s+<h2>(.+?)</h2>', webpage, 'title') title = self._html_search_regex(r'<div style="float:left">\s+<h2>(.+?)</h2>', webpage, 'title')
@ -53,6 +53,6 @@ class CamWithHerIE(InfoExtractor):
'id': video_id, 'id': video_id,
'url': rtmp_url, 'url': rtmp_url,
'no_resume': True, 'no_resume': True,
'ext': ext, 'ext': 'flv',
'title': title, 'title': title,
} }