From 47e985e64260ea3c882a9614bda5a9bd2eefa029 Mon Sep 17 00:00:00 2001 From: Michel Roux Date: Fri, 27 Oct 2023 11:03:33 +0200 Subject: [PATCH] Update dep, fix tinfoil --- commands/tinfoil.py | 5 +++-- poetry.lock | 28 ++++++++++++++-------------- pyproject.toml | 12 ++++++------ 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/commands/tinfoil.py b/commands/tinfoil.py index 9645fd2..fea0bc6 100755 --- a/commands/tinfoil.py +++ b/commands/tinfoil.py @@ -82,7 +82,7 @@ def get_title_fullid(name): def get_title_shortid(name): id = get_title_fullid(name) - return id[0:-4] if id in titles else None + return id[0:-4] if id and id in titles else None clean("nsz/base", bases) @@ -101,9 +101,10 @@ except subprocess.CalledProcessError: for base in bases: + ascii = base[0:1].isascii() shortid = get_title_shortid(base) - if shortid: + if shortid and ascii: download("nsz/base", base) for dlc in dlcs: diff --git a/poetry.lock b/poetry.lock index f17f366..92a4340 100644 --- a/poetry.lock +++ b/poetry.lock @@ -380,13 +380,13 @@ test = ["appdirs (==1.4.4)", "covdefaults (>=2.3)", "pytest (>=7.4)", "pytest-co [[package]] name = "pycodestyle" -version = "2.11.0" +version = "2.11.1" description = "Python style guide checker" optional = false python-versions = ">=3.8" files = [ - {file = "pycodestyle-2.11.0-py2.py3-none-any.whl", hash = "sha256:5d1013ba8dc7895b548be5afb05740ca82454fd899971563d2ef625d090326f8"}, - {file = "pycodestyle-2.11.0.tar.gz", hash = "sha256:259bcc17857d8a8b3b4a2327324b79e5f020a13c16074670f9c8c8f872ea76d0"}, + {file = "pycodestyle-2.11.1-py2.py3-none-any.whl", hash = "sha256:44fe31000b2d866f2e41841b18528a505fbd7fef9017b04eff4e2648a0fadc67"}, + {file = "pycodestyle-2.11.1.tar.gz", hash = "sha256:41ba0e7afc9752dfb53ced5489e89f8186be00e599e712660695b7a75ff2663f"}, ] [[package]] @@ -474,13 +474,13 @@ typing-extensions = "*" [[package]] name = "types-beautifulsoup4" -version = "4.12.0.6" +version = "4.12.0.7" description = "Typing stubs for beautifulsoup4" optional = false -python-versions = "*" +python-versions = ">=3.7" files = [ - {file = "types-beautifulsoup4-4.12.0.6.tar.gz", hash = "sha256:045ab285d3e540186e16133612f43f67e31f910e6d7578906b43a0ad8f811347"}, - {file = "types_beautifulsoup4-4.12.0.6-py3-none-any.whl", hash = "sha256:3da00d754e73afae0ec2793253af0cb9aa1ff2c730e34b31c60313da781b4f6f"}, + {file = "types-beautifulsoup4-4.12.0.7.tar.gz", hash = "sha256:59980028d29bf55d0db359efa305b75bacf0cb92e3f3f6b3fd408f2531df274c"}, + {file = "types_beautifulsoup4-4.12.0.7-py3-none-any.whl", hash = "sha256:8b03b054cb2e62abf82bbbeda57a07257026f4ed9010ef17d8f8eff43bb1f9b7"}, ] [package.dependencies] @@ -499,13 +499,13 @@ files = [ [[package]] name = "types-requests" -version = "2.31.0.8" +version = "2.31.0.10" description = "Typing stubs for requests" optional = false python-versions = ">=3.7" files = [ - {file = "types-requests-2.31.0.8.tar.gz", hash = "sha256:e1b325c687b3494a2f528ab06e411d7092cc546cc9245c000bacc2fca5ae96d4"}, - {file = "types_requests-2.31.0.8-py3-none-any.whl", hash = "sha256:39894cbca3fb3d032ed8bdd02275b4273471aa5668564617cc1734b0a65ffdf8"}, + {file = "types-requests-2.31.0.10.tar.gz", hash = "sha256:dc5852a76f1eaf60eafa81a2e50aefa3d1f015c34cf0cba130930866b1b22a92"}, + {file = "types_requests-2.31.0.10-py3-none-any.whl", hash = "sha256:b32b9a86beffa876c0c3ac99a4cd3b8b51e973fb8e3bd4e0a6bb32c7efad80fc"}, ] [package.dependencies] @@ -524,13 +524,13 @@ files = [ [[package]] name = "urllib3" -version = "2.0.6" +version = "2.0.7" description = "HTTP library with thread-safe connection pooling, file post, and more." optional = false python-versions = ">=3.7" files = [ - {file = "urllib3-2.0.6-py3-none-any.whl", hash = "sha256:7a7c7003b000adf9e7ca2a377c9688bbc54ed41b985789ed576570342a375cd2"}, - {file = "urllib3-2.0.6.tar.gz", hash = "sha256:b19e1a85d206b56d7df1d5e683df4a7725252a964e3993648dd0fb5a1c157564"}, + {file = "urllib3-2.0.7-py3-none-any.whl", hash = "sha256:fdb6d215c776278489906c2f8916e6e7d4f5a9b602ccbcfdf7f016fc8da0596e"}, + {file = "urllib3-2.0.7.tar.gz", hash = "sha256:c97dfde1f7bd43a71c8d2a58e369e9b2bf692d1334ea9f9cae55add7d0dd0f84"}, ] [package.extras] @@ -542,4 +542,4 @@ zstd = ["zstandard (>=0.18.0)"] [metadata] lock-version = "2.0" python-versions = "^3.8.1" -content-hash = "23e53d534cec89448162db882ec3b8e2a0e0d6f130af2618a193fa2957b4c1f1" +content-hash = "06c78c86ed33a8882e05df2e34c59bb6d927f212e3cbce5e311488b2b7a9dfa2" diff --git a/pyproject.toml b/pyproject.toml index be006b7..e77c384 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -7,19 +7,19 @@ authors = ["Michel Roux "] [tool.poetry.dependencies] python = "^3.8.1" beautifulsoup4 = "^4.12.2" -charset-normalizer = "^3.3.0" +charset-normalizer = "^3.3.1" requests = "^2.31.0" -transmission-rpc = "^7.0.1" +transmission-rpc = "^7.0.3" [tool.poetry.group.dev.dependencies] -black = "^23.9.1" +black = "^23.10.1" flake8 = "^6.1.0" flake8-alphabetize = "^0.0.21" flake8-black = "^0.3.6" flake8-pyproject = "^1.2.3" -mypy = "^1.5.1" -types-beautifulsoup4 = "^4.12.0.6" -types-requests = "^2.31.0.7" +mypy = "^1.6.1" +types-beautifulsoup4 = "^4.12.0.7" +types-requests = "^2.31.0.10" [tool.flake8] max-line-length = 100