ruff fixes

Author: FredHappyface

sigstickers/__main__.py

@@ -1,4 +1,4 @@
-""" entry point for python -m sigstickers """
+""" entry point for python -m sigstickers. """
 
 from sigstickers.cli import cli
 

sigstickers/cli.py

@@ -1,6 +1,10 @@
 """Download sticker packs from Signal."""
+from __future__ import annotations
+
 import argparse
 import asyncio
+import functools
+import operator
 from sys import exit as sysexit
 from urllib import parse
 
@@ -21,7 +25,7 @@ def cli() -> None:
 	)
 	args = parser.parse_args()
 	# Get the packs
-	packs: list[str] = sum(args.pack or [[]], [])
+	packs: list[str] = functools.reduce(operator.iadd, args.pack or [[]], [])
 	if not packs:
 		packs = []
 		while True:
@@ -32,7 +36,7 @@ def cli() -> None:
 	return main(packs)
 
 
-def main(packs):
+def main(packs) -> None:
 	"""Main function to download sticker packs."""
 	for pack in packs:
 		pack_attrs: dict[str, list[str]] = parse.parse_qs(parse.urlparse(pack).fragment)

sigstickers/downloader.py

@@ -58,10 +58,7 @@ def _sanitize_filename(filename: str) -> str:
 	sanitized_filename = re.sub(r"[^\w\s.-]", "_", filename)
 	sanitized_filename = re.sub(r"\s+", "_", sanitized_filename)
 	sanitized_filename = sanitized_filename.strip(" .")
-	sanitized_filename = (
-		unicodedata.normalize("NFKD", sanitized_filename).encode("ascii", "ignore").decode()
-	)
-	return sanitized_filename
+	return unicodedata.normalize("NFKD", sanitized_filename).encode("ascii", "ignore").decode()
 
 
 async def download_pack(pack_id: str, pack_key: str, cwd: Path = Path.cwd()) -> tuple[Path, Path]:
@@ -138,7 +135,7 @@ def convert_with_pil(input_path: Path) -> list[str]:
 	return [png_file, gif_file]
 
 
-async def convert_pack(swd: Path, pack_name: Path, *, no_cache=False):
+async def convert_pack(swd: Path, pack_name: Path, *, no_cache=False) -> None:
 	"""Convert the webp images into png and gif images.
 
 	Args:

tests/test_caching.py

@@ -11,7 +11,7 @@
 file_exists_2 = ".gitignore"
 
 
-def test_verify_converted_v1():
+def test_verify_converted_v1() -> None:
 	pack_name = "Test_Pack_v1"
 	cache_file = CACHE_DIR / pack_name
 	cache_data = {
@@ -23,7 +23,7 @@ def test_verify_converted_v1():
 	assert verify_converted(Path(pack_name))
 
 
-def test_verify_converted_v2():
+def test_verify_converted_v2() -> None:
 	pack_name = "Test_Pack_v2"
 	cache_file = CACHE_DIR / pack_name
 	cache_data = {
@@ -36,7 +36,7 @@ def test_verify_converted_v2():
 	assert verify_converted(Path(pack_name))
 
 
-def test_create_converted():
+def test_create_converted() -> None:
 	pack_name = "Test_Pack"
 	cache_data = {"example_key": "example_value"}
 

tests/test_downloader.py

@@ -6,15 +6,15 @@
 from sigstickers.downloader import download_pack
 
 
-@pytest.fixture(scope="function")
+@pytest.fixture()
 def test_data():
 	test_dir = Path("test_data")
 	yield test_dir
 	shutil.rmtree(test_dir)
 
 
 @pytest.mark.asyncio()
-async def test_download_pack(test_data):
+async def test_download_pack(test_data) -> None:
 	pack_id = "b676ec334ee2f771cadff5d095971e8c"
 	pack_key = "c957a57000626a2dc3cb69bf0e79c91c6b196b74d4d6ca1cbb830d3ad0ad4e36"
 	sticker_dir, _pack_name = await download_pack(pack_id, pack_key, cwd=test_data)
@@ -23,7 +23,7 @@ async def test_download_pack(test_data):
 
 
 @pytest.mark.asyncio()
-async def test_download_pack_bad_name(test_data):
+async def test_download_pack_bad_name(test_data) -> None:
 	pack_id = "4d92b5e3e92d1ac099830b17ac10793d"
 	pack_key = "c8526aa2e25b911a405d39c1d4ee3977586e945550fddc33e1316626116da512"
 	sticker_dir, _pack_name = await download_pack(pack_id, pack_key, cwd=test_data)

tests/test_user.py

@@ -22,7 +22,7 @@
 ]
 
 
-def test_downloadPack():
+def test_downloadPack() -> None:
 	swd, packName = asyncio.run(
 		downloader.download_pack(packs[0]["packId"], packs[0]["packKey"], cwd)
 	)
@@ -33,7 +33,7 @@ def test_downloadPack():
 	assert len(list(Path(f"{cwd}/downloads/DonutTheDog/webp").iterdir())) == packs[0]["len"]
 
 
-def test_convertPack():
+def test_convertPack() -> None:
 	swd, packName = asyncio.run(
 		downloader.download_pack(packs[0]["packId"], packs[0]["packKey"], cwd)
 	)