mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-12-29 09:27:55 +01:00
Merge remote-tracking branch 'upstream/master' into porntrex
This commit is contained in:
commit
61904805ef
@ -2,13 +2,14 @@
|
|||||||
from __future__ import unicode_literals
|
from __future__ import unicode_literals
|
||||||
|
|
||||||
from .common import InfoExtractor
|
from .common import InfoExtractor
|
||||||
|
from ..utils import urlencode_postdata
|
||||||
|
|
||||||
import re
|
import re
|
||||||
|
|
||||||
|
|
||||||
class TwitCastingIE(InfoExtractor):
|
class TwitCastingIE(InfoExtractor):
|
||||||
_VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<uploader_id>[^/]+)/movie/(?P<id>\d+)'
|
_VALID_URL = r'https?://(?:[^/]+\.)?twitcasting\.tv/(?P<uploader_id>[^/]+)/movie/(?P<id>\d+)'
|
||||||
_TEST = {
|
_TESTS = [{
|
||||||
'url': 'https://twitcasting.tv/ivetesangalo/movie/2357609',
|
'url': 'https://twitcasting.tv/ivetesangalo/movie/2357609',
|
||||||
'md5': '745243cad58c4681dc752490f7540d7f',
|
'md5': '745243cad58c4681dc752490f7540d7f',
|
||||||
'info_dict': {
|
'info_dict': {
|
||||||
@ -22,14 +23,34 @@ class TwitCastingIE(InfoExtractor):
|
|||||||
'params': {
|
'params': {
|
||||||
'skip_download': True,
|
'skip_download': True,
|
||||||
},
|
},
|
||||||
}
|
}, {
|
||||||
|
'url': 'https://twitcasting.tv/mttbernardini/movie/3689740',
|
||||||
|
'info_dict': {
|
||||||
|
'id': '3689740',
|
||||||
|
'ext': 'mp4',
|
||||||
|
'title': 'Live playing something #3689740',
|
||||||
|
'uploader_id': 'mttbernardini',
|
||||||
|
'description': "I'm live on TwitCasting from my iPad. password: abc (Santa Marinella/Lazio, Italia)",
|
||||||
|
'thumbnail': r're:^https?://.*\.jpg$',
|
||||||
|
},
|
||||||
|
'params': {
|
||||||
|
'skip_download': True,
|
||||||
|
'videopassword': 'abc',
|
||||||
|
},
|
||||||
|
}]
|
||||||
|
|
||||||
def _real_extract(self, url):
|
def _real_extract(self, url):
|
||||||
mobj = re.match(self._VALID_URL, url)
|
mobj = re.match(self._VALID_URL, url)
|
||||||
video_id = mobj.group('id')
|
video_id = mobj.group('id')
|
||||||
uploader_id = mobj.group('uploader_id')
|
uploader_id = mobj.group('uploader_id')
|
||||||
|
|
||||||
webpage = self._download_webpage(url, video_id)
|
video_password = self._downloader.params.get('videopassword')
|
||||||
|
request_data = None
|
||||||
|
if video_password:
|
||||||
|
request_data = urlencode_postdata({
|
||||||
|
'password': video_password,
|
||||||
|
})
|
||||||
|
webpage = self._download_webpage(url, video_id, data=request_data)
|
||||||
|
|
||||||
title = self._html_search_regex(
|
title = self._html_search_regex(
|
||||||
r'(?s)<[^>]+id=["\']movietitle[^>]+>(.+?)</',
|
r'(?s)<[^>]+id=["\']movietitle[^>]+>(.+?)</',
|
||||||
|
Loading…
Reference in New Issue
Block a user