From 8d2881a442211b5ea058e7a1f3bfe46359080fd1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Maciej=20Kr=C3=BCger?= <mkg20001@gmail.com>
Date: Thu, 22 Jul 2021 12:46:23 +0200
Subject: [PATCH 1/3] [voe] Add new extractor

---
 youtube_dl/extractor/extractors.py |  1 +
 youtube_dl/extractor/voe.py        | 47 ++++++++++++++++++++++++++++++
 2 files changed, 48 insertions(+)
 create mode 100644 youtube_dl/extractor/voe.py

diff --git a/youtube_dl/extractor/extractors.py b/youtube_dl/extractor/extractors.py
index 6e8fc3961..5b658fb1c 100644
--- a/youtube_dl/extractor/extractors.py
+++ b/youtube_dl/extractor/extractors.py
@@ -1484,6 +1484,7 @@ from .voxmedia import (
     VoxMediaVolumeIE,
     VoxMediaIE,
 )
+from .voe import VOEIE
 from .vrt import VRTIE
 from .vrak import VrakIE
 from .vrv import (
diff --git a/youtube_dl/extractor/voe.py b/youtube_dl/extractor/voe.py
new file mode 100644
index 000000000..4f24e50bb
--- /dev/null
+++ b/youtube_dl/extractor/voe.py
@@ -0,0 +1,47 @@
+# coding: utf-8
+from __future__ import unicode_literals
+
+from .common import InfoExtractor
+
+
+class VOEIE(InfoExtractor):
+    IE_NAME = 'voe'
+    IE_DESC = 'VOE.SX'
+    _VALID_URL = r'https?://voe\.sx/(e/)?(?P<id>[a-z0-9]+)'
+    _TEST = {
+        'url': 'https://voe.sx/e/ng7ja5n5n2y8',
+        'info_dict': {
+            'id': 'ng7ja5n5n2y8',
+            'title': 'md5:05ab15eb43a32f0f5918755156c5fb34',
+            'thumbnail': r're:^https?://.*\.jpg$',
+            'ext': 'm3u8',
+        },
+    }
+
+    def _real_extract(self, url):
+        video_id = self._match_id(url)
+
+        webpage = self._download_webpage(
+            'https://voe.sx/e/%s' % video_id, video_id)
+
+        m3u8 = self._search_regex(
+            r'(https.+m3u8)',
+            webpage, 'm3u8')
+
+        title = self._search_regex(
+            r'<title>Watch (?P<title>.+)<\/title>',
+            webpage, 'title', group='title')
+
+        thumbnail = self._search_regex(
+            r'VOEPlayer.poster="(?P<thumbnail>https.+)"',
+            webpage, 'thumbnail', group='thumbnail')
+
+        formats = self._extract_m3u8_formats(m3u8, video_id)
+        self._sort_formats(formats)
+
+        return {
+            'id': video_id,
+            'title': title,
+            'formats': formats,
+            'thumbnail': thumbnail,
+        }

From 001d5b8395b5b1eccfb829867c2e36e2ee7241b8 Mon Sep 17 00:00:00 2001
From: dirkf <fieldhouse@gmx.net>
Date: Thu, 17 Nov 2022 19:23:43 +0000
Subject: [PATCH 2/3] Fix extraction

---
 youtube_dl/extractor/voe.py | 37 +++++++++++++++++++++++++++----------
 1 file changed, 27 insertions(+), 10 deletions(-)

diff --git a/youtube_dl/extractor/voe.py b/youtube_dl/extractor/voe.py
index 4f24e50bb..c4512154d 100644
--- a/youtube_dl/extractor/voe.py
+++ b/youtube_dl/extractor/voe.py
@@ -2,7 +2,11 @@
 from __future__ import unicode_literals
 
 from .common import InfoExtractor
-
+from ..utils import (
+    int_or_none,
+    js_to_json,
+    url_or_none,
+)
 
 class VOEIE(InfoExtractor):
     IE_NAME = 'voe'
@@ -12,7 +16,7 @@ class VOEIE(InfoExtractor):
         'url': 'https://voe.sx/e/ng7ja5n5n2y8',
         'info_dict': {
             'id': 'ng7ja5n5n2y8',
-            'title': 'md5:05ab15eb43a32f0f5918755156c5fb34',
+            'title': 'md5:a86687fb962742f04652aee19ad34e06',
             'thumbnail': r're:^https?://.*\.jpg$',
             'ext': 'm3u8',
         },
@@ -24,21 +28,34 @@ class VOEIE(InfoExtractor):
         webpage = self._download_webpage(
             'https://voe.sx/e/%s' % video_id, video_id)
 
-        m3u8 = self._search_regex(
-            r'(https.+m3u8)',
-            webpage, 'm3u8')
+        sources = self._parse_json(
+            self._search_regex(r'\bsources\s*=\s*(\{[^}]+\})', webpage, 'sources'),
+            video_id, transform_source=js_to_json)
 
         title = self._search_regex(
-            r'<title>Watch (?P<title>.+)<\/title>',
+            r'<title>(?:Watch\s+)?(?P<title>.+?)(?:-\s+VOE\s+\|.+)?</title>',
             webpage, 'title', group='title')
 
-        thumbnail = self._search_regex(
-            r'VOEPlayer.poster="(?P<thumbnail>https.+)"',
-            webpage, 'thumbnail', group='thumbnail')
+        formats = []
+
+        f_url = url_or_none(sources.get('hls'))
+        if f_url:
+            formats.extend(self._extract_m3u8_formats(
+                f_url, video_id, entry_protocol='m3u8_native', fatal=False))
+        f_url = url_or_none(sources.get('mp4'))
+        if f_url:
+            formats.append({
+                'url': f_url,
+                'ext': 'mp4',
+                'height': int_or_none(sources.get('video_height')),
+            })
 
-        formats = self._extract_m3u8_formats(m3u8, video_id)
         self._sort_formats(formats)
 
+        thumbnail = url_or_none(self._search_regex(
+            r'(?:VOEPlayer.|data-)poster\s*=\s*(["\'])(?P<thumbnail>(?:(?!\1)\S)+)\1',
+            webpage, 'thumbnail', group='thumbnail', default=None))
+
         return {
             'id': video_id,
             'title': title,

From d4d99b1b51d21c48c23c93e99565500d4ac66d05 Mon Sep 17 00:00:00 2001
From: dirkf <fieldhouse@gmx.net>
Date: Thu, 17 Nov 2022 19:29:59 +0000
Subject: [PATCH 3/3] Linty

---
 youtube_dl/extractor/voe.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/youtube_dl/extractor/voe.py b/youtube_dl/extractor/voe.py
index c4512154d..870a6b1aa 100644
--- a/youtube_dl/extractor/voe.py
+++ b/youtube_dl/extractor/voe.py
@@ -8,6 +8,7 @@ from ..utils import (
     url_or_none,
 )
 
+
 class VOEIE(InfoExtractor):
     IE_NAME = 'voe'
     IE_DESC = 'VOE.SX'