anime-sama-api 0.2.2.post1__tar.gz → 0.2.2.post3__tar.gz

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/PKG-INFO

@@ -1,7 +1,7 @@
 Metadata-Version: 2.4
 Name: anime-sama_api
-Version: 0.2.2.post1
-Summary: Api for anime-sama.eu
+Version: 0.2.2.post3
+Summary: Api for anime-sama
 Project-URL: Repository, https://github.com/Sky-NiniKo/anime-sama_api/
 Author-email: NiniKo <pcninik@gmail.com>
 License-Expression: GPL-3.0-or-later
@@ -21,6 +21,7 @@ Classifier: Topic :: System :: Archiving
 Requires-Python: >=3.10
 Requires-Dist: httpx>=0.28.1
 Provides-Extra: cli
+Requires-Dist: platformdirs>=4.5.1; extra == 'cli'
 Requires-Dist: rich>=14.2.0; extra == 'cli'
 Requires-Dist: tomli>=2.2.1; (python_full_version < '3.11') and extra == 'cli'
 Requires-Dist: yt-dlp>=2025.8.22; extra == 'cli'
@@ -29,7 +30,7 @@ Description-Content-Type: text/markdown
 This project is archive. I do not have the time to work on it anymore. I may make some small fixes if a breaking issue arises. 
 
 # Anime-Sama API
-An API for anime-sama.eu, also provides a CLI to download videos.
+An API for anime-sama, also provides a CLI to download videos.
 
 I have implemented all the features I care about. This project is now in maintenance mode.
 
@@ -47,7 +48,10 @@ anime-sama
 ```
 
 ## Configuration
-You can customize the config at `~/.config/anime-sama_cli/config.toml` for macOS/Linux and at `%USER%/AppData/Local/anime-sama_cli/config.toml` for Windows.
+You can customize the config at :
+- Linux: `~/.config/anime-sama_cli/config.toml`
+- Windows: `%USER%/AppData/Local/anime-sama_cli/config.toml`
+- macOS: `~/Library/Application Support/anime-sama_api/config.toml`
 
 # For developers
 ## Requirements

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/README.md

@@ -1,7 +1,7 @@
 This project is archive. I do not have the time to work on it anymore. I may make some small fixes if a breaking issue arises. 
 
 # Anime-Sama API
-An API for anime-sama.eu, also provides a CLI to download videos.
+An API for anime-sama, also provides a CLI to download videos.
 
 I have implemented all the features I care about. This project is now in maintenance mode.
 
@@ -19,7 +19,10 @@ anime-sama
 ```
 
 ## Configuration
-You can customize the config at `~/.config/anime-sama_cli/config.toml` for macOS/Linux and at `%USER%/AppData/Local/anime-sama_cli/config.toml` for Windows.
+You can customize the config at :
+- Linux: `~/.config/anime-sama_cli/config.toml`
+- Windows: `%USER%/AppData/Local/anime-sama_cli/config.toml`
+- macOS: `~/Library/Application Support/anime-sama_api/config.toml`
 
 # For developers
 ## Requirements

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/TODO.md

@@ -1,19 +1,19 @@
-- [X] Search
-- [X] Download
-- [X] Play
-- [X] Name Episode
-- [X] All language
-- [X] Order Episode
-- [X] Separate backend
-- [X] Fallback on other players
-- [X] Retry players
-- [X] Config
+- [x] Search
+- [x] Download
+- [x] Play
+- [x] Name Episode
+- [x] All language
+- [x] Order Episode
+- [x] Separate backend
+- [x] Fallback on other players
+- [x] Retry players
+- [x] Config
 - [ ] Tests (ie: search that doesn't exist)
-- [X] Make a package
+- [x] Make a package
 - [ ] Implement all NotImplemented
-- [ ] Auto detect download folder and config folder, see https://stackoverflow.com/questions/35851281/python-finding-the-users-downloads-folder and appdirs (pypi)
+- [x] Auto detect download folder and config folder, see https://stackoverflow.com/questions/35851281/python-finding-the-users-downloads-folder and appdirs (pypi)
 - [ ] Add new {} for episode_path
-- [ ] Select a range of seasons to download
+- [x] Select a range of seasons to download
 - [ ] Take args in cli
 - [ ] Cache players link for offline use
 - [ ] Nix?
@@ -26,3 +26,5 @@
 - [ ] MAL sync
 - [ ] Play from download
 - [ ] Discord presence
+
+- [ ] Seven deadly sins S1 EP 26 "Episode 26 interrupted (ERROR: unable to download video data: HTTP Error 416: Requested Range Not Satisfiable). Retrying in 256s."

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/__init__.py

@@ -1,8 +1,8 @@
-from .top_level import AnimeSama
 from .catalogue import Catalogue
-from .season import Season
 from .episode import Episode, Languages, Players
-from .langs import Lang, LangId, lang2ids, id2lang, flags
+from .langs import Lang, LangId, flags, id2lang, lang2ids
+from .season import Season
+from .top_level import AnimeSama, find_site_url
 
 try:
     from .cli.__main__ import main
@@ -38,6 +38,7 @@ __all__ = [
     "download",
     "multi_download",
     "main",
+    "find_site_url",
 ]
 
 """__locals = locals()

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/catalogue.py

@@ -1,13 +1,12 @@
-from collections.abc import Sequence
 import re
+from collections.abc import Sequence
 from typing import Any, Literal, cast
 
 from httpx import AsyncClient
 
-from .utils import remove_some_js_comments
+from .langs import Lang, flags
 from .season import Season
-from .langs import flags, Lang
-
+from .utils import remove_some_js_comments
 
 # Oversight from anime-sama that we should handle
 # 'Animes' instead of 'Anime' seen in Cyberpunk: Edgerunners and Valkyrie Apocalypse
@@ -56,7 +55,7 @@ class Catalogue:
 
         response = await self.client.get(self.url)
 
-        if not response.is_success:
+        if response.is_error:
             self._page = ""
         else:
             self._page = response.text

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/__main__.py

@@ -1,16 +1,17 @@
 import asyncio
 import logging
+from urllib.error import URLError
 
+from httpx import AsyncClient
 from rich import get_console
 from rich.logging import RichHandler
 from rich.status import Status
 
-from . import downloader, internal_player
-from .config import config
-from .episode_extra_info import convert_with_extra_info
-from .utils import safe_input, select_one, select_range
-
-from ..top_level import AnimeSama
+from anime_sama_api.cli import downloader, internal_player
+from anime_sama_api.cli.config import config
+from anime_sama_api.cli.episode_extra_info import convert_with_extra_info
+from anime_sama_api.cli.utils import safe_input, select_one, select_range
+from anime_sama_api.top_level import AnimeSama, find_site_url
 
 console = get_console()
 console._highlight = False
@@ -24,21 +25,38 @@ def spinner(text: str) -> Status:
 async def async_main() -> None:
     query = safe_input("Anime name: \033[0;34m", str)
 
+    client = AsyncClient()
+    url = config.url or await find_site_url(client, config.provider_url)
+
+    if url is None:
+        raise URLError("Failed to get AnimeSama url")
+
     with spinner(f"Searching for [blue]{query}"):
-        catalogues = await AnimeSama(config.url).search(query)
+        catalogues = await AnimeSama(url, client).search(query)
     catalogue = select_one(catalogues)
 
     with spinner(f"Getting season list for [blue]{catalogue.name}"):
-        seasons = await catalogue.seasons()
-    season = select_one(seasons)
+        seasons_list = await catalogue.seasons()
 
-    with spinner(f"Getting episode list for [blue]{season.name}"):
-        episodes = await season.episodes()
+    selected_seasons = select_range(seasons_list, msg="Choose season(s)")
 
-    console.print(f"\n[cyan bold underline]{season.serie_name} - {season.name}")
-    selected_episodes = select_range(
-        episodes, msg="Choose episode(s)", print_choices=True
-    )
+    if len(selected_seasons) > 1:
+        # Multi-season automatic download
+        selected_episodes = []
+        for s in selected_seasons:
+            with spinner(f"Getting episode list for [blue]{s.name}"):
+                episodes = await s.episodes()
+                selected_episodes.extend(episodes)
+    else:
+        # Single season behavior (manual episode selection)
+        season = selected_seasons[0]
+        with spinner(f"Getting episode list for [blue]{season.name}"):
+            episodes = await season.episodes()
+
+        console.print(f"\n[cyan bold underline]{season.serie_name} - {season.name}")
+        selected_episodes = select_range(
+            episodes, msg="Choose episode(s)", print_choices=True
+        )
 
     if config.download:
         downloader.multi_download(

anime_sama_api-0.2.2.post3/anime_sama_api/cli/config.py

@@ -0,0 +1,119 @@
+# TODO: Allway hard to read but I can't find a better way to do it
+import logging
+import sys
+from dataclasses import dataclass, field
+from pathlib import Path
+
+# import platformdirs for config_dir and download_dir
+from platformdirs import user_config_dir, user_downloads_dir
+
+from anime_sama_api.langs import Lang, lang2ids
+
+if sys.version_info >= (3, 11):
+    import tomllib
+else:
+    import tomli as tomllib
+
+logger = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True)
+class PlayersConfig:
+    prefers: list[str] = field(default_factory=list)
+    bans: list[str] = field(default_factory=list)
+
+
+@dataclass(frozen=True)
+class Config:
+    prefer_languages: list[Lang]
+    download_path: Path
+    episode_path: str
+    download: bool
+    show_players: bool
+    max_retry_time: int
+    format: str
+    format_sort: str
+    internal_player_command: list[str]
+    url: str
+    provider_url: str
+    players_config: PlayersConfig
+    concurrent_downloads: dict[str, int]
+
+
+def load_config() -> Config:
+    # 1. Load default config from the package
+    default_config_file = Path(__file__).parent / "config.toml"
+    if not default_config_file.exists():
+        raise FileNotFoundError(
+            f"The default config.toml could not be found at {default_config_file}"
+        )
+
+    with open(default_config_file, "rb") as f:
+        config_dict = tomllib.load(f)
+
+    # 2. Determine user config path
+    # Order of priority:
+    # - current directory (./config.toml)
+    # - system config directory (e.g. ~/AppData/Local/anime-sama_api/config.toml)
+    local_config = Path("config.toml")
+    system_config_dir = Path(user_config_dir("anime-sama_api", appauthor=False))
+    system_config_file = system_config_dir / "config.toml"
+
+    user_config_data = {}
+    if local_config.exists():
+        with open(local_config, "rb") as f:
+            user_config_data = tomllib.load(f)
+    elif system_config_file.exists():
+        with open(system_config_file, "rb") as f:
+            user_config_data = tomllib.load(f)
+    else:
+        # Recreate default config if not found anywhere
+        from shutil import copy
+
+        system_config_dir.mkdir(parents=True, exist_ok=True)
+        copy(default_config_file, system_config_file)
+        logger.info("Default config created at %s", system_config_file)
+
+    # 3. Merge configs (user values override defaults)
+    config_dict.update(user_config_data)
+
+    # 4. Backward compatibility and data cleaning
+    # Languages conversion
+    new_langs: list[Lang] = []
+    for lang in config_dict.get("prefer_languages", []):
+        if lang == "VO":
+            lang = "VOSTFR"
+        if lang in lang2ids:
+            new_langs.append(lang)
+        else:
+            logger.warning("'%s' is not a valid language, ignoring it.", lang)
+    config_dict["prefer_languages"] = new_langs
+
+    # Path detection and expansion
+    raw_path = config_dict.get("download_path")
+    if not raw_path:
+        # Default to system Downloads / Anime-Sama if not specified
+        config_dict["download_path"] = Path(user_downloads_dir()) / "Anime-Sama"
+    else:
+        config_dict["download_path"] = Path(raw_path).expanduser()
+
+    # Internal player command string to list
+    player_cmd = config_dict.get("internal_player_command")
+    if isinstance(player_cmd, str):
+        config_dict["internal_player_command"] = player_cmd.split()
+    elif player_cmd is None:
+        config_dict["internal_player_command"] = []
+
+    # Players config mapping
+    players_data = config_dict.pop("players_hostname", {})
+    if "players" in config_dict:  # Old key removal
+        del config_dict["players"]
+    config_dict["players_config"] = PlayersConfig(**players_data)
+
+    # Ensure all required keys are present for Config dataclass
+    # (Checking against keys in Config.__annotations__ if necessary)
+    return Config(**config_dict)
+
+
+# Exported config instance
+config = load_config()

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/config.toml

@@ -21,7 +21,8 @@ format_sort = ""
 internal_player_command = "mpv"
 
 # url of anime-sama (You shouldn't touch that)
-url = "https://anime-sama.eu/"
+url = ""
+provider_url = "https://anime-sama.pw/"
 
 [concurrent_downloads]
 # how many fragment of a video to download at once

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/downloader.py

@@ -1,35 +1,33 @@
+import logging
 import random
 import time
-import logging
 from concurrent.futures import ThreadPoolExecutor
 from pathlib import Path
 from typing import cast
 from urllib.parse import urlparse
 
-import httpx
-from yt_dlp import YoutubeDL
-from yt_dlp.utils import DownloadError
 from rich import get_console
-from rich.live import Live
 from rich.console import Group
-from rich.table import Column
+from rich.live import Live
 from rich.progress import (
     BarColumn,
+    MofNCompleteColumn,
     Progress,
+    ProgressColumn,
+    TaskID,
     TextColumn,
     TimeRemainingColumn,
-    TransferSpeedColumn,
-    MofNCompleteColumn,
-    TaskID,
     TotalFileSizeColumn,
-    ProgressColumn,
+    TransferSpeedColumn,
 )
+from rich.table import Column
+from yt_dlp import YoutubeDL
+from yt_dlp.utils import DownloadError
 
-from .episode_extra_info import EpisodeWithExtraInfo
-from .error_handeling import YDL_log_filter, reaction_to
-from ..langs import Lang
-from .config import PlayersConfig, config
-
+from anime_sama_api.langs import Lang
+from anime_sama_api.cli.config import PlayersConfig, config
+from anime_sama_api.cli.episode_extra_info import EpisodeWithExtraInfo
+from anime_sama_api.cli.error_handeling import YDL_log_filter, reaction_to
 
 logger = logging.getLogger(__name__)
 logger.addFilter(YDL_log_filter)
@@ -69,13 +67,18 @@ def download(
     episode: EpisodeWithExtraInfo,
     path: Path,
     episode_path: str = "{episode}",
-    prefer_languages: list[Lang] = ["VOSTFR"],
-    players_config: PlayersConfig = PlayersConfig([], []),
+    prefer_languages: list[Lang] | None = None,
+    players_config: PlayersConfig | None = None,
     concurrent_fragment_downloads: int = 3,
     max_retry_time: int = 1024,
-    format: str = "",
+    video_format: str = "",
     format_sort: str = "",
 ) -> None:
+    if prefer_languages is None:
+        prefer_languages = ["VOSTFR"]
+    if players_config is None:
+        players_config = PlayersConfig([], [])
+
     if not any(episode.warpped.languages.values()):
         logger.error("No player available")
         return
@@ -83,7 +86,7 @@ def download(
     me = download_progress.add_task(
         "download", episode_name=episode.warpped.name, site="", total=None
     )
-    task = download_progress.tasks[me]
+    task = next(t for t in download_progress.tasks if t.id == me)
 
     full_path = (
         path
@@ -108,7 +111,7 @@ def download(
         "concurrent_fragment_downloads": concurrent_fragment_downloads,
         "progress_hooks": [hook],
         "logger": logger,
-        "format": format,
+        "format": video_format,
         "format_sort": format_sort.split(","),
     }
 
@@ -120,17 +123,6 @@ def download(
         download_progress.update(me, site=urlparse(player).hostname)
 
         while True:
-            # Check if the video is not accessible through vidmoly
-            try:
-                if (
-                    player.startswith("https://vidmoly.")
-                    and "Please wait"  # Note "Please wait" appear in all the player page
-                    not in httpx.get(player, headers={"User-Agent": ""}).text
-                ):
-                    break
-            except httpx.ConnectError:
-                break
-
             try:
                 with YoutubeDL(option) as ydl:  # type: ignore
                     error_code = cast(int, ydl.download([player]))
@@ -139,20 +131,14 @@ def download(
                         sucess = True
                     else:
                         logger.fatal(
-                            f"The download encountered an error code {error_code}. Please report this to the developer with URL: {player}",
+                            "The download encountered an error code %s. Please report this to the developer with URL: %s",
+                            error_code,
+                            player,
                         )
 
                     break
 
             except DownloadError as exception:
-                # yt-dlp thinks vidmoly is unsupported but it just need wait
-                if (
-                    player.startswith("https://vidmoly.")
-                    and exception.msg is not None
-                    and "Unsupported URL: https://vidmoly.net/" in exception.msg
-                ):
-                    exception.msg = "Waiting for vidmoly"
-
                 match reaction_to(exception.msg):
                     case "continue":
                         break
@@ -162,7 +148,10 @@ def download(
                             break
 
                         logger.warning(
-                            f"{episode.warpped.name} interrupted. Retrying in {retry_time}s."
+                            "%s interrupted (%s). Retrying in %ss.",
+                            episode.warpped.name,
+                            exception.msg,
+                            retry_time,
                         )
                         # random is used to spread the resume time and so mitigate deadlock when multiple downloads resume at the same time
                         time.sleep(retry_time * random.uniform(0.8, 1.2))
@@ -190,13 +179,20 @@ def multi_download(
     episodes: list[EpisodeWithExtraInfo],
     path: Path,
     episode_path: str = "{episode}",
-    concurrent_downloads: dict[str, int] = {},
-    prefer_languages: list[Lang] = ["VOSTFR"],
-    players_config: PlayersConfig = PlayersConfig([], []),
+    concurrent_downloads: dict[str, int] | None = None,
+    prefer_languages: list[Lang] | None = None,
+    players_config: PlayersConfig | None = None,
     max_retry_time: int = 1024,
-    format: str = "",
+    video_format: str = "",
     format_sort: str = "",
 ) -> None:
+    if concurrent_downloads is None:
+        concurrent_downloads = {}
+    if prefer_languages is None:
+        prefer_languages = ["VOSTFR"]
+    if players_config is None:
+        players_config = PlayersConfig([], [])
+
     """
     Not sure if you can use this function multiple times
     """
@@ -215,6 +211,6 @@ def multi_download(
                     players_config,
                     concurrent_downloads.get("fragment", 1),
                     max_retry_time,
-                    format,
+                    video_format,
                     format_sort,
                 )

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/episode_extra_info.py

@@ -7,9 +7,9 @@ from typing import Any
 
 import httpx
 
-from ..episode import Episode
-from ..catalogue import Catalogue
-from .utils import normalize
+from anime_sama_api.catalogue import Catalogue
+from anime_sama_api.cli.utils import normalize
+from anime_sama_api.episode import Episode
 
 
 @dataclass(frozen=True)
@@ -68,12 +68,20 @@ def _get_mal_listing(serie: Catalogue) -> None | Any:
     for name in [serie.name] + list(serie.alternative_names):
         i = 0
         while True:
-            response = httpx.get(f"https://api.jikan.moe/v4/anime?q={name}&limit=5")
+            try:
+                response = httpx.get(
+                    f"https://api.jikan.moe/v4/anime?q={name}&limit=5", timeout=10
+                )
+            except httpx.HTTPError:
+                return None
+
             i += 1
             if response.status_code != 429 or i > 9:
                 break
 
-        response.raise_for_status()
+        if response.status_code != 200:
+            return None
+
         animes = response.json().get("data", [])
 
         for anime in animes:
@@ -87,7 +95,14 @@ def _get_mal_listing(serie: Catalogue) -> None | Any:
                         continue
 
                     return anime
+
                 if name in title or title in name:
+                    if len(anime_genres) == 0:
+                        if len(serie.genres) != 0:
+                            continue
+                        else:
+                            return anime
+
                     # Because this condition is not a guarantee, we do an additionnal screenning base on corresponding genres
                     not_corresponding_genres = [
                         genre
@@ -103,3 +118,19 @@ def _get_mal_listing(serie: Catalogue) -> None | Any:
                         return anime
 
     return None
+
+
+if __name__ == "__main__":
+    import asyncio
+    from anime_sama_api import find_site_url, AnimeSama
+
+    async def main():
+        url = await find_site_url()
+
+        if url is None:
+            raise
+
+        async for catalogue in AnimeSama(url).catalogues_iter():
+            print(catalogue.name, get_serie_release_date(catalogue))
+
+    asyncio.run(main())

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/internal_player.py

@@ -1,13 +1,13 @@
 import os
-import sys
 import subprocess
+import sys
 from pathlib import Path
 
 from rich import print
 
-from ..langs import Lang
-from .config import config
-from ..episode import Episode
+from anime_sama_api.cli.config import config
+from anime_sama_api.episode import Episode
+from anime_sama_api.langs import Lang
 
 
 def open_silent_process(command: list[str]) -> subprocess.Popen[bytes]:

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/play_menu.py

@@ -1,4 +1,4 @@
-from ..episode import Episode
+from anime_sama_api.episode import Episode
 
 
 class EpisodesManager:

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/cli/utils.py

@@ -67,8 +67,8 @@ def select_range(
         return [choices[0]]
 
     def transform(string: str) -> list[T]:
-        # Return all choices if the user enter '*' symbol
-        if string == "*":
+        # Return all choices if the user enter '*' symbol or 'all'
+        if string in ("*", "all"):
             return choices
         # Else, detect the string and transform it into a list of choices
         ints_set: set[int] = set()

{anime_sama_api-0.2.2.post1 → anime_sama_api-0.2.2.post3}/anime_sama_api/episode.py

@@ -1,11 +1,11 @@
-from collections.abc import Generator, Sequence
-import re
 import logging
+import re
+from collections.abc import Generator, Sequence
 from dataclasses import dataclass
 from typing import Any
 from urllib.parse import urlparse
 
-from .langs import flags, Lang, LangId, id2lang, lang2ids
+from .langs import Lang, LangId, flags, id2lang, lang2ids
 
 logger = logging.getLogger(__name__)