Sergey M․
8 years ago
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
2 changed files with
14 additions and
0 deletions
-
youtube_dl/extractor/generic.py
-
youtube_dl/extractor/redtube.py
|
|
@ -48,6 +48,7 @@ from .pornhub import PornHubIE |
|
|
|
from .xhamster import XHamsterEmbedIE |
|
|
|
from .tnaflix import TNAFlixNetworkEmbedIE |
|
|
|
from .drtuber import DrTuberIE |
|
|
|
from .redtube import RedTubeIE |
|
|
|
from .vimeo import VimeoIE |
|
|
|
from .dailymotion import ( |
|
|
|
DailymotionIE, |
|
|
@ -2002,6 +2003,11 @@ class GenericIE(InfoExtractor): |
|
|
|
if drtuber_urls: |
|
|
|
return _playlist_from_matches(drtuber_urls, ie=DrTuberIE.ie_key()) |
|
|
|
|
|
|
|
# Look for embedded RedTube player |
|
|
|
redtube_urls = RedTubeIE._extract_urls(webpage) |
|
|
|
if redtube_urls: |
|
|
|
return _playlist_from_matches(redtube_urls, ie=RedTubeIE.ie_key()) |
|
|
|
|
|
|
|
# Look for embedded Tvigle player |
|
|
|
mobj = re.search( |
|
|
|
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage) |
|
|
|
|
|
@ -1,5 +1,7 @@ |
|
|
|
from __future__ import unicode_literals |
|
|
|
|
|
|
|
import re |
|
|
|
|
|
|
|
from .common import InfoExtractor |
|
|
|
from ..utils import ( |
|
|
|
ExtractorError, |
|
|
@ -28,6 +30,12 @@ class RedTubeIE(InfoExtractor): |
|
|
|
'only_matching': True, |
|
|
|
}] |
|
|
|
|
|
|
|
@staticmethod |
|
|
|
def _extract_urls(webpage): |
|
|
|
return re.findall( |
|
|
|
r'<iframe[^>]+?src=["\'](?P<url>(?:https?:)?//embed\.redtube\.com/\?.*?\bid=\d+)', |
|
|
|
webpage) |
|
|
|
|
|
|
|
def _real_extract(self, url): |
|
|
|
video_id = self._match_id(url) |
|
|
|
webpage = self._download_webpage( |
|
|
|