Browse Source

[extractor/generic] Add support for drtuber embds (closes #11098)

master
Sergey M․ 8 years ago
parent
commit
37e7a71c6c
No known key found for this signature in database GPG Key ID: 2C393E0F18A9236D
2 changed files with 12 additions and 0 deletions
  1. 6
      youtube_dl/extractor/drtuber.py
  2. 6
      youtube_dl/extractor/generic.py

6
youtube_dl/extractor/drtuber.py

@ -30,6 +30,12 @@ class DrTuberIE(InfoExtractor):
'only_matching': True,
}]
@staticmethod
def _extract_urls(webpage):
return re.findall(
r'<iframe[^>]+?src=["\'](?P<url>(?:https?:)?//(?:www\.)?drtuber\.com/embed/\d+)',
webpage)
def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url)
video_id = mobj.group('id')

6
youtube_dl/extractor/generic.py

@ -47,6 +47,7 @@ from .svt import SVTIE
from .pornhub import PornHubIE
from .xhamster import XHamsterEmbedIE
from .tnaflix import TNAFlixNetworkEmbedIE
from .drtuber import DrTuberIE
from .vimeo import VimeoIE
from .dailymotion import (
DailymotionIE,
@ -1996,6 +1997,11 @@ class GenericIE(InfoExtractor):
if tnaflix_urls:
return _playlist_from_matches(tnaflix_urls, ie=TNAFlixNetworkEmbedIE.ie_key())
# Look for embedded DrTuber player
drtuber_urls = DrTuberIE._extract_urls(webpage)
if drtuber_urls:
return _playlist_from_matches(drtuber_urls, ie=DrTuberIE.ie_key())
# Look for embedded Tvigle player
mobj = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)

Loading…
Cancel
Save