From 048d008ca1cc78bd6df5deb87995658818d84d1a Mon Sep 17 00:00:00 2001 From: Benexl Date: Thu, 24 Jul 2025 18:21:49 +0300 Subject: [PATCH] refactore: rename api to media api --- fastanime/cli/commands/anilist/commands/auth.py | 2 +- fastanime/cli/commands/anilist/commands/search.py | 4 ++-- fastanime/cli/commands/anilist/commands/stats.py | 2 +- fastanime/cli/commands/anilist/helpers.py | 8 ++++---- fastanime/cli/interactive/menus/auth.py | 2 +- fastanime/cli/interactive/menus/main.py | 4 ++-- fastanime/cli/interactive/menus/media_actions.py | 4 ++-- fastanime/cli/interactive/menus/results.py | 4 ++-- fastanime/cli/interactive/menus/user_media_list.py | 4 ++-- fastanime/cli/interactive/session.py | 4 ++-- fastanime/cli/interactive/state.py | 4 ++-- fastanime/cli/services/auth/model.py | 2 +- fastanime/cli/services/auth/service.py | 2 +- .../api/__init__.py => cli/services/downloads/manager.py} | 0 fastanime/cli/services/downloads/service.py | 2 +- fastanime/cli/services/registry/filters.py | 4 ++-- fastanime/cli/services/registry/models.py | 2 +- fastanime/cli/services/registry/service.py | 4 ++-- fastanime/cli/services/watch_history/service.py | 6 +++--- fastanime/cli/utils/formatters.py | 2 +- fastanime/cli/utils/previews.py | 2 +- fastanime/core/config/model.py | 2 +- fastanime/libs/{api/jikan => media_api}/__init__.py | 0 fastanime/libs/{api => media_api}/anilist/__init__.py | 0 fastanime/libs/{api => media_api}/anilist/api.py | 0 fastanime/libs/{api => media_api}/anilist/gql.py | 0 fastanime/libs/{api => media_api}/anilist/mapper.py | 0 fastanime/libs/{api => media_api}/anilist/types.py | 0 fastanime/libs/{api => media_api}/base.py | 0 fastanime/libs/{api => media_api}/factory.py | 0 fastanime/libs/media_api/jikan/__init__.py | 0 fastanime/libs/{api => media_api}/jikan/api.py | 0 fastanime/libs/{api => media_api}/jikan/mapper.py | 0 fastanime/libs/{api => media_api}/params.py | 0 fastanime/libs/{api => media_api}/types.py | 0 35 files changed, 35 insertions(+), 35 deletions(-) rename fastanime/{libs/api/__init__.py => cli/services/downloads/manager.py} (100%) rename fastanime/libs/{api/jikan => media_api}/__init__.py (100%) rename fastanime/libs/{api => media_api}/anilist/__init__.py (100%) rename fastanime/libs/{api => media_api}/anilist/api.py (100%) rename fastanime/libs/{api => media_api}/anilist/gql.py (100%) rename fastanime/libs/{api => media_api}/anilist/mapper.py (100%) rename fastanime/libs/{api => media_api}/anilist/types.py (100%) rename fastanime/libs/{api => media_api}/base.py (100%) rename fastanime/libs/{api => media_api}/factory.py (100%) create mode 100644 fastanime/libs/media_api/jikan/__init__.py rename fastanime/libs/{api => media_api}/jikan/api.py (100%) rename fastanime/libs/{api => media_api}/jikan/mapper.py (100%) rename fastanime/libs/{api => media_api}/params.py (100%) rename fastanime/libs/{api => media_api}/types.py (100%) diff --git a/fastanime/cli/commands/anilist/commands/auth.py b/fastanime/cli/commands/anilist/commands/auth.py index 940eaf1..a16f8d3 100644 --- a/fastanime/cli/commands/anilist/commands/auth.py +++ b/fastanime/cli/commands/anilist/commands/auth.py @@ -10,7 +10,7 @@ from .....core.config.model import AppConfig def auth(config: AppConfig, status: bool, logout: bool): """Handles user authentication and credential management.""" from .....core.constants import ANILIST_AUTH - from .....libs.api.factory import create_api_client + from .....libs.media_api.factory import create_api_client from .....libs.selectors.selector import create_selector from ....services.auth import AuthService from ....services.feedback import FeedbackService diff --git a/fastanime/cli/commands/anilist/commands/search.py b/fastanime/cli/commands/anilist/commands/search.py index de7d1d3..706feab 100644 --- a/fastanime/cli/commands/anilist/commands/search.py +++ b/fastanime/cli/commands/anilist/commands/search.py @@ -100,8 +100,8 @@ def search( from fastanime.cli.utils.feedback import create_feedback_manager from fastanime.core.exceptions import FastAnimeError - from fastanime.libs.api.factory import create_api_client - from fastanime.libs.api.params import MediaSearchParams + from fastanime.libs.media_api.factory import create_api_client + from fastanime.libs.media_api.params import MediaSearchParams feedback = create_feedback_manager(config.general.icons) diff --git a/fastanime/cli/commands/anilist/commands/stats.py b/fastanime/cli/commands/anilist/commands/stats.py index 29d1d30..585893b 100644 --- a/fastanime/cli/commands/anilist/commands/stats.py +++ b/fastanime/cli/commands/anilist/commands/stats.py @@ -18,7 +18,7 @@ def stats(config: "AppConfig"): from fastanime.cli.utils.feedback import create_feedback_manager from fastanime.core.exceptions import FastAnimeError - from fastanime.libs.api.factory import create_api_client + from fastanime.libs.media_api.factory import create_api_client feedback = create_feedback_manager(config.general.icons) console = Console() diff --git a/fastanime/cli/commands/anilist/helpers.py b/fastanime/cli/commands/anilist/helpers.py index 5246c7c..f416f0e 100644 --- a/fastanime/cli/commands/anilist/helpers.py +++ b/fastanime/cli/commands/anilist/helpers.py @@ -10,7 +10,7 @@ from rich.progress import Progress if TYPE_CHECKING: from fastanime.core.config import AppConfig - from fastanime.libs.api.base import BaseApiClient + from fastanime.libs.media_api.base import BaseApiClient def get_authenticated_api_client(config: "AppConfig") -> "BaseApiClient": @@ -27,7 +27,7 @@ def get_authenticated_api_client(config: "AppConfig") -> "BaseApiClient": click.Abort: If user is not authenticated """ from fastanime.cli.utils.feedback import create_feedback_manager - from fastanime.libs.api.factory import create_api_client + from fastanime.libs.media_api.factory import create_api_client feedback = create_feedback_manager(config.general.icons) api_client = create_api_client(config.general.media_api, config) @@ -66,7 +66,7 @@ def handle_media_search_command( """ from fastanime.cli.utils.feedback import create_feedback_manager from fastanime.core.exceptions import FastAnimeError - from fastanime.libs.api.factory import create_api_client + from fastanime.libs.media_api.factory import create_api_client feedback = create_feedback_manager(config.general.icons) @@ -118,7 +118,7 @@ def handle_user_list_command( """ from fastanime.cli.utils.feedback import create_feedback_manager from fastanime.core.exceptions import FastAnimeError - from fastanime.libs.api.params import UserMediaListSearchParams + from fastanime.libs.media_api.params import UserMediaListSearchParams feedback = create_feedback_manager(config.general.icons) diff --git a/fastanime/cli/interactive/menus/auth.py b/fastanime/cli/interactive/menus/auth.py index 0a45f47..62033a0 100644 --- a/fastanime/cli/interactive/menus/auth.py +++ b/fastanime/cli/interactive/menus/auth.py @@ -10,7 +10,7 @@ from rich.console import Console from rich.panel import Panel from rich.table import Table -from ....libs.api.types import UserProfile +from ....libs.media_api.types import UserProfile from ...auth.manager import AuthManager from ...utils.feedback import create_feedback_manager, execute_with_feedback from ..session import Context, session diff --git a/fastanime/cli/interactive/menus/main.py b/fastanime/cli/interactive/menus/main.py index b6cface..8d0988e 100644 --- a/fastanime/cli/interactive/menus/main.py +++ b/fastanime/cli/interactive/menus/main.py @@ -2,8 +2,8 @@ import logging import random from typing import Callable, Dict -from ....libs.api.params import MediaSearchParams, UserMediaListSearchParams -from ....libs.api.types import ( +from ....libs.media_api.params import MediaSearchParams, UserMediaListSearchParams +from ....libs.media_api.types import ( MediaSort, MediaStatus, UserMediaListStatus, diff --git a/fastanime/cli/interactive/menus/media_actions.py b/fastanime/cli/interactive/menus/media_actions.py index 44a556f..49c6160 100644 --- a/fastanime/cli/interactive/menus/media_actions.py +++ b/fastanime/cli/interactive/menus/media_actions.py @@ -2,8 +2,8 @@ from typing import Callable, Dict from rich.console import Console -from ....libs.api.params import UpdateUserMediaListEntryParams -from ....libs.api.types import UserMediaListStatus +from ....libs.media_api.params import UpdateUserMediaListEntryParams +from ....libs.media_api.types import UserMediaListStatus from ....libs.players.params import PlayerParams from ..session import Context, session from ..state import InternalDirective, MenuName, State diff --git a/fastanime/cli/interactive/menus/results.py b/fastanime/cli/interactive/menus/results.py index 435d35b..b92b94b 100644 --- a/fastanime/cli/interactive/menus/results.py +++ b/fastanime/cli/interactive/menus/results.py @@ -1,8 +1,8 @@ from dataclasses import asdict from typing import Callable, Dict, Union -from ....libs.api.params import MediaSearchParams, UserMediaListSearchParams -from ....libs.api.types import MediaItem, MediaStatus, UserMediaListStatus +from ....libs.media_api.params import MediaSearchParams, UserMediaListSearchParams +from ....libs.media_api.types import MediaItem, MediaStatus, UserMediaListStatus from ..session import Context, session from ..state import InternalDirective, MediaApiState, MenuName, State diff --git a/fastanime/cli/interactive/menus/user_media_list.py b/fastanime/cli/interactive/menus/user_media_list.py index 10bcdf8..7bdaa43 100644 --- a/fastanime/cli/interactive/menus/user_media_list.py +++ b/fastanime/cli/interactive/menus/user_media_list.py @@ -15,8 +15,8 @@ from rich.console import Console from rich.panel import Panel from rich.table import Table -from ....libs.api.params import UpdateUserMediaListEntryParams, UserListParams -from ....libs.api.types import MediaItem, MediaSearchResult, UserListItem +from ....libs.media_api.params import UpdateUserMediaListEntryParams, UserListParams +from ....libs.media_api.types import MediaItem, MediaSearchResult, UserListItem from ...utils.feedback import create_feedback_manager, execute_with_feedback from ..session import Context, session from ..state import ControlFlow, MediaApiState, State diff --git a/fastanime/cli/interactive/session.py b/fastanime/cli/interactive/session.py index de93ec4..21c815e 100644 --- a/fastanime/cli/interactive/session.py +++ b/fastanime/cli/interactive/session.py @@ -8,7 +8,7 @@ import click from ...core.config import AppConfig from ...core.constants import APP_DIR, USER_CONFIG_PATH -from ...libs.api.base import BaseApiClient +from ...libs.media_api.base import BaseApiClient from ...libs.players.base import BasePlayer from ...libs.providers.anime.base import BaseAnimeProvider from ...libs.selectors.base import BaseSelector @@ -61,7 +61,7 @@ class Session: def _load_context(self, config: AppConfig): """Initializes all shared services based on the provided configuration.""" - from ...libs.api.factory import create_api_client + from ...libs.media_api.factory import create_api_client from ...libs.players import create_player from ...libs.providers.anime.provider import create_provider from ...libs.selectors import create_selector diff --git a/fastanime/cli/interactive/state.py b/fastanime/cli/interactive/state.py index 1dc2ed1..c750401 100644 --- a/fastanime/cli/interactive/state.py +++ b/fastanime/cli/interactive/state.py @@ -3,8 +3,8 @@ from typing import Dict, Optional, Union from pydantic import BaseModel, ConfigDict, Field -from ...libs.api.params import MediaSearchParams, UserMediaListSearchParams -from ...libs.api.types import MediaItem, PageInfo +from ...libs.media_api.params import MediaSearchParams, UserMediaListSearchParams +from ...libs.media_api.types import MediaItem, PageInfo from ...libs.providers.anime.types import Anime, SearchResults, Server diff --git a/fastanime/cli/services/auth/model.py b/fastanime/cli/services/auth/model.py index 1d5c34d..46d4921 100644 --- a/fastanime/cli/services/auth/model.py +++ b/fastanime/cli/services/auth/model.py @@ -2,7 +2,7 @@ from typing import Dict from pydantic import BaseModel, Field -from ....libs.api.types import UserProfile +from ....libs.media_api.types import UserProfile AUTH_VERSION = "1.0" diff --git a/fastanime/cli/services/auth/service.py b/fastanime/cli/services/auth/service.py index c1b67f8..67b9fb4 100644 --- a/fastanime/cli/services/auth/service.py +++ b/fastanime/cli/services/auth/service.py @@ -4,7 +4,7 @@ from typing import Optional from ....core.constants import APP_DATA_DIR from ....core.utils.file import AtomicWriter, FileLock -from ....libs.api.types import UserProfile +from ....libs.media_api.types import UserProfile from .model import AuthModel, AuthProfile logger = logging.getLogger(__name__) diff --git a/fastanime/libs/api/__init__.py b/fastanime/cli/services/downloads/manager.py similarity index 100% rename from fastanime/libs/api/__init__.py rename to fastanime/cli/services/downloads/manager.py diff --git a/fastanime/cli/services/downloads/service.py b/fastanime/cli/services/downloads/service.py index 7a77ecd..583e98a 100644 --- a/fastanime/cli/services/downloads/service.py +++ b/fastanime/cli/services/downloads/service.py @@ -18,7 +18,7 @@ from typing import Dict, List, Optional from ....core.config.model import DownloadsConfig from ....core.constants import APP_CACHE_DIR, APP_DATA_DIR from ....core.downloader import create_downloader -from ....libs.api.types import MediaItem +from ....libs.media_api.types import MediaItem from .models import ( DownloadIndex, DownloadQueue, diff --git a/fastanime/cli/services/registry/filters.py b/fastanime/cli/services/registry/filters.py index 035e1f1..1a3465f 100644 --- a/fastanime/cli/services/registry/filters.py +++ b/fastanime/cli/services/registry/filters.py @@ -1,7 +1,7 @@ from typing import List -from ....libs.api.params import MediaSearchParams -from ....libs.api.types import MediaItem +from ....libs.media_api.params import MediaSearchParams +from ....libs.media_api.types import MediaItem class MediaFilter: diff --git a/fastanime/cli/services/registry/models.py b/fastanime/cli/services/registry/models.py index df04fb1..62d94cf 100644 --- a/fastanime/cli/services/registry/models.py +++ b/fastanime/cli/services/registry/models.py @@ -6,7 +6,7 @@ from typing import Dict, Literal, Optional from pydantic import BaseModel, Field, computed_field -from ....libs.api.types import MediaItem, UserMediaListStatus +from ....libs.media_api.types import MediaItem, UserMediaListStatus from ...utils import converters logger = logging.getLogger(__name__) diff --git a/fastanime/cli/services/registry/service.py b/fastanime/cli/services/registry/service.py index 41d3e4e..20f369d 100644 --- a/fastanime/cli/services/registry/service.py +++ b/fastanime/cli/services/registry/service.py @@ -7,8 +7,8 @@ from typing import Dict, Generator, List, Optional from ....core.config.model import MediaRegistryConfig from ....core.exceptions import FastAnimeError from ....core.utils.file import AtomicWriter, FileLock, check_file_modified -from ....libs.api.params import MediaSearchParams -from ....libs.api.types import ( +from ....libs.media_api.params import MediaSearchParams +from ....libs.media_api.types import ( MediaItem, MediaSearchResult, PageInfo, diff --git a/fastanime/cli/services/watch_history/service.py b/fastanime/cli/services/watch_history/service.py index 923c71b..4661b62 100644 --- a/fastanime/cli/services/watch_history/service.py +++ b/fastanime/cli/services/watch_history/service.py @@ -2,9 +2,9 @@ import logging from typing import Optional from ....core.config.model import AppConfig -from ....libs.api.base import BaseApiClient -from ....libs.api.params import UpdateUserMediaListEntryParams -from ....libs.api.types import MediaItem, UserMediaListStatus +from ....libs.media_api.base import BaseApiClient +from ....libs.media_api.params import UpdateUserMediaListEntryParams +from ....libs.media_api.types import MediaItem, UserMediaListStatus from ....libs.players.types import PlayerResult from ..registry import MediaRegistryService diff --git a/fastanime/cli/utils/formatters.py b/fastanime/cli/utils/formatters.py index ce7f4ed..b93a9d2 100644 --- a/fastanime/cli/utils/formatters.py +++ b/fastanime/cli/utils/formatters.py @@ -2,7 +2,7 @@ import re from datetime import datetime from typing import List, Optional -from ...libs.api.types import AiringSchedule +from ...libs.media_api.types import AiringSchedule COMMA_REGEX = re.compile(r"([0-9]{3})(?=\d)") diff --git a/fastanime/cli/utils/previews.py b/fastanime/cli/utils/previews.py index 72cb033..89531c6 100644 --- a/fastanime/cli/utils/previews.py +++ b/fastanime/cli/utils/previews.py @@ -12,7 +12,7 @@ import httpx from ...core.config import AppConfig from ...core.constants import APP_CACHE_DIR, PLATFORM, SCRIPTS_DIR from ...core.utils.file import AtomicWriter -from ...libs.api.types import MediaItem +from ...libs.media_api.types import MediaItem from . import ansi, formatters logger = logging.getLogger(__name__) diff --git a/fastanime/core/config/model.py b/fastanime/core/config/model.py index 6f50040..9dc3899 100644 --- a/fastanime/core/config/model.py +++ b/fastanime/core/config/model.py @@ -4,7 +4,7 @@ from typing import Literal from pydantic import BaseModel, Field, PrivateAttr, computed_field -from ...libs.api.types import MediaSort, UserMediaListSort +from ...libs.media_api.types import MediaSort, UserMediaListSort from ...libs.providers.anime.types import ProviderName, ProviderServer from ..constants import APP_ASCII_ART from . import defaults diff --git a/fastanime/libs/api/jikan/__init__.py b/fastanime/libs/media_api/__init__.py similarity index 100% rename from fastanime/libs/api/jikan/__init__.py rename to fastanime/libs/media_api/__init__.py diff --git a/fastanime/libs/api/anilist/__init__.py b/fastanime/libs/media_api/anilist/__init__.py similarity index 100% rename from fastanime/libs/api/anilist/__init__.py rename to fastanime/libs/media_api/anilist/__init__.py diff --git a/fastanime/libs/api/anilist/api.py b/fastanime/libs/media_api/anilist/api.py similarity index 100% rename from fastanime/libs/api/anilist/api.py rename to fastanime/libs/media_api/anilist/api.py diff --git a/fastanime/libs/api/anilist/gql.py b/fastanime/libs/media_api/anilist/gql.py similarity index 100% rename from fastanime/libs/api/anilist/gql.py rename to fastanime/libs/media_api/anilist/gql.py diff --git a/fastanime/libs/api/anilist/mapper.py b/fastanime/libs/media_api/anilist/mapper.py similarity index 100% rename from fastanime/libs/api/anilist/mapper.py rename to fastanime/libs/media_api/anilist/mapper.py diff --git a/fastanime/libs/api/anilist/types.py b/fastanime/libs/media_api/anilist/types.py similarity index 100% rename from fastanime/libs/api/anilist/types.py rename to fastanime/libs/media_api/anilist/types.py diff --git a/fastanime/libs/api/base.py b/fastanime/libs/media_api/base.py similarity index 100% rename from fastanime/libs/api/base.py rename to fastanime/libs/media_api/base.py diff --git a/fastanime/libs/api/factory.py b/fastanime/libs/media_api/factory.py similarity index 100% rename from fastanime/libs/api/factory.py rename to fastanime/libs/media_api/factory.py diff --git a/fastanime/libs/media_api/jikan/__init__.py b/fastanime/libs/media_api/jikan/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/fastanime/libs/api/jikan/api.py b/fastanime/libs/media_api/jikan/api.py similarity index 100% rename from fastanime/libs/api/jikan/api.py rename to fastanime/libs/media_api/jikan/api.py diff --git a/fastanime/libs/api/jikan/mapper.py b/fastanime/libs/media_api/jikan/mapper.py similarity index 100% rename from fastanime/libs/api/jikan/mapper.py rename to fastanime/libs/media_api/jikan/mapper.py diff --git a/fastanime/libs/api/params.py b/fastanime/libs/media_api/params.py similarity index 100% rename from fastanime/libs/api/params.py rename to fastanime/libs/media_api/params.py diff --git a/fastanime/libs/api/types.py b/fastanime/libs/media_api/types.py similarity index 100% rename from fastanime/libs/api/types.py rename to fastanime/libs/media_api/types.py