From 571c02ab38b86df3b03041d5b83899c639e24ec0 Mon Sep 17 00:00:00 2001
From: Laura Liberda <laura@selfisekai.rocks>
Date: Fri, 26 Feb 2021 15:45:57 +0100
Subject: [PATCH] VHX embeds
 https://github.com/ytdl-org/youtube-dl/issues/27546

---
 haruhi_dl/extractor/generic.py | 17 ++++++++++++++++-
 haruhi_dl/extractor/vimeo.py   |  7 +++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/haruhi_dl/extractor/generic.py b/haruhi_dl/extractor/generic.py
index 240de66da..b67f066eb 100644
--- a/haruhi_dl/extractor/generic.py
+++ b/haruhi_dl/extractor/generic.py
@@ -67,7 +67,10 @@ from .tube8 import Tube8IE
 from .mofosex import MofosexEmbedIE
 from .spankwire import SpankwireIE
 from .youporn import YouPornIE
-from .vimeo import VimeoIE
+from .vimeo import (
+    VimeoIE,
+    VHXEmbedIE,
+)
 from .dailymotion import DailymotionIE
 from .dailymail import DailyMailIE
 from .onionstudios import OnionStudiosIE
@@ -2247,6 +2250,17 @@ class GenericIE(InfoExtractor):
         #         'force_generic_extractor': True,
         #     },
         # }
+        {
+            # VHX Embed
+            'url': 'https://demo.vhx.tv/category-c/videos/file-example-mp4-480-1-5mg-copy',
+            'info_dict': {
+                'id': '858208',
+                'ext': 'mp4',
+                'title': 'Untitled',
+                'uploader_id': 'user80538407',
+                'uploader': 'OTT Videos',
+            },
+        },
     ]
 
     def report_following_redirect(self, new_url):
@@ -2661,6 +2675,7 @@ class GenericIE(InfoExtractor):
             SVTIE,
             XLinkIE,
             LibsynIE,
+            VHXEmbedIE,
         ):
             try:
                 ie_key = embie.ie_key()
diff --git a/haruhi_dl/extractor/vimeo.py b/haruhi_dl/extractor/vimeo.py
index e8a4547cd..773296173 100644
--- a/haruhi_dl/extractor/vimeo.py
+++ b/haruhi_dl/extractor/vimeo.py
@@ -1125,6 +1125,12 @@ class VHXEmbedIE(VimeoBaseInfoExtractor):
     IE_NAME = 'vhx:embed'
     _VALID_URL = r'https?://embed\.vhx\.tv/videos/(?P<id>\d+)'
 
+    @staticmethod
+    def _extract_urls(webpage, **kw):
+        mobjs = re.finditer(
+            r'<iframe[^>]+src="(https?://embed\.vhx\.tv/videos/\d+[^"]*)"', webpage)
+        return [unescapeHTML(mobj.group(1)) for mobj in mobjs]
+
     def _real_extract(self, url):
         video_id = self._match_id(url)
         webpage = self._download_webpage(url, video_id)
@@ -1133,5 +1139,6 @@ class VHXEmbedIE(VimeoBaseInfoExtractor):
             'ott data'), video_id, js_to_json)['config_url']
         config = self._download_json(config_url, video_id)
         info = self._parse_config(config, video_id)
+        info['id'] = video_id
         self._vimeo_sort_formats(info['formats'])
         return info