From c61f271c9c9c6a55fd2791dd50df3519219568ed Mon Sep 17 00:00:00 2001 From: dirkf Date: Thu, 9 Feb 2023 11:17:03 +0000 Subject: [PATCH] Apply suggestions from code review --- test/helper.py | 2 ++ test/test_downloader_http.py | 6 +++++- test/test_external_downloader.py | 7 ++++++- test/test_http.py | 5 ++++- youtube_dl/downloader/external.py | 8 ++------ 5 files changed, 19 insertions(+), 9 deletions(-) diff --git a/test/helper.py b/test/helper.py index 6f75cdc48..883b2e877 100644 --- a/test/helper.py +++ b/test/helper.py @@ -88,6 +88,7 @@ class FakeYDL(YoutubeDL): old_report_warning(message) self.report_warning = types.MethodType(report_warning, self) + class FakeLogger(object): def debug(self, msg): pass @@ -98,6 +99,7 @@ class FakeLogger(object): def error(self, msg): pass + def gettestcases(include_onlymatching=False): for ie in youtube_dl.extractor.gen_extractors(): for tc in ie.get_testcases(include_onlymatching): diff --git a/test/test_downloader_http.py b/test/test_downloader_http.py index 3b2bdcbd4..4e6d7a2a0 100644 --- a/test/test_downloader_http.py +++ b/test/test_downloader_http.py @@ -9,7 +9,11 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from test.helper import FakeLogger, http_server_port, try_rm +from test.helper import ( + FakeLogger, + http_server_port, + try_rm, +) from youtube_dl import YoutubeDL from youtube_dl.compat import compat_http_server from youtube_dl.downloader.http import HttpFD diff --git a/test/test_external_downloader.py b/test/test_external_downloader.py index b859f9482..c0239502b 100644 --- a/test/test_external_downloader.py +++ b/test/test_external_downloader.py @@ -10,7 +10,11 @@ import subprocess import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from test.helper import FakeLogger, http_server_port, try_rm +from test.helper import ( + FakeLogger, + http_server_port, + try_rm, +) from youtube_dl import YoutubeDL from youtube_dl.compat import compat_http_server from youtube_dl.utils import encodeFilename @@ -22,6 +26,7 @@ TEST_DIR = os.path.dirname(os.path.abspath(__file__)) TEST_SIZE = 10 * 1024 + class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler): def log_message(self, format, *args): pass diff --git a/test/test_http.py b/test/test_http.py index ed81a2b8a..487a9bc77 100644 --- a/test/test_http.py +++ b/test/test_http.py @@ -8,7 +8,10 @@ import sys import unittest sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) -from test.helper import http_server_port, FakeLogger +from test.helper import ( + FakeLogger, + http_server_port, +) from youtube_dl import YoutubeDL from youtube_dl.compat import compat_http_server, compat_urllib_request import ssl diff --git a/youtube_dl/downloader/external.py b/youtube_dl/downloader/external.py index 5b3fcc4eb..bffcd10b6 100644 --- a/youtube_dl/downloader/external.py +++ b/youtube_dl/downloader/external.py @@ -233,11 +233,7 @@ class Aria2pFD(ExternalFD): 'max-connection-per-server': 4, 'auto-file-renaming': 'false', } - download_dir = os.path.dirname(tmpfilename) - if download_dir: - options['dir'] = download_dir - else: - options['dir'] = os.path.abspath('.') + options['dir'] = os.path.dirname(tmpfilename) or os.path.abspath('.') options['out'] = os.path.basename(tmpfilename) options['header'] = [] for key, val in info_dict['http_headers'].items(): @@ -259,7 +255,7 @@ class Aria2pFD(ExternalFD): }) self._hook_progress(status) time.sleep(.5) - return not download.status == 'complete' + return download.status != 'complete' class HttpieFD(ExternalFD):