From cce8f4571eb29b40c24504d7a9b8743eac7c73b0 Mon Sep 17 00:00:00 2001 From: danik Date: Thu, 16 Nov 2017 02:41:08 +0100 Subject: [PATCH 1/5] [openload] Support [www.]openload.link URLs and make the extractor pass flake8 --- youtube_dl/extractor/openload.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index b50d6c77b..bfbb3a0bf 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -140,7 +140,7 @@ class PhantomJSwrapper(object): for name in self._TMP_FILE_NAMES: try: os.remove(self._TMP_FILES[name].name) - except: + except (OSError, TypeError): pass def _save_cookies(self, url): @@ -242,7 +242,7 @@ class PhantomJSwrapper(object): class OpenloadIE(InfoExtractor): - _VALID_URL = r'https?://(?:openload\.(?:co|io)|oload\.tv)/(?:f|embed)/(?P[a-zA-Z0-9-_]+)' + _VALID_URL = r'https?://(?:www\.)?(?:openload\.(?:co|io|link)|oload\.tv)/(?:f|embed)/(?P[a-zA-Z0-9-_]+)' _TESTS = [{ 'url': 'https://openload.co/f/kUEfGclsU9o', From 8479ca10b4c571edf67f18d020762e2846ed52e7 Mon Sep 17 00:00:00 2001 From: danik Date: Wed, 22 Nov 2017 13:33:43 +0100 Subject: [PATCH 2/5] Support [www.]openload.link URLs in the Openload extractor and make the extractor pass flake8; added match-only test for the new URL format --- youtube_dl/extractor/openload.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index bfbb3a0bf..982ad889e 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -286,6 +286,9 @@ class OpenloadIE(InfoExtractor): }, { 'url': 'https://oload.tv/embed/KnG-kKZdcfY/', 'only_matching': True, + }, { + 'url': 'http://www.openload.link/f/KnG-kKZdcfY', + 'only_matching': True, }] _USER_AGENT = 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2924.87 Safari/537.36' From 91e314d099bf565f9a626842b696d7d05bf9c168 Mon Sep 17 00:00:00 2001 From: danik Date: Wed, 22 Nov 2017 15:32:45 +0100 Subject: [PATCH 3/5] Support [www.]openload.link URLs in the Openload extractor and make the extractor pass flake8; removed TypeError catch --- youtube_dl/extractor/openload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index 982ad889e..2faef504f 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -140,7 +140,7 @@ class PhantomJSwrapper(object): for name in self._TMP_FILE_NAMES: try: os.remove(self._TMP_FILES[name].name) - except (OSError, TypeError): + except OSError: pass def _save_cookies(self, url): From c47225dc7199581c3a181be440475d9cf07db707 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sun, 26 Nov 2017 00:03:10 +0700 Subject: [PATCH 4/5] Update openload.py --- youtube_dl/extractor/openload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index 2faef504f..a99af12a4 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -140,7 +140,7 @@ class PhantomJSwrapper(object): for name in self._TMP_FILE_NAMES: try: os.remove(self._TMP_FILES[name].name) - except OSError: + except (IOError, OSError): pass def _save_cookies(self, url): From e0121baa2581a83e6c72071be8d546b5c059bdf8 Mon Sep 17 00:00:00 2001 From: Sergey M Date: Sun, 26 Nov 2017 00:03:46 +0700 Subject: [PATCH 5/5] Update openload.py --- youtube_dl/extractor/openload.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/youtube_dl/extractor/openload.py b/youtube_dl/extractor/openload.py index a99af12a4..efa5d4601 100644 --- a/youtube_dl/extractor/openload.py +++ b/youtube_dl/extractor/openload.py @@ -140,7 +140,7 @@ class PhantomJSwrapper(object): for name in self._TMP_FILE_NAMES: try: os.remove(self._TMP_FILES[name].name) - except (IOError, OSError): + except: pass def _save_cookies(self, url):