Migrate to uv and fix issue with case sensitive filenames

Author: FredHappyface

.github/workflows/test-lint.yaml

@@ -20,6 +20,7 @@ jobs:
           - '3.10'
           - '3.11'
           - '3.12'
+          - '3.13'
 
     steps:
       - name: Checkout code
@@ -30,16 +31,16 @@ jobs:
         with:
           python-version: ${{ matrix.python-version }}
 
-      - name: Install Poetry
+      - name: Install UV
         run: |
-          curl -sSL https://install.python-poetry.org | python3 -
+          curl -LsSf https://astral.sh/uv/install.sh | sh
 
       - name: Install dependencies
-        run: poetry install
+        run: uv sync
 
       - name: Run pytest
-        run: poetry run pytest
+        run: uv run pytest
 
       - name: Run ruff
-        run: poetry run ruff check --output-format=github
+        run: uv run ruff check --output-format=github
         continue-on-error: true

pyproject.toml

@@ -1,9 +1,11 @@
-[tool.poetry]
+[project]
 name = "tstickers"
-version = "2024.1.3"
-license = "mit"
+version = "2025"
 description = "Download sticker packs from Telegram"
-authors = ["FredHappyface"]
+authors = [{ name = "FredHappyface" }]
+requires-python = ">=3.9"
+readme = "README.md"
+license = "mit"
 classifiers = [
 	"Development Status :: 5 - Production/Stable",
 	"Intended Audience :: Developers",
@@ -15,38 +17,34 @@ classifiers = [
 	"Topic :: Utilities",
 	"Topic :: Multimedia :: Graphics",
 ]
-homepage = "https://github.com/FHPythonUtils/TStickers"
-repository = "https://github.com/FHPythonUtils/TStickers"
-documentation = "https://github.com/FHPythonUtils/TStickers/blob/master/README.md"
-readme = "README.md"
-
-[tool.poetry.dependencies]
-python = ">=3.9,<4.0"
-requests = "<3,>=2.32.3"
-Pillow = "<11,>=10.4.0"
-emoji = "<3,>=2.12.1"
-requests-cache = "<2,>=1.2.1"
-rlottie-python = { version = "<2,>=1.3.6", optional = true }
-pyrlottie = "<2026,>=2024.0.1"
-loguru = "<2,>=0.7.2"
+dependencies = [
+	"emoji>=2.14.1",
+	"loguru>=0.7.3",
+	"pillow>=10.4.0",
+	"requests>=2.32.3",
+	"requests-cache>=1.2.1",
+	"rlottie-python>=1.3.6",
+]
 
-[tool.poetry.scripts]
-tstickers = "tstickers:cli"
+[project.optional-dependencies]
+pyrlottie = ["pyrlottie<2026,>=2024.0.1"]
 
-[tool.poetry.extras]
-rlottie-python = ["rlottie-python"]
-pyrlottie = ["pyrlottie"]
+[project.urls]
+Homepage = "https://github.com/FHPythonUtils/TStickers"
+Repository = "https://github.com/FHPythonUtils/TStickers"
+Documentation = "https://github.com/FHPythonUtils/TStickers/blob/master/README.md"
 
-[tool.poetry.group.dev.dependencies]
-pytest = "^8.1.1"
-handsdown = "^2.1.0"
-coverage = "^7.4.4"
-ruff = "^0.3.3"
-pyright = "^1.1.354"
+[project.scripts]
+tstickers = "tstickers:cli"
 
-[build-system]
-requires = ["poetry-core"]
-build-backend = "poetry.core.masonry.api"
+[dependency-groups]
+dev = [
+	"coverage>=7.6.12",
+	"handsdown>=2.1.0",
+	"pyright>=1.1.394",
+	"pytest>=8.3.4",
+	"ruff>=0.9.6",
+]
 
 [tool.ruff]
 line-length = 100
@@ -89,14 +87,18 @@ branch = true
 legacy_tox_ini = """
 [tox]
 env_list =
+	py313
+	py312
 	py311
 	py310
 	py39
-	py38
 
 [testenv]
 deps =
-	imgcompare
 	pytest
 commands = pytest tests
 """
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"

tests/test_main.py

@@ -10,7 +10,7 @@
 sys.path.insert(0, str(PROJECT_DIR))
 
 from tstickers.convert import Backend
-from tstickers.downloader import StickerDownloader
+from tstickers.manager import StickerManager
 
 token = ""
 for candidate in [PROJECT_DIR / "env.txt", PROJECT_DIR / "env"]:
@@ -24,36 +24,30 @@
 	raise RuntimeError(msg)
 
 
-downloader = StickerDownloader(token)
-downloader.cwd = Path(THISDIR) / "data"
+stickerManager = StickerManager(token)
+stickerManager.cwd = Path(THISDIR) / "data"
 
 packs = [{"pack": "DonutTheDog", "len": 31}]
 
 
 def test_getPack() -> None:
-	stickerPack = downloader.getPack(packs[0]["pack"])
+	stickerPack = stickerManager.getPack(packs[0]["pack"])
 	assert stickerPack is not None
 	assert len(stickerPack["files"]) == packs[0]["len"]
 
 
 def test_downloadPack() -> None:
-	stickerPack = downloader.getPack(packs[0]["pack"])
-	assert stickerPack is not None
-	downloader.downloadPack(stickerPack)
-	assert len(list(Path(f"{downloader.cwd}/donutthedog/tgs").iterdir())) == packs[0]["len"]
+	stickerManager.downloadPack(packs[0]["pack"])
+	assert len(list(Path(f"{stickerManager.cwd}/donutthedog/tgs").iterdir())) == packs[0]["len"]
 
 
 def test_convertPack() -> None:
-	stickerPack = downloader.getPack(packs[0]["pack"])
-	assert stickerPack is not None
-	downloader.downloadPack(stickerPack)
-	downloader.convertPack(packs[0]["pack"], scale=0.05, noCache=True, backend=Backend.PYRLOTTIE)
-	assert len(list(Path(f"{downloader.cwd}/donutthedog/webp").iterdir())) == packs[0]["len"]
+	stickerManager.downloadPack(packs[0]["pack"])
+	stickerManager.convertPack(packs[0]["pack"], scale=0.05, noCache=True, backend=Backend.RLOTTIE_PYTHON)
+	assert len(list(Path(f"{stickerManager.cwd}/donutthedog/webp").iterdir())) == packs[0]["len"]
 
 
 # def test_convertPack_slow() -> None:
-# 	stickerPack = downloader.getPack(packs[0]["pack"])
-# 	assert stickerPack is not None
-# 	downloader.downloadPack(stickerPack)
-# 	downloader.convertPack(packs[0]["pack"], scale=1, noCache=True, backend=Backend.PYRLOTTIE)
-# 	assert len(list(Path(f"{downloader.cwd}/donutthedog/webp").iterdir())) == packs[0]["len"]
+# 	stickerManager.downloadPack(packs[0]["pack"])
+# 	stickerManager.convertPack(packs[0]["pack"], scale=1, noCache=True, backend=Backend.PYRLOTTIE)
+# 	assert len(list(Path(f"{stickerManager.cwd}/donutthedog/webp").iterdir())) == packs[0]["len"]

tstickers/cli.py

@@ -12,12 +12,9 @@
 from loguru import logger
 
 from tstickers.convert import Backend
-from tstickers.downloader import StickerDownloader
+from tstickers.manager import StickerManager
 
 
-def is_library_installed(library_name: str) -> bool:
-	return importlib.util.find_spec(library_name) is not None
-
 
 def cli() -> None:  # pragma: no cover
 	"""Cli entry point."""
@@ -76,7 +73,7 @@ def cli() -> None:  # pragma: no cover
 	# Get the backend
 	backend = args.backend
 
-	if not is_library_installed(backend):
+	if importlib.util.find_spec(backend) is None:
 		logger.error(f'!! {backend} is not installed! Install with "pip install {backend}"')
 		sysexit(2)
 
@@ -97,14 +94,10 @@ def cli() -> None:  # pragma: no cover
 			packs.append(name)
 	packs = [name.split("/")[-1] for name in packs]
 
-	downloader = StickerDownloader(token)
+	downloader = StickerManager(token)
 	for pack in packs:
-		logger.info("=" * 60)
-		stickerPack = downloader.getPack(pack)
-		if stickerPack is None:
-			continue
 		logger.info("-" * 60)
-		_ = downloader.downloadPack(stickerPack)
+		_ = downloader.downloadPack(pack)
 		logger.info("-" * 60)
 
 		backend_map = {"rlottie-python": Backend.RLOTTIE_PYTHON, "pyrlottie": Backend.PYRLOTTIE}

tstickers/convert.py

@@ -35,23 +35,6 @@ def convertAnimatedFunc(_swd: Path, _threads: int, _frameSkip: int, _scale: floa
 	from tstickers.convert_pyrlottie import convertAnimated as convertPyRlottie
 
 
-def assure_dir_exists(*parts: Path | str) -> Path:
-	"""Make the directory if it does not exist.
-
-	Args:
-	----
-		parts (Path): path parts
-
-	Returns:
-	-------
-		Path: the full path
-
-	"""
-	full_path = Path(*parts)
-	full_path.mkdir(parents=True, exist_ok=True)
-	return full_path
-
-
 def convertWithPIL(inputFile: str) -> str:
 	"""Convert the webp file to png.
 
@@ -87,8 +70,10 @@ def convertStatic(swd: Path, threads: int = 4) -> int:
 	"""
 	converted = 0
 	start = time.time()
-	assure_dir_exists(swd, "png")
-	assure_dir_exists(swd, "gif")
+	(swd/ "png").mkdir(parents=True, exist_ok=True)
+	(swd/ "gif").mkdir(parents=True, exist_ok=True)
+
+
 	with ThreadPoolExecutor(max_workers=threads) as executor:
 		for _ in as_completed(
 			[
@@ -133,9 +118,10 @@ def convertAnimated(
 		msg = "You must specify a conversion backend"
 		raise RuntimeError(msg)
 	start = time.time()
-	assure_dir_exists(swd, "apng")
-	assure_dir_exists(swd, "gif")
-	assure_dir_exists(swd, "webp")
+
+	(swd/ "apng").mkdir(parents=True, exist_ok=True)
+	(swd/ "gif").mkdir(parents=True, exist_ok=True)
+	(swd/ "webp").mkdir(parents=True, exist_ok=True)
 
 	convertMap = {
 		Backend.UNDEFINED: convertAnimatedFunc,