Merge branch 'Benexl:master' into psflag-fix

README.md

@@ -28,14 +28,20 @@
   <summary>
     <b>My Rice</b>
   </summary>
-  
+
+  **Anilist results menu:**
   ![image](https://github.com/user-attachments/assets/240023a7-7e4e-47dd-80ff-017d65081ee1)
 
+**Episodes menu preview:**
 ![image](https://github.com/user-attachments/assets/580f86ef-326f-4ab3-9bd8-c1cb312fbfa6)
 
 **Without preview images enabled:**
 ![image](https://github.com/user-attachments/assets/e1248a85-438f-4758-ae34-b0e0b224addd)
 
+**Desktop notifications + episodes menu without image preview:**
+![image](https://github.com/user-attachments/assets/b7802ef1-ca0d-45f5-a13a-e39c96a5d499)
+
+
 </details>
 
 <details>
@@ -111,7 +117,7 @@ If you have any difficulty consult for help on the [discord channel](https://dis
 ![Static Badge](https://img.shields.io/badge/NixOs-black?style=flat&logo=nixos)
 
 ```bash
-nix profile install github:Benex254/fastanime
+nix profile install github:Benexl/fastanime
 ```
 
 ### Installation using your favourite package manager
@@ -189,7 +195,7 @@ Requirements:
 
 To build from the source, follow these steps:
 
-1. Clone the repository: `git clone https://github.com/FastAnime/FastAnime.git --depth 1`
+1. Clone the repository: `git clone https://github.com/Benexl/FastAnime.git --depth 1`
 2. Navigate into the folder: `cd FastAnime`
 3. Then build and Install the app:
 
@@ -330,7 +336,7 @@ fastanime --manga search -t <manga-title>
 
 #### The anilist command :fire: :fire: :fire:
 
-Stream, browse, and discover anime efficiently from the terminal using the [AniList API](https://github.com/AniList/ApiV2-GraphQL-Docs).
+Uses the [AniList API](https://github.com/AniList/ApiV2-GraphQL-Docs) to create a terminal anilist client which is then intergrated with the scraping capabilities of the project.
 
 ##### Running without any subcommand
 

fastanime/Utility/data.py

@@ -12,7 +12,11 @@ anime_normalizer_raw = {
         "Re:Zero kara Hajimeru Isekai Seikatsu Season 3": "Re:Zero kara Hajimeru Isekai Seikatsu 3rd Season",
     },
     "hianime": {"My Star": "Oshi no Ko"},
-    "animepahe": {"Azumanga Daiou The Animation": "Azumanga Daioh"},
+    "animepahe":    {
+        "Azumanga Daiou The Animation": "Azumanga Daioh",
+        "Mairimashita! Iruma-kun 2nd Season": "Mairimashita! Iruma-kun 2",
+        "Mairimashita! Iruma-kun 3rd Season": "Mairimashita! Iruma-kun 3"
+                    },
     "nyaa": {},
     "yugen": {},
 }

fastanime/cli/commands/anilist/__init__.py

@@ -80,15 +80,13 @@ commands = {
   fastanime --log-file anilist notifier
 """,
 )
+@click.option("--resume", is_flag=True, help="Resume from the last session")
 @click.pass_context
-def anilist(ctx: click.Context):
+def anilist(ctx: click.Context, resume: bool):
     from typing import TYPE_CHECKING
 
     from ....anilist import AniList
     from ....AnimeProvider import AnimeProvider
-    from ...interfaces.anilist_interfaces import (
-        fastanime_main_menu as anilist_interface,
-    )
 
     if TYPE_CHECKING:
         from ...config import Config
@@ -98,4 +96,33 @@ def anilist(ctx: click.Context):
         AniList.update_login_info(user, user["token"])
     if ctx.invoked_subcommand is None:
         fastanime_runtime_state = FastAnimeRuntimeState()
-        anilist_interface(ctx.obj, fastanime_runtime_state)
+        if resume:
+            from ...interfaces.anilist_interfaces import (
+                anime_provider_search_results_menu,
+            )
+
+            if not config.user_data["recent_anime"]:
+                click.echo("No recent anime found", err=True, color=True)
+                return
+            fastanime_runtime_state.anilist_results_data = {
+                "data": {"Page": {"media": config.user_data["recent_anime"]}}
+            }
+
+            fastanime_runtime_state.selected_anime_anilist = config.user_data[
+                "recent_anime"
+            ][0]
+            fastanime_runtime_state.selected_anime_id_anilist = config.user_data[
+                "recent_anime"
+            ][0]["id"]
+            fastanime_runtime_state.selected_anime_title_anilist = (
+                config.user_data["recent_anime"][0]["title"]["romaji"]
+                or config.user_data["recent_anime"][0]["title"]["english"]
+            )
+            anime_provider_search_results_menu(config, fastanime_runtime_state)
+
+        else:
+            from ...interfaces.anilist_interfaces import (
+                fastanime_main_menu as anilist_interface,
+            )
+
+            anilist_interface(ctx.obj, fastanime_runtime_state)

fastanime/cli/config.py

@@ -51,6 +51,7 @@ class Config(object):
         "image_previews": "True" if S_PLATFORM != "win32" else "False",
         "normalize_titles": "True",
         "notification_duration": "2",
+        "max_cache_lifetime": "03:00:00",
         "player": "mpv",
         "preferred_history": "local",
         "preferred_language": "english",
@@ -128,6 +129,14 @@ class Config(object):
         self.notification_duration = self.configparser.getint(
             "general", "notification_duration"
         )
+        max_cache_lifetime = list(
+            map(int, self.configparser.get("general", "max_cache_lifetime").split(":"))
+        )
+        self.max_cache_lifetime = (
+            max_cache_lifetime[0] * 86400
+            + max_cache_lifetime[1] * 3600
+            + max_cache_lifetime[2] * 60
+        )
         self.player = self.configparser.get("stream", "player")
         self.preferred_history = self.configparser.get("stream", "preferred_history")
         self.preferred_language = self.configparser.get("general", "preferred_language")
@@ -396,6 +405,11 @@ force_forward_tracking = {self.force_forward_tracking}
 # from the cached_requests_db
 cache_requests = {self.cache_requests}
 
+# the max lifetime for a cached request <days:hours:minutes>
+# defaults to 3days = 03:00:00
+# this is the time after which a cached request will be deleted (technically : )
+max_cache_lifetime = {self.max_cache_lifetime}
+
 # whether to use a persistent store (basically a sqlitedb) for storing some data the provider requires
 # to enable a seamless experience [true/false]
 # this option exists primarily because i think it may help in the optimization

fastanime/libs/anime_provider/base_provider.py

@@ -19,7 +19,10 @@ class AnimeProvider:
             from ..common.requests_cacher import CachedRequestsSession
 
             self.session = CachedRequestsSession(
-                os.path.join(APP_CACHE_DIR, "cached_requests.db")
+                os.path.join(APP_CACHE_DIR, "cached_requests.db"),
+                max_lifetime=int(
+                    os.environ.get("FASTANIME_MAX_CACHE_LIFETIME", 259200)
+                ),
             )
         else:
             self.session = requests.session()

fastanime/libs/common/requests_cacher.py

@@ -80,7 +80,8 @@ class CachedRequestsSession(requests.Session):
                     response_headers TEXT, 
                     data BLOB,
                     redirection_policy INT,
-                    cache_expiry INTEGER
+                    cache_expiry INTEGER,
+                    created_at TIMESTAMP DEFAULT CURRENT_TIMESTAMP
                 )"""
             )
 
@@ -117,6 +118,8 @@ class CachedRequestsSession(requests.Session):
                     url = ? 
                     AND redirection_policy = ? 
                     AND cache_expiry > ?
+                ORDER BY created_at DESC
+                LIMIT 1
                 """,
                 (url, redirection_policy, int(time.time())),
             )
@@ -162,8 +165,15 @@ class CachedRequestsSession(requests.Session):
                 logger.debug("Caching the current request")
                 cursor.execute(
                     f"""
-                    INSERT INTO {self.table_name} 
-                    VALUES (?, ?, ?, ?, ?, ?, ?)
+                    INSERT INTO {self.table_name} (
+                        url, 
+                        status_code, 
+                        request_headers, 
+                        response_headers, 
+                        data, 
+                        redirection_policy, 
+                        cache_expiry
+                    ) VALUES (?, ?, ?, ?, ?, ?, ?)
                     """,
                     (
                         url,