Browse Source

[generic] Add support for xhamster embeds

master
Sergey M․ 9 years ago
parent
commit
2bb5b6d0a1
2 changed files with 12 additions and 0 deletions
  1. 6
      youtube_dl/extractor/generic.py
  2. 6
      youtube_dl/extractor/xhamster.py

6
youtube_dl/extractor/generic.py

@ -43,6 +43,7 @@ from .senateisvp import SenateISVPIE
from .bliptv import BlipTVIE
from .svt import SVTIE
from .pornhub import PornHubIE
from .xhamster import XHamsterEmbedIE
from .vimeo import VimeoIE
from .dailymotion import DailymotionCloudIE
@ -1331,6 +1332,11 @@ class GenericIE(InfoExtractor):
if pornhub_url:
return self.url_result(pornhub_url, 'PornHub')
# Look for embedded XHamster player
xhamster_urls = XHamsterEmbedIE._extract_urls(webpage)
if xhamster_urls:
return _playlist_from_matches(xhamster_urls, ie='XHamsterEmbed')
# Look for embedded Tvigle player
mobj = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//cloud\.tvigle\.ru/video/.+?)\1', webpage)

6
youtube_dl/extractor/xhamster.py

@ -149,6 +149,12 @@ class XHamsterEmbedIE(InfoExtractor):
}
}
@staticmethod
def _extract_urls(webpage):
return [url for _, url in re.findall(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:www\.)?xhamster\.com/xembed\.php\?video=\d+)\1',
webpage)]
def _real_extract(self, url):
video_id = self._match_id(url)

Loading…
Cancel
Save