Linty

Make test pass
Linty
2024-12-22 12:10:10 +09:00 · 2024-11-18 03:36:46 +00:00 · 2024-11-18 03:30:38 +00:00 · 2024-11-18 02:48:29 +00:00 · 2024-11-18 02:39:56 +00:00
1 changed files with 6 additions and 8 deletions
--- a/youtube_dl/extractor/voe.py
+++ b/youtube_dl/extractor/voe.py
@ -1,9 +1,8 @@
 # coding: utf-8
 from __future__ import unicode_literals

-import base64
-
 from .common import InfoExtractor
+from ..compat import compat_base64_b64decode
 from ..utils import (
    int_or_none,
    js_to_json,
@ -19,7 +18,7 @@ class VOEIE(InfoExtractor):
        'url': 'https://voe.sx/e/ng7ja5n5n2y8',
        'info_dict': {
            'id': 'ng7ja5n5n2y8',
-            'title': 'md5:a86687fb962742f04652aee19ad34e06',
+            'title': 'md5:8dd774de9b73851151d80ef6baaea7f1',
            'thumbnail': r're:^https?://.*\.jpg$',
            'ext': 'm3u8',
        },
@ -32,25 +31,24 @@ class VOEIE(InfoExtractor):
            'https://voe.sx/e/%s' % video_id, video_id)

        player_url = self._search_regex(
-            r'''("|')(?P<url>https://(?!voe\.sx/)[^/]+%s)\1\s*;''' % (path,),
+            r'''("|')(?P<url>https://(?!voe\.sx/)[^/]+%s)\1\s*;''' % (video_path,),
            webpage, 'redirect', group='url', default=None)
        if player_url:
            webpage = self._download_webpage(
                player_url, video_id, note='Redirecting to player page')

-
        sources = self._search_json(
-            r'\bsources\s*=', webpage, 'sources', video_id,  transform_source=js_to_json)      
+            r'\bsources\s*=', webpage, 'sources', video_id, transform_source=js_to_json)

        title = self._search_regex(
            r'<title>(?:Watch\s+)?(?P<title>.+?)(?:-\s+VOE\s+\|.+)?</title>',
            webpage, 'title', group='title')

        formats = []
-        for fmt in ('mp4, 'hls'):
+        for fmt in ('mp4', 'hls'):
            if fmt not in sources:
                continue
-            sources[fmt] = url_or_none(sources['fmt']) or url_or_none(base64.b64decode(sources['fmt']))
+            sources[fmt] = url_or_none(sources[fmt]) or url_or_none(compat_base64_b64decode(sources[fmt]).decode('utf-8'))
            f_url = sources.get('hls')
        if f_url:
            formats.extend(self._extract_m3u8_formats(
Author	SHA1	Message	Date
dirkf	e29f8e8707	Linty	2024-11-18 03:36:46 +00:00
dirkf	9179a0294b	Make test pass	2024-11-18 03:30:38 +00:00
dirkf	0b817e51c2	Linty	2024-11-18 02:48:29 +00:00
dirkf	ff968566a5	Fix quoting	2024-11-18 02:39:56 +00:00