chore: bump version

fastanime/__init__.py

@@ -6,7 +6,7 @@ if sys.version_info < (3, 10):
     )  # noqa: F541
 
 
-__version__ = "v1.1.7"
+__version__ = "v1.6.2"
 
 APP_NAME = "FastAnime"
 AUTHOR = "Benex254"

fastanime/cli/__init__.py

@@ -76,7 +76,14 @@ signal.signal(signal.SIGINT, handle_exit)
 @click.option(
     "-q",
     "--quality",
-    type=click.Choice(["360", "720", "1080", "unknown"]),
+    type=click.Choice(
+        [
+            "360",
+            "480",
+            "720",
+            "1080",
+        ]
+    ),
     help="set the quality of the stream",
 )
 @click.option(

fastanime/cli/commands/anilist/search.py

@@ -1,13 +1,13 @@
 import click
 
+from ...utils.completion_types import anime_titles_shell_complete
+
 
 @click.command(
     help="Search for anime using anilists api and get top ~50 results",
     short_help="Search for anime",
 )
-@click.argument(
-    "title",
-)
+@click.argument("title", shell_complete=anime_titles_shell_complete)
 @click.pass_obj
 def search(config, title):
     from ....anilist import AniList

fastanime/cli/commands/download.py

@@ -3,6 +3,8 @@ from typing import TYPE_CHECKING
 
 import click
 
+from ..utils.completion_types import anime_titles_shell_complete
+
 if TYPE_CHECKING:
     from ..config import Config
 
@@ -12,8 +14,7 @@ if TYPE_CHECKING:
     short_help="Download anime",
 )
 @click.argument(
-    "anime-title",
-    required=True,
+    "anime-title", required=True, shell_complete=anime_titles_shell_complete
 )
 @click.option(
     "--episode-range",
@@ -91,10 +92,12 @@ def download(config: "Config", anime_title, episode_range, highest_priority):
     episodes = anime["availableEpisodesDetail"][config.translation_type]
     if episode_range:
         episodes_start, episodes_end = episode_range.split("-")
+        episodes_range = range(round(float(episodes_start)), round(float(episodes_end)))
 
     else:
-        episodes_start, episodes_end = 0, len(episodes)
-    for episode in range(round(float(episodes_start)), round(float(episodes_end))):
+        episodes_range = sorted(episodes, key=float)
+
+    for episode in episodes_range:
         try:
             episode = str(episode)
             if episode not in episodes:

fastanime/cli/commands/search.py

@@ -1,6 +1,7 @@
 import click
 
 from ...cli.config import Config
+from ..utils.completion_types import anime_titles_shell_complete
 
 
 @click.command(
@@ -12,7 +13,9 @@ from ...cli.config import Config
     "-r",
     help="A range of episodes to binge",
 )
-@click.argument("anime_title", required=True, type=str)
+@click.argument(
+    "anime_title", required=True, shell_complete=anime_titles_shell_complete
+)
 @click.pass_obj
 def search(config: Config, anime_title: str, episode_range: str):
     from click import clear

fastanime/cli/interfaces/anilist_interfaces.py

@@ -532,16 +532,26 @@ def provider_anime_episode_servers_menu(
     # this will try to update the episode to be the next episode if delta has reached a specific threshhold
     # this update will only apply locally
     # the remote(anilist) is only updated when its certain you are going to open the player
+    available_episodes: list = sorted(
+        fastanime_runtime_state.provider_available_episodes, key=float
+    )
     if stop_time == "0" or total_time == "0":
-        # increment the episode
-        episode = str(int(current_episode_number) + 1)
+        # increment the episodes
+        next_episode = available_episodes.index(current_episode_number) + 1
+        if next_episode >= len(available_episodes):
+            next_episode = len(available_episodes) - 1
+        episode = available_episodes[next_episode]
     else:
         error = config.error * 60
         delta = calculate_time_delta(stop_time, total_time)
         if delta.total_seconds() > error:
             episode = current_episode_number
         else:
-            episode = str(int(current_episode_number) + 1)
+            # increment the episodes
+            next_episode = available_episodes.index(current_episode_number) + 1
+            if next_episode >= len(available_episodes):
+                next_episode = len(available_episodes) - 1
+            episode = available_episodes[next_episode]
             stop_time = "0"
             total_time = "0"
 
@@ -1174,6 +1184,7 @@ def anilist_results_menu(
             anime["status"] == "RELEASING"
             and anime["nextAiringEpisode"]
             and progress > 0
+            and anime["mediaListEntry"]
         ):
             last_aired_episode = anime["nextAiringEpisode"]["episode"] - 1
             if last_aired_episode - progress > 0:

fastanime/cli/utils/completion_types.py

@@ -0,0 +1,98 @@
+from typing import TYPE_CHECKING
+
+import requests
+
+if TYPE_CHECKING:
+    from ...libs.anilist.types import AnilistDataSchema
+
+import logging
+
+logger = logging.getLogger(__name__)
+
+ANILIST_ENDPOINT = "https://graphql.anilist.co"
+
+
+anime_title_query = """
+query($query:String){
+    Page(perPage:50){
+        pageInfo{
+            total
+            currentPage
+            hasNextPage
+        }
+        media(search:$query,type:ANIME){
+            id
+                idMal
+            title{
+                romaji
+                english
+            }
+        }
+    }
+}
+"""
+
+
+def get_anime_titles(query: str, variables: dict = {}):
+    """the abstraction over all none authenticated requests and that returns data of a similar type
+
+    Args:
+        query: the anilist query
+        variables: the anilist api variables
+
+    Returns:
+        a boolean indicating success and none or an anilist object depending on success
+    """
+    try:
+        response = requests.post(
+            ANILIST_ENDPOINT,
+            json={"query": query, "variables": variables},
+            timeout=10,
+        )
+        anilist_data: AnilistDataSchema = response.json()
+
+        # ensuring you dont get blocked
+        if (
+            int(response.headers.get("X-RateLimit-Remaining", 0)) < 30
+            and not response.status_code == 500
+        ):
+            print("Warning you are exceeding the allowed number of calls per minute")
+            logger.warning(
+                "You are exceeding the allowed number of calls per minute for the AniList api enforcing timeout"
+            )
+            print("Forced timeout will now be initiated")
+            import time
+
+            print("sleeping...")
+            time.sleep(1 * 60)
+        if response.status_code == 200:
+            eng_titles = [
+                anime["title"]["english"]
+                for anime in anilist_data["data"]["Page"]["media"]
+                if anime["title"]["english"]
+            ]
+            romaji_titles = [
+                anime["title"]["romaji"]
+                for anime in anilist_data["data"]["Page"]["media"]
+                if anime["title"]["romaji"]
+            ]
+            return [*eng_titles, *romaji_titles]
+        else:
+            return ["non 200 status code"]
+    except requests.exceptions.Timeout:
+        logger.warning(
+            "Timeout has been exceeded this could mean anilist is down or you have lost internet connection"
+        )
+        return ["timeout exceeded"]
+    except requests.exceptions.ConnectionError:
+        logger.warning(
+            "ConnectionError this could mean anilist is down or you have lost internet connection"
+        )
+        return ["connection error"]
+    except Exception as e:
+        logger.error(f"Something unexpected occured {e}")
+        return ["unexpected error"]
+
+
+def anime_titles_shell_complete(ctx, param, incomplete):
+    return [name for name in get_anime_titles(anime_title_query, {"query": incomplete})]

fastanime/cli/utils/utils.py

@@ -37,9 +37,14 @@ def filter_by_quality(quality: str, stream_links: "list[EpisodeStream]", default
             return stream_link
     else:
         if stream_links and default:
+            from rich import print
+
             try:
-                print("Qualities were: ", stream_links)
-                print("Using default of quality: ", stream_links[0]["quality"])
+                print("[yellow bold]WARNING Qualities were:[/] ", stream_links)
+                print(
+                    "[cyan bold]Using default of quality:[/] ",
+                    stream_links[0]["quality"],
+                )
                 return stream_links[0]
             except Exception as e:
                 print(e)

fastanime/constants.py

@@ -3,12 +3,19 @@ import sys
 from pathlib import Path
 from platform import system
 
+from plyer import storagepath
+
 from . import APP_NAME, AUTHOR, __version__
 
 PLATFORM = system()
 
 # ---- app deps ----
-APP_DIR = os.path.abspath(os.path.dirname(__file__))
+try:
+    APP_DIR = storagepath.get_application_dir()  # pyright:ignore
+except Exception:
+    APP_DIR = None
+if not APP_DIR:
+    APP_DIR = os.path.abspath(os.path.dirname(__file__))
 CONFIGS_DIR = os.path.join(APP_DIR, "configs")
 ASSETS_DIR = os.path.join(APP_DIR, "assets")
 
@@ -24,10 +31,18 @@ PREVIEW_IMAGE = os.path.join(ASSETS_DIR, "preview")
 # ----- user configs and data -----
 
 S_PLATFORM = sys.platform
-
+try:
+    app_data_dir_base = None
+    video_dir_base = storagepath.get_videos_dir()  # pyright:ignore
+    cache_dir_base = None
+except Exception:
+    video_dir_base = None
+    cache_dir_base = None
+    app_data_dir_base = None
 if S_PLATFORM == "win32":
     # app data
-    app_data_dir_base = os.getenv("LOCALAPPDATA")
+    if not app_data_dir_base:
+        app_data_dir_base = os.getenv("LOCALAPPDATA")
     if not app_data_dir_base:
         raise RuntimeError("Could not determine app data dir please report to devs")
     APP_DATA_DIR = os.path.join(app_data_dir_base, AUTHOR, APP_NAME)
@@ -36,38 +51,45 @@ if S_PLATFORM == "win32":
     APP_CACHE_DIR = os.path.join(APP_DATA_DIR, "cache")
 
     # videos dir
-    video_dir_base = os.path.expanduser("~/Videos")
+    if not video_dir_base:
+        video_dir_base = os.path.expanduser("~/Videos")
     USER_VIDEOS_DIR = os.path.join(video_dir_base, APP_NAME)
 
 elif S_PLATFORM == "darwin":
     # app data
-    app_data_dir_base = os.path.expanduser("~/Library/Application Support")
+    if not app_data_dir_base:
+        app_data_dir_base = os.path.expanduser("~/Library/Application Support")
     APP_DATA_DIR = os.path.join(app_data_dir_base, APP_NAME, __version__)
 
     # cache dir
-    cache_dir_base = os.path.expanduser("~/Library/Caches")
+    if not cache_dir_base:
+        cache_dir_base = os.path.expanduser("~/Library/Caches")
     APP_CACHE_DIR = os.path.join(cache_dir_base, APP_NAME, __version__)
 
     # videos dir
-    video_dir_base = os.path.expanduser("~/Movies")
+    if not video_dir_base:
+        video_dir_base = os.path.expanduser("~/Movies")
     USER_VIDEOS_DIR = os.path.join(video_dir_base, APP_NAME)
 else:
     # app data
-    app_data_dir_base = os.environ.get("XDG_CONFIG_HOME", "")
-    if not app_data_dir_base.strip():
-        app_data_dir_base = os.path.expanduser("~/.config")
+    if not app_data_dir_base:
+        app_data_dir_base = os.environ.get("XDG_CONFIG_HOME", "")
+        if not app_data_dir_base.strip():
+            app_data_dir_base = os.path.expanduser("~/.config")
     APP_DATA_DIR = os.path.join(app_data_dir_base, APP_NAME)
 
     # cache dir
-    cache_dir_base = os.environ.get("XDG_CACHE_HOME", "")
-    if not cache_dir_base.strip():
-        cache_dir_base = os.path.expanduser("~/.cache")
+    if not cache_dir_base:
+        cache_dir_base = os.environ.get("XDG_CACHE_HOME", "")
+        if not cache_dir_base.strip():
+            cache_dir_base = os.path.expanduser("~/.cache")
     APP_CACHE_DIR = os.path.join(cache_dir_base, APP_NAME)
 
     # videos dir
-    video_dir_base = os.environ.get("XDG_VIDEOS_DIR", "")
-    if not video_dir_base.strip():
-        video_dir_base = os.path.expanduser("~/Videos")
+    if not video_dir_base:
+        video_dir_base = os.environ.get("XDG_VIDEOS_DIR", "")
+        if not video_dir_base.strip():
+            video_dir_base = os.path.expanduser("~/Videos")
     USER_VIDEOS_DIR = os.path.join(video_dir_base, APP_NAME)
 
 # ensure paths exist

fastanime/libs/anilist/queries_graphql.py

@@ -231,7 +231,7 @@ $type:MediaType\
 search_query = (
     """
 query($query:String,%s){
-  Page(perPage:30,page:$page){
+  Page(perPage:50,page:$page){
     pageInfo{
       total
       currentPage

fastanime/libs/anime_provider/utils.py

@@ -36,7 +36,7 @@ hex_to_char = {
 
 
 def give_random_quality(links: list[dict]):
-    qualities = cycle(["1080", "720", "360"])
+    qualities = cycle(["1080", "720", "480", "360"])
 
     return [
         {"link": link["link"], "quality": quality}

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastanime"
-version = "1.1.7.dev1"
+version = "1.6.2.dev1"
 description = "A browser anime site experience from the terminal"
 authors = ["Benextempest <benextempest@gmail.com>"]
 license = "UNLICENSE"