pepepper/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl synced 2025-07-27 05:44:13 +09:00
Code Issues Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source
This commit is contained in:
dirkf 2023-02-09 11:17:03 +00:00 committed by GitHub
parent f2473ff30f
commit c61f271c9c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/helper.py
View File

@ -88,6 +88,7 @@ class FakeYDL(YoutubeDL):
old_report_warning(message) old_report_warning(message)
self.report_warning = types.MethodType(report_warning, self) self.report_warning = types.MethodType(report_warning, self)
class FakeLogger(object): class FakeLogger(object):
def debug(self, msg): def debug(self, msg):
pass pass
@ -98,6 +99,7 @@ class FakeLogger(object):
def error(self, msg): def error(self, msg):
pass pass
def gettestcases(include_onlymatching=False): def gettestcases(include_onlymatching=False):
for ie in youtube_dl.extractor.gen_extractors(): for ie in youtube_dl.extractor.gen_extractors():
for tc in ie.get_testcases(include_onlymatching): for tc in ie.get_testcases(include_onlymatching):

6
test/test_downloader_http.py
View File

@ -9,7 +9,11 @@ import sys
import unittest import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) 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 import YoutubeDL
from youtube_dl.compat import compat_http_server from youtube_dl.compat import compat_http_server
from youtube_dl.downloader.http import HttpFD from youtube_dl.downloader.http import HttpFD

7
test/test_external_downloader.py
View File

@ -10,7 +10,11 @@ import subprocess
import unittest import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) 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 import YoutubeDL
from youtube_dl.compat import compat_http_server from youtube_dl.compat import compat_http_server
from youtube_dl.utils import encodeFilename from youtube_dl.utils import encodeFilename
@ -22,6 +26,7 @@ TEST_DIR = os.path.dirname(os.path.abspath(__file__))
TEST_SIZE = 10 * 1024 TEST_SIZE = 10 * 1024
class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler): class HTTPTestRequestHandler(compat_http_server.BaseHTTPRequestHandler):
def log_message(self, format, *args): def log_message(self, format, *args):
pass pass

5
test/test_http.py
View File

@ -8,7 +8,10 @@ import sys
import unittest import unittest
sys.path.insert(0, os.path.dirname(os.path.dirname(os.path.abspath(__file__)))) 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 import YoutubeDL
from youtube_dl.compat import compat_http_server, compat_urllib_request from youtube_dl.compat import compat_http_server, compat_urllib_request
import ssl import ssl

8
youtube_dl/downloader/external.py
View File

@ -233,11 +233,7 @@ class Aria2pFD(ExternalFD):
'max-connection-per-server': 4, 'max-connection-per-server': 4,
'auto-file-renaming': 'false', 'auto-file-renaming': 'false',
} }
download_dir = os.path.dirname(tmpfilename) options['dir'] = os.path.dirname(tmpfilename) or os.path.abspath('.')
if download_dir:
options['dir'] = download_dir
else:
options['dir'] = os.path.abspath('.')
options['out'] = os.path.basename(tmpfilename) options['out'] = os.path.basename(tmpfilename)
options['header'] = [] options['header'] = []
for key, val in info_dict['http_headers'].items(): for key, val in info_dict['http_headers'].items():
@ -259,7 +255,7 @@ class Aria2pFD(ExternalFD):
}) })
self._hook_progress(status) self._hook_progress(status)
time.sleep(.5) time.sleep(.5)
return not download.status == 'complete' return download.status != 'complete'
class HttpieFD(ExternalFD): class HttpieFD(ExternalFD):