MarcoBuster/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-28 07:36:52 +01:00
Code Issues Projects Releases Wiki Activity

[exractor/lbry] Use HEAD request for redirect URL (#4181)

Browse Source 
and misc cleanup 

Authored by: flashdagger
This commit is contained in:
MMM 2022-06-27 02:33:31 +02:00 committed by GitHub
parent e08f72e675
commit 8a40bffaf9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
yt_dlp/extractor/lbry.py
View File

@ -2,19 +2,17 @@
import json import json
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import compat_str, compat_urllib_parse_unquote
compat_str,
compat_urllib_parse_unquote,
)
from ..utils import ( from ..utils import (
determine_ext,
ExtractorError, ExtractorError,
HEADRequest,
OnDemandPagedList,
UnsupportedError,
determine_ext,
int_or_none, int_or_none,
mimetype2ext, mimetype2ext,
parse_qs, parse_qs,
OnDemandPagedList,
try_get, try_get,
UnsupportedError,
urljoin, urljoin,
) )
@ -91,7 +89,7 @@ class LBRYIE(LBRYBaseIE):
_TESTS = [{ _TESTS = [{
# Video # Video
'url': 'https://lbry.tv/@Mantega:1/First-day-LBRY:1', 'url': 'https://lbry.tv/@Mantega:1/First-day-LBRY:1',
'md5': '65bd7ec1f6744ada55da8e4c48a2edf9', 'md5': 'fffd15d76062e9a985c22c7c7f2f4805',
'info_dict': { 'info_dict': {
'id': '17f983b61f53091fb8ea58a9c56804e4ff8cff4d', 'id': '17f983b61f53091fb8ea58a9c56804e4ff8cff4d',
'ext': 'mp4', 'ext': 'mp4',
@ -103,6 +101,19 @@ class LBRYIE(LBRYBaseIE):
'release_date': '20200721', 'release_date': '20200721',
'width': 1280, 'width': 1280,
'height': 720, '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 # Audio
@ -123,11 +134,13 @@ class LBRYIE(LBRYBaseIE):
'channel_id': '0ed629d2b9c601300cacf7eabe9da0be79010212', 'channel_id': '0ed629d2b9c601300cacf7eabe9da0be79010212',
'channel_url': 'https://lbry.tv/@LBRYFoundation:0ed629d2b9c601300cacf7eabe9da0be79010212', 'channel_url': 'https://lbry.tv/@LBRYFoundation:0ed629d2b9c601300cacf7eabe9da0be79010212',
'vcodec': 'none', 'vcodec': 'none',
'thumbnail': 'https://spee.ch/d/0bc63b0e6bf1492d.png',
'license': 'None',
} }
}, { }, {
# HLS # HLS
'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e', 'url': 'https://odysee.com/@gardeningincanada:b/plants-i-will-never-grow-again.-the:e',
'md5': 'fc82f45ea54915b1495dd7cb5cc1289f', 'md5': '25049011f3c8bc2f8b60ad88a031837e',
'info_dict': { 'info_dict': {
'id': 'e51671357333fe22ae88aad320bde2f6f96b1410', 'id': 'e51671357333fe22ae88aad320bde2f6f96b1410',
'ext': 'mp4', 'ext': 'mp4',
@ -143,12 +156,14 @@ class LBRYIE(LBRYBaseIE):
'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc', 'channel_id': 'b8be0e93b423dad221abe29545fbe8ec36e806bc',
'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc', 'channel_url': 'https://odysee.com/@gardeningincanada:b8be0e93b423dad221abe29545fbe8ec36e806bc',
'formats': 'mincount:3', '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', 'url': 'https://odysee.com/@BrodieRobertson:5/apple-is-tracking-everything-you-do-on:e',
'only_matching': True, '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, 'only_matching': True,
}, { }, {
'url': 'https://lbry.tv/Episode-1:e7d93d772bd87e2b62d5ab993c1c3ced86ebb396', 'url': 'https://lbry.tv/Episode-1:e7d93d772bd87e2b62d5ab993c1c3ced86ebb396',
@ -183,11 +198,12 @@ def _real_extract(self, url):
uri = 'lbry://' + display_id uri = 'lbry://' + display_id
result = self._resolve_url(uri, display_id, 'stream') result = self._resolve_url(uri, display_id, 'stream')
if result['value'].get('stream_type') in self._SUPPORTED_STREAM_TYPES: 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( streaming_url = self._call_api_proxy(
'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url'] 'get', claim_id, {'uri': uri}, 'streaming url')['streaming_url']
final_url = self._request_webpage( 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': elif result.get('value_type') == 'stream':
claim_id, is_live = result['signing_channel']['claim_id'], True claim_id, is_live = result['signing_channel']['claim_id'], True
headers = {'referer': 'https://player.odysee.live/'} headers = {'referer': 'https://player.odysee.live/'}
@ -227,7 +243,7 @@ class LBRYChannelIE(LBRYBaseIE):
'title': 'The LBRY Foundation', 'title': 'The LBRY Foundation',
'description': 'Channel for the LBRY Foundation. Follow for updates and news.', 'description': 'Channel for the LBRY Foundation. Follow for updates and news.',
}, },
'playlist_count': 29, 'playlist_mincount': 29,
}, { }, {
'url': 'https://lbry.tv/@LBRYFoundation', 'url': 'https://lbry.tv/@LBRYFoundation',
'only_matching': True, 'only_matching': True,