chore: update lock files

fix(anilist_interface):  Updated chafa call

README.md

@@ -13,6 +13,7 @@
 ![GitHub Issues or Pull Requests](https://img.shields.io/github/issues/FastAnime/FastAnime)
 ![GitHub deployments](https://img.shields.io/github/deployments/FastAnime/fastanime/pypi?label=PyPi%20Publish)
 ![PyPI - License](https://img.shields.io/pypi/l/fastanime)
+![Static Badge](https://img.shields.io/badge/lines%20of%20code-13k%2B-green)
 </div>
 
 <p align="center">
@@ -24,6 +25,15 @@
 
 ![fastanime](https://github.com/user-attachments/assets/9ab09f26-e4a8-4b70-a315-7def998cec63)
 
+<details>
+  <summary>
+    <b>My Rice</b>
+  </summary>
+  
+  ![image](https://github.com/user-attachments/assets/240023a7-7e4e-47dd-80ff-017d65081ee1)
+
+</details>
+
 <details>
 <summary><b>fzf mode</b></summary>
   
@@ -91,6 +101,13 @@
 The app can run wherever python can run. So all you need to have is python installed on your device.
 On android you can use [termux](https://github.com/termux/termux-app).
 If you have any difficulty consult for help on the [discord channel](https://discord.gg/HBEmAwvbHV)
+### Installation on nixos
+![Static Badge](https://img.shields.io/badge/NixOs-black?style=flat&logo=nixos)
+
+
+```bash
+nix profile install github:Benex254/fastanime
+```
 
 ### Installation using your favourite package manager
 
@@ -1439,6 +1456,7 @@ For inquiries, join our [Discord Server](https://discord.gg/HBEmAwvbHV).
 
 ## Supporting the Project
 More pr's less issues 🙃
+Those who contribute at least five times will be able to make changes to the repo without my review.
 
 Show your support by starring the GitHub repository or [buying me a coffee](https://ko-fi.com/benex254).
 

fastanime/AnimeProvider.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
 logger = logging.getLogger(__name__)
 
 
-# TODO: improve performance of this class and add cool features like auto retry
+# TODO: add cool features like auto retry
 class AnimeProvider:
     """Class that manages all anime sources adding some extra functionality to them.
     Attributes:

fastanime/__init__.py

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

fastanime/cli/__init__.py

@@ -226,7 +226,7 @@ def run_cli(
     from .config import Config
 
     ctx.obj = Config()
-    if ctx.obj.check_for_updates:
+    if ctx.obj.check_for_updates and ctx.invoked_subcommand != "completions":
         from .app_updater import check_for_updates
 
         print("Checking for updates...")

fastanime/cli/app_updater.py

@@ -4,6 +4,7 @@ import shlex
 import shutil
 import subprocess
 import sys
+import os
 
 import requests
 from rich import print
@@ -15,14 +16,18 @@ API_URL = f"https://api.{GIT_REPO}/repos/{AUTHOR}/{APP_NAME}/releases/latest"
 
 def check_for_updates():
     USER_AGENT = f"{APP_NAME} user"
-    request = requests.get(
-        API_URL,
-        headers={
-            "User-Agent": USER_AGENT,
-            "X-GitHub-Api-Version": "2022-11-28",
-            "Accept": "application/vnd.github+json",
-        },
-    )
+    try:
+        request = requests.get(
+            API_URL,
+            headers={
+                "User-Agent": USER_AGENT,
+                "X-GitHub-Api-Version": "2022-11-28",
+                "Accept": "application/vnd.github+json",
+            },
+        )
+    except Exception:
+        print("You are not connected to the internet")
+        return True, {}
 
     if request.status_code == 200:
         release_json = request.json()
@@ -84,7 +89,14 @@ def update_app(force=False):
     tag_name = release_json["tag_name"]
 
     print("[cyan]Updating app to version %s[/]" % tag_name)
-    if is_git_repo(AUTHOR, APP_NAME):
+    if os.path.exists("/nix/store") and os.path.exists("/run/current-system"):
+        NIX = shutil.which("nix")
+        if not NIX:
+            print("[red]Cannot find nix, it looks like your system is broken.[/]")
+            return False, release_json
+
+        process = subprocess.run([NIX, "profile", "upgrade", APP_NAME.lower()])
+    elif is_git_repo(AUTHOR, APP_NAME):
         GIT_EXECUTABLE = shutil.which("git")
         args = [
             GIT_EXECUTABLE,

fastanime/cli/config.py

@@ -3,6 +3,7 @@ import logging
 import os
 from configparser import ConfigParser
 from typing import TYPE_CHECKING
+from ..libs.fzf import FZF_DEFAULT_OPTS, HEADER
 
 from ..constants import (
     USER_CONFIG_PATH,
@@ -42,6 +43,9 @@ class Config(object):
         "ffmpegthumbnailer_seek_time": "-1",
         "force_forward_tracking": "true",
         "force_window": "immediate",
+        "fzf_opts": FZF_DEFAULT_OPTS,
+        "header_color": "95,135,175",
+        "header_ascii_art": HEADER,
         "format": "best[height<=1080]/bestvideo[height<=1080]+bestaudio/best",
         "icons": "false",
         "image_previews": "True" if S_PLATFORM != "win32" else "False",
@@ -51,6 +55,8 @@ class Config(object):
         "preferred_history": "local",
         "preferred_language": "english",
         "preview": "False",
+        "preview_header_color": "215,0,95",
+        "preview_separator_color": "208,208,208",
         "provider": "allanime",
         "quality": "1080",
         "recent": "50",
@@ -111,6 +117,9 @@ class Config(object):
         )
         self.force_window = self.configparser.get("stream", "force_window")
         self.format = self.configparser.get("stream", "format")
+        self.fzf_opts = self.configparser.get("general", "fzf_opts")
+        self.header_color = self.configparser.get("general", "header_color")
+        self.header_ascii_art = self.configparser.get("general", "header_ascii_art")
         self.icons = self.configparser.getboolean("general", "icons")
         self.image_previews = self.configparser.getboolean("general", "image_previews")
         self.normalize_titles = self.configparser.getboolean(
@@ -123,6 +132,12 @@ class Config(object):
         self.preferred_history = self.configparser.get("stream", "preferred_history")
         self.preferred_language = self.configparser.get("general", "preferred_language")
         self.preview = self.configparser.getboolean("general", "preview")
+        self.preview_separator_color = self.configparser.get(
+            "general", "preview_separator_color"
+        )
+        self.preview_header_color = self.configparser.get(
+            "general", "preview_header_color"
+        )
         self.provider = self.configparser.get("general", "provider")
         self.quality = self.configparser.get("stream", "quality")
         self.recent = self.configparser.getint("general", "recent")
@@ -147,6 +162,8 @@ class Config(object):
         Rofi.rofi_theme_confirm = self.rofi_theme_confirm
         Rofi.rofi_theme_preview = self.rofi_theme_preview
 
+        os.environ["FZF_DEFAULT_OPTS"] = self.fzf_opts
+
         # ---- setup user data ------
         self.anime_list: list = self.user_data.get("animelist", [])
         self.user: dict = self.user_data.get("user", {})
@@ -228,6 +245,8 @@ class Config(object):
             self.configparser.write(config)
 
     def __repr__(self):
+        new_line = "\n"
+        tab = "\t"
         current_config_state = f"""\
 #
 #    ███████╗░█████╗░░██████╗████████╗░█████╗░███╗░░██╗██╗███╗░░░███╗███████╗  ░█████╗░░█████╗░███╗░░██╗███████╗██╗░██████╗░
@@ -238,6 +257,22 @@ class Config(object):
 #    ╚═╝░░░░░╚═╝░░╚═╝╚═════╝░░░░╚═╝░░░╚═╝░░╚═╝╚═╝░░╚══╝╚═╝╚═╝░░░░░╚═╝╚══════╝  ░╚════╝░░╚════╝░╚═╝░░╚══╝╚═╝░░░░░╚═╝░╚═════╝░
 #
 [general]
+# Can you rice it?
+# for the preview pane
+preview_separator_color = {self.preview_separator_color}
+
+preview_header_color = {self.preview_header_color}
+
+# for the header 
+# be sure to indent
+header_ascii_art = {new_line.join([tab+line for line in self.header_ascii_art.split(new_line)])}
+
+header_color = {self.header_color}
+
+# to be passed to fzf
+# be sure to indent
+fzf_opts = {new_line.join([tab+line for line in self.fzf_opts.split(new_line)])}
+
 # whether to show the icons in the tui [True/False]
 # more like emojis
 # by the way if you have any recommendations
@@ -286,8 +321,8 @@ downloads_dir = {self.downloads_dir}
 
 # whether to show a preview window when using fzf or rofi [True/False]
 # the preview requires you have a commandline image viewer as documented in the README
-# this is only when usinf fzf
-# if you dont care about image previews it doesnt matter
+# this is only when using fzf or rofi
+# if you dont care about image and text previews it doesnt matter
 # though its awesome
 # try it and you will see
 preview = {self.preview} 
@@ -296,13 +331,16 @@ preview = {self.preview}
 # windows users just swtich to linux 😄
 # cause even if you enable it 
 # it won't look pretty
+# just be satisfied with the text previews
 # so forget it exists 🤣
 image_previews = {self.image_previews}
 
 # the time to seek when using ffmpegthumbnailer [-1 to 100]
 # -1 means random and is the default
-# ffmpegthumbnailer is used to generate previews and you can select at what time in the video to extract an image
+# ffmpegthumbnailer is used to generate previews
+# and you can select at what time in the video to extract an image
 # random makes things quite exciting cause you never no at what time it will extract the image from
+# used by the ```fastanime downloads``` command
 ffmpegthumbnailer_seek_time = {self.ffmpegthumbnailer_seek_time}
 
 # whether to use fzf as the interface for the anilist command and others. [True/False]
@@ -387,9 +425,12 @@ continue_from_history = {self.continue_from_history}
 
 # which history to use [local/remote]
 # local history means it will just use the watch history stored locally in your device 
-# the file that stores it is called watch_history.json and is stored next to your config file
-# remote means it ignores the last episode stored locally and instead uses the one in your anilist anime list
-# this config option is useful if you want to overwrite your local history or import history covered from another device or platform
+# the file that stores it is called watch_history.json
+# and is stored next to your config file
+# remote means it ignores the last episode stored locally
+# and instead uses the one in your anilist anime list
+# this config option is useful if you want to overwrite your local history
+# or import history covered from another device or platform
 # since remote history will take precendence over whats available locally
 preferred_history = {self.preferred_history}
 
@@ -417,16 +458,13 @@ auto_next = {self.auto_next}
 # this is because the providers sometime use non-standard names
 # that are there own preference rather than the official names
 # But 99% of the time will be accurate
-# if this happens just turn of auto_select in the menus or from the commandline and manually select the correct anime title
-# and then please open an issue 
-# highlighting the normalized title 
-# and the title given by the provider for the anime you wished to watch  
-# or even better edit this file <https://github.com/Benex254/FastAnime/blob/master/fastanime/Utility/data.py>
-# and open a pull request 
-# prefrably, so you can give me a small break
-# of doing everything 😄
-# and its always nice to see people contributing
-# to projects they love and use
+# if this happens just turn off auto_select in the menus or from the commandline 
+# and manually select the correct anime title
+# edit this file <https://github.com/Benex254/FastAnime/blob/master/fastanime/Utility/data.py>
+# and to the dictionary of the provider
+# the provider title (key) and their corresponding anilist names (value)
+# and then please open a pr 
+# issues on the same will be ignored and then closed 😆
 auto_select = {self.auto_select}
 
 # whether to skip the opening and ending theme songs [True/False]
@@ -446,7 +484,7 @@ episode_complete_at = {self.episode_complete_at}
 # whether to use python-mpv [True/False]
 # to enable superior control over the player 
 # adding more options to it
-# Enable this one and you will be wonder 
+# Enabling this option and you will ask yourself
 # why you did not discover fastanime sooner 🙃
 # Since you basically don't have to close the player window 
 # to go to the next or previous episode, switch servers, 
@@ -459,13 +497,13 @@ episode_complete_at = {self.episode_complete_at}
 # personally it took me quite sometime to figure it out
 # this is because of how windows handles shared libraries
 # so just ask when you find yourself stuck
-# or just switch to arch linux
+# or just switch to nixos 😄
 use_python_mpv = {self.use_python_mpv}
 
 
 # whether to use popen to get the timestamps for continue_from_history
-# implemented because popen does not work for some reason in nixos
-# if you are on nixos and you have a solution to this problem please share
+# implemented because popen does not work for some reason in nixos and apparently on mac as well
+# if you are on nixos or mac and you have a solution to this problem please share
 # i will be glad to hear it 😄
 # So for now ignore this option
 # and anyways the new method of getting timestamps is better
@@ -492,17 +530,14 @@ format = {self.format}
 # since you will miss out on some features if you use the others
 player = {self.player}
 
-# NOTE:
-# if you have any trouble setting up your config
-# please don't be afraid to ask in our discord
-# plus if there are any errors, improvements or suggestions please tell us in the discord
-# or help us by contributing
-# we appreciate all the help we can get
-# since we may not always have the time to immediately implement the changes
 #
 # HOPE YOU ENJOY FASTANIME AND BE SURE TO STAR THE PROJECT ON GITHUB
 # https://github.com/Benex254/FastAnime
 #
+# Also join the discord server
+# where the anime tech community lives :)
+# https://discord.gg/C4rhMA4mmK
+#
 """
         return current_config_state
 

fastanime/cli/interfaces/utils.py

@@ -46,8 +46,12 @@ def aniskip(mal_id: int, episode: str):
 
 # NOTE: May change this to a temp dir but there were issues so later
 WORKING_DIR = APP_CACHE_DIR  # tempfile.gettempdir()
-HEADER_COLOR = 215, 0, 95
-SEPARATOR_COLOR = 208, 208, 208
+_HEADER_COLOR = os.environ.get("FASTANIME_PREVIEW_HEADER_COLOR", "215,0,95").split(",")
+HEADER_COLOR = _HEADER_COLOR[0], _HEADER_COLOR[1], _HEADER_COLOR[2]
+_SEPARATOR_COLOR = os.environ.get(
+    "FASTANIME_PREVIEW_SEPARATOR_COLOR", "208,208,208"
+).split(",")
+SEPARATOR_COLOR = _SEPARATOR_COLOR[0], _SEPARATOR_COLOR[1], _SEPARATOR_COLOR[2]
 SINGLE_QUOTE = "'"
 IMAGES_CACHE_DIR = os.path.join(WORKING_DIR, "images")
 if not os.path.exists(IMAGES_CACHE_DIR):
@@ -65,7 +69,7 @@ def save_image_from_url(url: str, file_name: str):
         file_name: filename to use
     """
     image = requests.get(url)
-    with open(os.path.join(IMAGES_CACHE_DIR,f"{file_name}.png"), "wb") as f:
+    with open(os.path.join(IMAGES_CACHE_DIR, f"{file_name}.png"), "wb") as f:
         f.write(image.content)
 
 
@@ -76,7 +80,14 @@ def save_info_from_str(info: str, file_name: str):
         info: the information anilist has on the anime
         file_name: the filename to use
     """
-    with open(os.path.join(ANIME_INFO_CACHE_DIR,file_name,), "w",encoding="utf-8") as f:
+    with open(
+        os.path.join(
+            ANIME_INFO_CACHE_DIR,
+            file_name,
+        ),
+        "w",
+        encoding="utf-8",
+    ) as f:
         f.write(info)
 
 
@@ -92,7 +103,6 @@ def write_search_results(
         titles: sanitized anime titles
         workers:number of threads to use defaults to as many as possible
     """
-    # NOTE: Will probably make this a configuraable option
     # use concurency to download and write as fast as possible
     with concurrent.futures.ThreadPoolExecutor(max_workers=workers) as executor:
         future_to_task = {}
@@ -274,7 +284,7 @@ def get_fzf_episode_preview(
         anilist_results: the anilist results from an anilist action
     """
 
-    HEADER_COLOR = 215, 0, 95
+    # HEADER_COLOR = 215, 0, 95
     import re
 
     def _worker():
@@ -282,18 +292,16 @@ def get_fzf_episode_preview(
         with concurrent.futures.ThreadPoolExecutor(max_workers=workers) as executor:
             # load the jobs
             future_to_url = {}
+
             for episode in episodes:
                 episode_title = ""
                 image_url = ""
                 for episode_detail in anilist_result["streamingEpisodes"]:
-                    if re.match(f"Episode {episode} ", episode_detail["title"]):
+                    if re.match(f".*Episode {episode} .*", episode_detail["title"]):
                         episode_title = episode_detail["title"]
                         image_url = episode_detail["thumbnail"]
 
                 if episode_title and image_url:
-                    # actual link to download image from
-                    if not image_url:
-                        continue
                     future_to_url[
                         executor.submit(save_image_from_url, image_url, episode)
                     ] = image_url
@@ -304,13 +312,25 @@ def get_fzf_episode_preview(
                         echo -n -e "{get_true_fg("─",*SEPARATOR_COLOR,bold=False)}"
                         ((ll++))
                     done
-                    echo "{get_true_fg('Anime Title:',*HEADER_COLOR)} {(anilist_result['title']['romaji'] or anilist_result['title']['english']).replace('"',SINGLE_QUOTE)}"
-                    echo "{get_true_fg('Episode Title:',*HEADER_COLOR)} {str(episode_title).replace('"',SINGLE_QUOTE)}"
+                    echo "{get_true_fg('Anime Title(eng):',*HEADER_COLOR)} {('' or anilist_result['title']['english']).replace('"',SINGLE_QUOTE)}"
+                    echo "{get_true_fg('Anime Title(jp):',*HEADER_COLOR)} {(anilist_result['title']['romaji'] or '').replace('"',SINGLE_QUOTE)}"
+
+                    ll=2
+                    while [ $ll -le $FZF_PREVIEW_COLUMNS ];do 
+                        echo -n -e "{get_true_fg("─",*SEPARATOR_COLOR,bold=False)}"
+                        ((ll++))
+                    done
+                    echo "{str(episode_title).replace('"',SINGLE_QUOTE)}"
+                    ll=2
+                    while [ $ll -le $FZF_PREVIEW_COLUMNS ];do 
+                        echo -n -e "{get_true_fg("─",*SEPARATOR_COLOR,bold=False)}"
+                        ((ll++))
+                    done
                     """
                     )
                     future_to_url[
-                        executor.submit(save_info_from_str, template, episode)
-                    ] = episode_title
+                        executor.submit(save_info_from_str, template, str(episode))
+                    ] = str(episode)
 
             # execute the jobs
             for future in concurrent.futures.as_completed(future_to_url):
@@ -360,14 +380,15 @@ def get_fzf_episode_preview(
         )
     else:
         preview = """
+            title={}
             %s
             show_image_previews="%s"
             if [ $show_image_previews = "true" ];then 
-                if [ -s %s/{} ]; then fzf-preview %s/{}
+                if [ -s %s/${title}.png ]; then fzf-preview %s/${title}.png
                 else echo Loading...
                 fi
             fi
-            if [ -s %s/{} ]; then source %s/{}
+            if [ -f %s/${title} ]; then source %s/${title}
             else echo Loading...
             fi
         """ % (

fastanime/cli/utils/print_img.py

@@ -24,4 +24,10 @@ def print_img(url: str):
             print("Error fetching image")
             return
         img_bytes = res.content
+        """
+        Change made in call to chafa. Chafa dev dropped abilty
+        to pull from urls. Keeping old line here just in case.
+
         subprocess.run([EXECUTABLE, url, "--size=15x15"], input=img_bytes)
+        """
+        subprocess.run([EXECUTABLE, "--size=15x15"], input=img_bytes)

fastanime/cli/utils/utils.py

@@ -108,7 +108,7 @@ def format_bytes_to_human(num_of_bytes: float, suffix: str = "B"):
     return f"{num_of_bytes:.1f}Yi{suffix}"
 
 
-def get_true_fg(string: str, r: int, g: int, b: int, bold: bool = True) -> str:
+def get_true_fg(string: str, r, g, b, bold: bool = True) -> str:
     """Custom helper function that enables colored text in the terminal
 
     Args:

fastanime/libs/fzf/__init__.py

@@ -41,8 +41,8 @@ class FZF:
         stdout: [TODO:attribute]
     """
 
-    if not os.getenv("FZF_DEFAULT_OPTS"):
-        os.environ["FZF_DEFAULT_OPTS"] = FZF_DEFAULT_OPTS
+    # if not os.getenv("FZF_DEFAULT_OPTS"):
+    #     os.environ["FZF_DEFAULT_OPTS"] = FZF_DEFAULT_OPTS
     FZF_EXECUTABLE = shutil.which("fzf")
     default_options = [
         "--cycle",
@@ -157,10 +157,18 @@ class FZF:
         Returns:
             [TODO:return]
         """
+        _HEADER_COLOR = os.environ.get("FASTANIME_HEADER_COLOR", "215,0,95").split(",")
+        header = os.environ.get("FASTANIME_HEADER_ASCII_ART", HEADER)
+        header = "\n".join(
+            [
+                f"\033[38;2;{_HEADER_COLOR[0]};{_HEADER_COLOR[1]};{_HEADER_COLOR[2]};m{line}\033[0m"
+                for line in header.split("\n")
+            ]
+        )
         _commands = [
             *self.default_options,
             "--header",
-            HEADER,
+            header,
             "--header-first",
             "--prompt",
             f"{prompt.title()}: ",
@@ -182,6 +190,7 @@ class FZF:
                 print(info)
                 input("Enter to try again")
                 return self.run(fzf_input, prompt, header, preview, expect, validator)
+        # os.environ["FZF_DEFAULT_OPTS"] = ""
         return result
 
 

flake.nix

@@ -14,7 +14,7 @@
       pythonPackages = python.pkgs;
       fastanimeEnv = pythonPackages.buildPythonApplication {
         pname = "fastanime";
-        version = "2.8.0";
+        version = "2.8.2";
 
         src = ./.;
 

make_release

@@ -5,7 +5,12 @@ VERSION=$1
 [ "$VERSION" = "current" ] && fastanime --version && exit 0
 sed -i "s/^version.*/version = \"$VERSION\"/" "$CLI_DIR/pyproject.toml" &&
   sed -i "s/__version__.*/__version__ = \"v$VERSION\"/" "$CLI_DIR/fastanime/__init__.py" &&
-  git stage "$CLI_DIR/pyproject.toml" "$CLI_DIR/fastanime/__init__.py" &&
+  sed -i "s/version = .*/version = \"$VERSION\";/" "$CLI_DIR/flake.nix" &&
+  git stage "$CLI_DIR/pyproject.toml" "$CLI_DIR/fastanime/__init__.py" "$CLI_DIR/flake.nix" &&
   git commit -m "chore: bump version (v$VERSION)" &&
+  nix flake lock &&
+  uv lock &&
+  git stage "$CLI_DIR/flake.lock" "$CLI_DIR/uv.lock" &&
+  git commit -m "chore: update lock files" &&
   git push &&
   gh release create "v$VERSION"

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fastanime"
-version = "2.8.0"
+version = "2.8.2"
 description = "A browser anime site experience from the terminal"
 license = "UNLICENSE"
 readme = "README.md"

tests/test_all_commands.py

@@ -1,5 +1,6 @@
 import pytest
 from click.testing import CliRunner
+from unittest.mock import patch
 
 from fastanime.cli import run_cli
 
@@ -147,3 +148,10 @@ def test_anilist_upcoming_help(runner: CliRunner):
 def test_anilist_watching_help(runner: CliRunner):
     result = runner.invoke(run_cli, ["anilist", "watching", "--help"])
     assert result.exit_code == 0
+
+
+def test_check_for_updates_not_called_on_completions(runner):
+    with patch('fastanime.cli.app_updater.check_for_updates') as mock_check_for_updates:
+        result = runner.invoke(run_cli, ["completions"])
+        assert result.exit_code == 0
+        mock_check_for_updates.assert_not_called()

uv.lock

@@ -170,7 +170,7 @@ wheels = [
 
 [[package]]
 name = "fastanime"
-version = "2.7.9"
+version = "2.8.2"
 source = { editable = "." }
 dependencies = [
     { name = "click" },