github/gallery-dl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[ytdl] fix crash due to --geo-bypass deprecation (#3975)

Browse Source
This commit is contained in:
Mike Fährmann
2023-04-29 17:25:38 +02:00
parent 0fb580135d
commit 61a65d5bb9
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
gallery_dl/ytdl.py
View File

@@ -409,9 +409,12 @@ def parse_command_line(module, argv):
"postprocessor_args": opts.postprocessor_args, "postprocessor_args": opts.postprocessor_args,
"cn_verification_proxy": opts.cn_verification_proxy, "cn_verification_proxy": opts.cn_verification_proxy,
"geo_verification_proxy": opts.geo_verification_proxy, "geo_verification_proxy": opts.geo_verification_proxy,
"geo_bypass": opts.geo_bypass, "geo_bypass": getattr(
"geo_bypass_country": opts.geo_bypass_country, opts, "geo_bypass", "default"),
"geo_bypass_ip_block": opts.geo_bypass_ip_block, "geo_bypass_country": getattr(
opts, "geo_bypass_country", None),
"geo_bypass_ip_block": getattr(
opts, "geo_bypass_ip_block", None),
"compat_opts": compat_opts, "compat_opts": compat_opts,
} }

10
test/test_ytdl.py
View File

@@ -269,6 +269,16 @@ class Test_CommandlineArguments_YtDlp(Test_CommandlineArguments):
"title:%(artist)s - %(title)s")], "title:%(artist)s - %(title)s")],
}) })
def test_geo_bypass(self):
self._("--geo-bypass",
"geo_bypass", "default")
self._("--no-geo-bypass",
"geo_bypass", "never")
self._(["--geo-bypass-country", "EN"],
"geo_bypass", "EN")
self._(["--geo-bypass-ip-block", "198.51.100.14/24"],
"geo_bypass", "198.51.100.14/24")
if __name__ == "__main__": if __name__ == "__main__":
unittest.main(warnings="ignore") unittest.main(warnings="ignore")