From 66029ad199bd3ae6ffdde0ebb727b4043656503c Mon Sep 17 00:00:00 2001 From: Alexandre Macabies Date: Sun, 22 Apr 2018 14:41:45 +0200 Subject: [PATCH 1/2] [openload] Generic IP v4 & v6 stream URL parsing (fixes #16137) --- youtube_dl/extractor/openload.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index 650f95656..b1f7ae316 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -340,7 +340,9 @@ class OpenloadIE(InfoExtractor): get_element_by_id('streamurj', webpage) or self._search_regex( (r'>\s*([\w-]+~\d{10,}~\d+\.\d+\.0\.0~[\w-]+)\s*<', - r'>\s*([\w~-]+~\d+\.\d+\.\d+\.\d+~[\w~-]+)'), webpage, + r'>\s*([\w~-]+~\d+\.\d+\.\d+\.\d+~[\w~-]+)', + # someId~someIPv6~someId + r'>\s*([\w~-]+?~[a-f0-9:]+~[\w~-]+)\s*<'), webpage, 'stream URL')) video_url = 'https://openload.co/stream/%s?mime=true' % decoded_id From e6f3908ebc63c28f60db41fa8e6b4d4ec2d9c1b2 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Wed, 25 Apr 2018 00:48:01 +0700 Subject: [PATCH 2/2] Update openload.py --- youtube_dl/extractor/openload.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index b1f7ae316..d0bdd60b8 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -341,8 +341,9 @@ class OpenloadIE(InfoExtractor): self._search_regex( (r'>\s*([\w-]+~\d{10,}~\d+\.\d+\.0\.0~[\w-]+)\s*<', r'>\s*([\w~-]+~\d+\.\d+\.\d+\.\d+~[\w~-]+)', - # someId~someIPv6~someId - r'>\s*([\w~-]+?~[a-f0-9:]+~[\w~-]+)\s*<'), webpage, + r'>\s*([\w-]+~\d{10,}~(?:[a-f\d]+:){2}:~[\w-]+)\s*<', + r'>\s*([\w~-]+~[a-f0-9:]+~[\w~-]+)\s*<', + r'>\s*([\w~-]+~[a-f0-9:]+~[\w~-]+)'), webpage, 'stream URL')) video_url = 'https://openload.co/stream/%s?mime=true' % decoded_id