From 8a40bffaf9e02f73329b8bc66742fb817eda1a64 Mon Sep 17 00:00:00 2001 From: MMM Date: Mon, 27 Jun 2022 02:33:31 +0200 Subject: [PATCH] [exractor/lbry] Use HEAD request for redirect URL (#4181) and misc cleanup Authored by: flashdagger --- yt_dlp/extractor/lbry.py | 42 +++++++++++++++++++++++++++------------- 1 file changed, 29 insertions(+), 13 deletions(-) diff --git a/yt_dlp/extractor/lbry.py b/yt_dlp/extractor/lbry.py index 909720e8b..0e0ddbed8 100644 --- a/yt_dlp/extractor/lbry.py +++ b/yt_dlp/extractor/lbry.py @@ -2,19 +2,17 @@ import functools import json from .common import InfoExtractor -from ..compat import ( - compat_str, - compat_urllib_parse_unquote, -) +from ..compat import compat_str, compat_urllib_parse_unquote from ..utils import ( - determine_ext, ExtractorError, + HEADRequest, + OnDemandPagedList, + UnsupportedError, + determine_ext, int_or_none, mimetype2ext, parse_qs, - OnDemandPagedList, try_get, - UnsupportedError, urljoin, ) @@ -91,7 +89,7 @@ class LBRYIE(LBRYBaseIE): _TESTS = [{ # Video 'url': 'https://lbry.tv/@Mantega:1/First-day-LBRY:1', - 'md5': '65bd7ec1f6744ada55da8e4c48a2edf9', + 'md5': 'fffd15d76062e9a985c22c7c7f2f4805', 'info_dict': { 'id': '17f983b61f53091fb8ea58a9c56804e4ff8cff4d', 'ext': 'mp4', @@ -103,6 +101,19 @@ class LBRYIE(LBRYBaseIE): 'release_date': '20200721', 'width': 1280, 'height': 720, + 'thumbnail': 'https://spee.ch/7/67f2d809c263288c.png', + 'license': 'None', + 'duration': 346, + 'channel': 'LBRY/Odysee rats united!!!', + 'channel_id': '1c8ad6a2ab4e889a71146ae4deeb23bb92dab627', + 'channel_url': 'https://lbry.tv/@Mantega:1c8ad6a2ab4e889a71146ae4deeb23bb92dab627', + 'tags': [ + 'first day in lbry', + 'lbc', + 'lbry', + 'start', + 'tutorial' + ], } }, { # Audio @@ -123,11 +134,13 @@ class LBRYIE(LBRYBaseIE): 'channel_id': '0ed629d2b9c601300cacf7eabe9da0be79010212', 'channel_url': 'https://lbry.tv/@LBRYFoundation:0ed629d2b9c601300cacf7eabe9da0be79010212', 'vcodec': 'none', + 'thumbnail': 'https://spee.ch/d/0bc63b0e6bf1492d.png', + 'license': 'None', } }, { # HLS 'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e', - 'md5': 'fc82f45ea54915b1495dd7cb5cc1289f', + 'md5': '25049011f3c8bc2f8b60ad88a031837e', 'info_dict': { 'id': 'e51671357333fe22ae88aad320bde2f6f96b1410', 'ext': 'mp4', @@ -143,12 +156,14 @@ class LBRYIE(LBRYBaseIE): 'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc', 'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc', 'formats': 'mincount:3', + 'thumbnail': 'https://thumbnails.lbry.com/AgHSc_HzrrE', + 'license': 'Copyrighted (contact publisher)', } }, { 'url': 'https://odysee.com/@BrodieRobertson:5/apple-is-tracking-everything-you-do-on:e', 'only_matching': True, }, { - 'url': "https://odysee.com/@ScammerRevolts:b0/I-SYSKEY'D-THE-SAME-SCAMMERS-3-TIMES!:b", + 'url': 'https://odysee.com/@ScammerRevolts:b0/I-SYSKEY\'D-THE-SAME-SCAMMERS-3-TIMES!:b', 'only_matching': True, }, { 'url': 'https://lbry.tv/Episode-1:e7d93d772bd87e2b62d5ab993c1c3ced86ebb396', @@ -183,11 +198,12 @@ class LBRYIE(LBRYBaseIE): uri = 'lbry://' + display_id result = self._resolve_url(uri, display_id, 'stream') if result['value'].get('stream_type') in self._SUPPORTED_STREAM_TYPES: - claim_id, is_live, headers = result['claim_id'], False, None + claim_id, is_live, headers = result['claim_id'], False, {} streaming_url = self._call_api_proxy( 'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url'] final_url = self._request_webpage( - streaming_url, display_id, note='Downloading streaming redirect url info').geturl() + HEADRequest(streaming_url), display_id, + note='Downloading streaming redirect url info').geturl() elif result.get('value_type') == 'stream': claim_id, is_live = result['signing_channel']['claim_id'], True headers = {'referer': 'https://player.odysee.live/'} @@ -227,7 +243,7 @@ class LBRYChannelIE(LBRYBaseIE): 'title': 'The LBRY Foundation', 'description': 'Channel for the LBRY Foundation. Follow for updates and news.', }, - 'playlist_count': 29, + 'playlist_mincount': 29, }, { 'url': 'https://lbry.tv/@LBRYFoundation', 'only_matching': True,