From 69b7f5c60cb5ffdda9d26f1ea8a54d22041d95f1 Mon Sep 17 00:00:00 2001 From: Uyanide Date: Mon, 6 Apr 2026 09:15:07 +0200 Subject: [PATCH] chore: switch to src layout --- main.py | 4 ---- pyproject.toml | 2 +- {lrx_cli => src/lrx_cli}/__init__.py | 0 {lrx_cli => src/lrx_cli}/__main__.py | 0 {lrx_cli => src/lrx_cli}/authenticators/__init__.py | 0 {lrx_cli => src/lrx_cli}/authenticators/base.py | 0 {lrx_cli => src/lrx_cli}/authenticators/dummy.py | 0 {lrx_cli => src/lrx_cli}/authenticators/musixmatch.py | 0 {lrx_cli => src/lrx_cli}/authenticators/qqmusic.py | 0 {lrx_cli => src/lrx_cli}/authenticators/spotify.py | 0 {lrx_cli => src/lrx_cli}/cache.py | 0 {lrx_cli => src/lrx_cli}/cli.py | 0 {lrx_cli => src/lrx_cli}/config.py | 0 {lrx_cli => src/lrx_cli}/core.py | 1 + {lrx_cli => src/lrx_cli}/enrichers/__init__.py | 0 {lrx_cli => src/lrx_cli}/enrichers/audio_tag.py | 0 {lrx_cli => src/lrx_cli}/enrichers/base.py | 0 {lrx_cli => src/lrx_cli}/enrichers/file_name.py | 0 {lrx_cli => src/lrx_cli}/enrichers/musixmatch.py | 0 {lrx_cli => src/lrx_cli}/fetchers/__init__.py | 0 {lrx_cli => src/lrx_cli}/fetchers/base.py | 0 {lrx_cli => src/lrx_cli}/fetchers/cache_search.py | 0 {lrx_cli => src/lrx_cli}/fetchers/local.py | 0 {lrx_cli => src/lrx_cli}/fetchers/lrclib.py | 0 {lrx_cli => src/lrx_cli}/fetchers/lrclib_search.py | 0 {lrx_cli => src/lrx_cli}/fetchers/musixmatch.py | 0 {lrx_cli => src/lrx_cli}/fetchers/netease.py | 0 {lrx_cli => src/lrx_cli}/fetchers/qqmusic.py | 0 {lrx_cli => src/lrx_cli}/fetchers/selection.py | 0 {lrx_cli => src/lrx_cli}/fetchers/spotify.py | 0 {lrx_cli => src/lrx_cli}/lrc.py | 0 {lrx_cli => src/lrx_cli}/models.py | 2 +- {lrx_cli => src/lrx_cli}/mpris.py | 0 {lrx_cli => src/lrx_cli}/normalize.py | 0 uv.lock | 2 +- 35 files changed, 4 insertions(+), 7 deletions(-) delete mode 100644 main.py rename {lrx_cli => src/lrx_cli}/__init__.py (100%) rename {lrx_cli => src/lrx_cli}/__main__.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/__init__.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/base.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/dummy.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/musixmatch.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/qqmusic.py (100%) rename {lrx_cli => src/lrx_cli}/authenticators/spotify.py (100%) rename {lrx_cli => src/lrx_cli}/cache.py (100%) rename {lrx_cli => src/lrx_cli}/cli.py (100%) rename {lrx_cli => src/lrx_cli}/config.py (100%) rename {lrx_cli => src/lrx_cli}/core.py (99%) rename {lrx_cli => src/lrx_cli}/enrichers/__init__.py (100%) rename {lrx_cli => src/lrx_cli}/enrichers/audio_tag.py (100%) rename {lrx_cli => src/lrx_cli}/enrichers/base.py (100%) rename {lrx_cli => src/lrx_cli}/enrichers/file_name.py (100%) rename {lrx_cli => src/lrx_cli}/enrichers/musixmatch.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/__init__.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/base.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/cache_search.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/local.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/lrclib.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/lrclib_search.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/musixmatch.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/netease.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/qqmusic.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/selection.py (100%) rename {lrx_cli => src/lrx_cli}/fetchers/spotify.py (100%) rename {lrx_cli => src/lrx_cli}/lrc.py (100%) rename {lrx_cli => src/lrx_cli}/models.py (98%) rename {lrx_cli => src/lrx_cli}/mpris.py (100%) rename {lrx_cli => src/lrx_cli}/normalize.py (100%) diff --git a/main.py b/main.py deleted file mode 100644 index 7f34de1..0000000 --- a/main.py +++ /dev/null @@ -1,4 +0,0 @@ -from lrx_cli.cli import run - -if __name__ == "__main__": - run() diff --git a/pyproject.toml b/pyproject.toml index c33a2b6..cf6a567 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "hatchling.build" [project] name = "lrx-cli" -version = "0.5.5" +version = "0.5.6" description = "Fetch line-synced lyrics for your music player." readme = "README.md" requires-python = ">=3.13" diff --git a/lrx_cli/__init__.py b/src/lrx_cli/__init__.py similarity index 100% rename from lrx_cli/__init__.py rename to src/lrx_cli/__init__.py diff --git a/lrx_cli/__main__.py b/src/lrx_cli/__main__.py similarity index 100% rename from lrx_cli/__main__.py rename to src/lrx_cli/__main__.py diff --git a/lrx_cli/authenticators/__init__.py b/src/lrx_cli/authenticators/__init__.py similarity index 100% rename from lrx_cli/authenticators/__init__.py rename to src/lrx_cli/authenticators/__init__.py diff --git a/lrx_cli/authenticators/base.py b/src/lrx_cli/authenticators/base.py similarity index 100% rename from lrx_cli/authenticators/base.py rename to src/lrx_cli/authenticators/base.py diff --git a/lrx_cli/authenticators/dummy.py b/src/lrx_cli/authenticators/dummy.py similarity index 100% rename from lrx_cli/authenticators/dummy.py rename to src/lrx_cli/authenticators/dummy.py diff --git a/lrx_cli/authenticators/musixmatch.py b/src/lrx_cli/authenticators/musixmatch.py similarity index 100% rename from lrx_cli/authenticators/musixmatch.py rename to src/lrx_cli/authenticators/musixmatch.py diff --git a/lrx_cli/authenticators/qqmusic.py b/src/lrx_cli/authenticators/qqmusic.py similarity index 100% rename from lrx_cli/authenticators/qqmusic.py rename to src/lrx_cli/authenticators/qqmusic.py diff --git a/lrx_cli/authenticators/spotify.py b/src/lrx_cli/authenticators/spotify.py similarity index 100% rename from lrx_cli/authenticators/spotify.py rename to src/lrx_cli/authenticators/spotify.py diff --git a/lrx_cli/cache.py b/src/lrx_cli/cache.py similarity index 100% rename from lrx_cli/cache.py rename to src/lrx_cli/cache.py diff --git a/lrx_cli/cli.py b/src/lrx_cli/cli.py similarity index 100% rename from lrx_cli/cli.py rename to src/lrx_cli/cli.py diff --git a/lrx_cli/config.py b/src/lrx_cli/config.py similarity index 100% rename from lrx_cli/config.py rename to src/lrx_cli/config.py diff --git a/lrx_cli/core.py b/src/lrx_cli/core.py similarity index 99% rename from lrx_cli/core.py rename to src/lrx_cli/core.py index fcc5172..75c8d4d 100644 --- a/lrx_cli/core.py +++ b/src/lrx_cli/core.py @@ -2,6 +2,7 @@ Author: Uyanide pywang0608@foxmail.com Date: 2026-03-25 11:09:53 Description: Core orchestrator — coordinates fetchers with cache-aware fallback. + Also handles enrichers & authenticators & … """ import asyncio diff --git a/lrx_cli/enrichers/__init__.py b/src/lrx_cli/enrichers/__init__.py similarity index 100% rename from lrx_cli/enrichers/__init__.py rename to src/lrx_cli/enrichers/__init__.py diff --git a/lrx_cli/enrichers/audio_tag.py b/src/lrx_cli/enrichers/audio_tag.py similarity index 100% rename from lrx_cli/enrichers/audio_tag.py rename to src/lrx_cli/enrichers/audio_tag.py diff --git a/lrx_cli/enrichers/base.py b/src/lrx_cli/enrichers/base.py similarity index 100% rename from lrx_cli/enrichers/base.py rename to src/lrx_cli/enrichers/base.py diff --git a/lrx_cli/enrichers/file_name.py b/src/lrx_cli/enrichers/file_name.py similarity index 100% rename from lrx_cli/enrichers/file_name.py rename to src/lrx_cli/enrichers/file_name.py diff --git a/lrx_cli/enrichers/musixmatch.py b/src/lrx_cli/enrichers/musixmatch.py similarity index 100% rename from lrx_cli/enrichers/musixmatch.py rename to src/lrx_cli/enrichers/musixmatch.py diff --git a/lrx_cli/fetchers/__init__.py b/src/lrx_cli/fetchers/__init__.py similarity index 100% rename from lrx_cli/fetchers/__init__.py rename to src/lrx_cli/fetchers/__init__.py diff --git a/lrx_cli/fetchers/base.py b/src/lrx_cli/fetchers/base.py similarity index 100% rename from lrx_cli/fetchers/base.py rename to src/lrx_cli/fetchers/base.py diff --git a/lrx_cli/fetchers/cache_search.py b/src/lrx_cli/fetchers/cache_search.py similarity index 100% rename from lrx_cli/fetchers/cache_search.py rename to src/lrx_cli/fetchers/cache_search.py diff --git a/lrx_cli/fetchers/local.py b/src/lrx_cli/fetchers/local.py similarity index 100% rename from lrx_cli/fetchers/local.py rename to src/lrx_cli/fetchers/local.py diff --git a/lrx_cli/fetchers/lrclib.py b/src/lrx_cli/fetchers/lrclib.py similarity index 100% rename from lrx_cli/fetchers/lrclib.py rename to src/lrx_cli/fetchers/lrclib.py diff --git a/lrx_cli/fetchers/lrclib_search.py b/src/lrx_cli/fetchers/lrclib_search.py similarity index 100% rename from lrx_cli/fetchers/lrclib_search.py rename to src/lrx_cli/fetchers/lrclib_search.py diff --git a/lrx_cli/fetchers/musixmatch.py b/src/lrx_cli/fetchers/musixmatch.py similarity index 100% rename from lrx_cli/fetchers/musixmatch.py rename to src/lrx_cli/fetchers/musixmatch.py diff --git a/lrx_cli/fetchers/netease.py b/src/lrx_cli/fetchers/netease.py similarity index 100% rename from lrx_cli/fetchers/netease.py rename to src/lrx_cli/fetchers/netease.py diff --git a/lrx_cli/fetchers/qqmusic.py b/src/lrx_cli/fetchers/qqmusic.py similarity index 100% rename from lrx_cli/fetchers/qqmusic.py rename to src/lrx_cli/fetchers/qqmusic.py diff --git a/lrx_cli/fetchers/selection.py b/src/lrx_cli/fetchers/selection.py similarity index 100% rename from lrx_cli/fetchers/selection.py rename to src/lrx_cli/fetchers/selection.py diff --git a/lrx_cli/fetchers/spotify.py b/src/lrx_cli/fetchers/spotify.py similarity index 100% rename from lrx_cli/fetchers/spotify.py rename to src/lrx_cli/fetchers/spotify.py diff --git a/lrx_cli/lrc.py b/src/lrx_cli/lrc.py similarity index 100% rename from lrx_cli/lrc.py rename to src/lrx_cli/lrc.py diff --git a/lrx_cli/models.py b/src/lrx_cli/models.py similarity index 98% rename from lrx_cli/models.py rename to src/lrx_cli/models.py index c91d75f..196fd91 100644 --- a/lrx_cli/models.py +++ b/src/lrx_cli/models.py @@ -10,7 +10,7 @@ from enum import Enum from typing import Optional, TYPE_CHECKING from dataclasses import dataclass -from lrx_cli.config import SCORE_W_SYNCED +from .config import SCORE_W_SYNCED if TYPE_CHECKING: from .lrc import LRCData diff --git a/lrx_cli/mpris.py b/src/lrx_cli/mpris.py similarity index 100% rename from lrx_cli/mpris.py rename to src/lrx_cli/mpris.py diff --git a/lrx_cli/normalize.py b/src/lrx_cli/normalize.py similarity index 100% rename from lrx_cli/normalize.py rename to src/lrx_cli/normalize.py diff --git a/uv.lock b/uv.lock index a13600b..384a4a2 100644 --- a/uv.lock +++ b/uv.lock @@ -153,7 +153,7 @@ wheels = [ [[package]] name = "lrx-cli" -version = "0.5.5" +version = "0.5.6" source = { editable = "." } dependencies = [ { name = "cyclopts" },