chore: bump version (v2.6.4)

fa

@@ -1,4 +1,3 @@
 #!/usr/bin/env sh
-# exec "${PYTHON:-python3}" -Werror -Xdev -m "$(dirname "$(realpath "$0")")/fastanime" "$@"
-cd "$(dirname "$(realpath "$0")")" || exit 1
-exec python -m fastanime "$@"
+CLI_DIR="$(dirname "$(realpath "$0")")"
+exec python -m "$CLI_DIR/fastanime" "$@"

fastanime/Utility/anilist_data_helper.py

@@ -1,13 +1,16 @@
+import re
 from datetime import datetime
 from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from ..libs.anilist.types import AnilistDateObject, AnilistMediaNextAiringEpisode
 
+COMMA_REGEX = re.compile(r"([0-9]{3})(?=\d)")
+
 
 # TODO: Add formating options for the final date
 def format_anilist_date_object(anilist_date_object: "AnilistDateObject"):
-    if anilist_date_object:
+    if anilist_date_object and anilist_date_object["day"]:
         return f"{anilist_date_object['day']}/{anilist_date_object['month']}/{anilist_date_object['year']}"
     else:
         return "Unknown"
@@ -27,6 +30,12 @@ def format_list_data_with_comma(data: list | None):
         return "None"
 
 
+def format_number_with_commas(number: int | None):
+    if not number:
+        return "0"
+    return COMMA_REGEX.sub(lambda match: f"{match.group(1)},", str(number)[::-1])[::-1]
+
+
 def extract_next_airing_episode(airing_episode: "AnilistMediaNextAiringEpisode"):
     if airing_episode:
         return f"{airing_episode['episode']} on {format_anilist_timestamp(airing_episode['airingAt'])}"

fastanime/Utility/downloader/downloader.py

@@ -16,6 +16,7 @@ logger = logging.getLogger(__name__)
 
 class YtDLPDownloader:
     downloads_queue = Queue()
+    _thread = None
 
     def _worker(self):
         while True:
@@ -26,11 +27,6 @@ class YtDLPDownloader:
                 logger.error(f"Something went wrong {e}")
             self.downloads_queue.task_done()
 
-    def __init__(self):
-        self._thread = Thread(target=self._worker)
-        self._thread.daemon = True
-        self._thread.start()
-
     def _download_file(
         self,
         url: str,
@@ -38,6 +34,7 @@ class YtDLPDownloader:
         episode_title: str,
         download_dir: str,
         silent: bool,
+        progress_hooks=[],
         vid_format: str = "best",
         force_unknown_ext=False,
         verbose=False,
@@ -86,6 +83,7 @@ class YtDLPDownloader:
             "verbose": verbose,
             "format": vid_format,
             "compat_opts": ("allow-unsafe-ext",) if force_unknown_ext else tuple(),
+            "progress_hooks": progress_hooks,
         }
         urls = [url]
         if sub:
@@ -190,6 +188,11 @@ class YtDLPDownloader:
             silent ([TODO:parameter]): [TODO:description]
             url: [TODO:description]
         """
+        if not self._thread:
+            self._thread = Thread(target=self._worker)
+            self._thread.daemon = True
+            self._thread.start()
+
         self.downloads_queue.put(
             (
                 self._download_file,

fastanime/__init__.py

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

fastanime/cli/commands/download.py

@@ -361,9 +361,9 @@ def download(
                     episode_title,
                     download_dir,
                     silent,
-                    config.format,
-                    force_unknown_ext,
-                    verbose,
+                    vid_format=config.format,
+                    force_unknown_ext=force_unknown_ext,
+                    verbose=verbose,
                     headers=provider_headers,
                     sub=subtitles[0]["url"] if subtitles else "",
                     merge=merge,

fastanime/cli/commands/downloads.py

@@ -169,6 +169,7 @@ def downloads(
             from threading import Thread
 
             worker = Thread(target=_worker)
+            worker.daemon = True
             worker.start()
         else:
             _worker()
@@ -241,6 +242,7 @@ def downloads(
             from threading import Thread
 
             worker = Thread(target=_worker)
+            worker.daemon = True
             worker.start()
         else:
             _worker()

fastanime/cli/config.py

@@ -40,6 +40,7 @@ class Config(object):
         "force_window": "immediate",
         "format": "best[height<=1080]/bestvideo[height<=1080]+bestaudio/best",
         "icons": "false",
+        "image_previews": "true",
         "normalize_titles": "true",
         "notification_duration": "2",
         "player": "mpv",
@@ -88,6 +89,7 @@ class Config(object):
         self.force_window = self.get_force_window()
         self.format = self.get_format()
         self.icons = self.get_icons()
+        self.image_previews = self.get_image_previews()
         self.normalize_titles = self.get_normalize_titles()
         self.notification_duration = self.get_notification_duration()
         self.player = self.get_player()
@@ -197,6 +199,9 @@ class Config(object):
     def get_icons(self):
         return self.configparser.getboolean("general", "icons")
 
+    def get_image_previews(self):
+        return self.configparser.getboolean("general", "image_previews")
+
     def get_preview(self):
         return self.configparser.getboolean("general", "preview")
 
@@ -337,6 +342,9 @@ downloads_dir = {self.downloads_dir}
 # try it and you will see
 preview = {self.preview} 
 
+# whether to show images in the preview [true/false]
+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

fastanime/cli/interfaces/anilist_interfaces.py

@@ -1420,7 +1420,7 @@ def anilist_results_menu(
             choices = []
             for title in anime_data.keys():
                 icon_path = os.path.join(IMAGES_CACHE_DIR, title)
-                choices.append(f"{title}\0icon\x1f{icon_path}")
+                choices.append(f"{title}\0icon\x1f{icon_path}.png")
             choices.append("Back")
             selected_anime_title = Rofi.run_with_icons(choices, "Select Anime")
         else:

fastanime/cli/interfaces/utils.py

@@ -9,7 +9,7 @@ from threading import Thread
 import requests
 from yt_dlp.utils import clean_html, sanitize_filename
 
-from ...constants import APP_CACHE_DIR,S_PLATFORM
+from ...constants import APP_CACHE_DIR, S_PLATFORM
 from ...libs.anilist.types import AnilistBaseMediaDataSchema
 from ...Utility import anilist_data_helper
 from ..utils.scripts import fzf_preview
@@ -46,7 +46,9 @@ 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
+SINGLE_QUOTE = "'"
 IMAGES_CACHE_DIR = os.path.join(WORKING_DIR, "images")
 if not os.path.exists(IMAGES_CACHE_DIR):
     os.mkdir(IMAGES_CACHE_DIR)
@@ -63,7 +65,7 @@ def save_image_from_url(url: str, file_name: str):
         file_name: filename to use
     """
     image = requests.get(url)
-    with open(f"{IMAGES_CACHE_DIR}/{file_name}", "wb") as f:
+    with open(f"{IMAGES_CACHE_DIR}/{file_name}.png", "wb") as f:
         f.write(image.content)
 
 
@@ -91,18 +93,16 @@ def write_search_results(
         workers:number of threads to use defaults to as many as possible
     """
     # NOTE: Will probably make this a configuraable option
-    HEADER_COLOR = 215, 0, 95
-    SEPARATOR_COLOR = 208, 208, 208
-    SEPARATOR_WIDTH = 30
     # use concurency to download and write as fast as possible
     with concurrent.futures.ThreadPoolExecutor(max_workers=workers) as executor:
         future_to_task = {}
         for anime, title in zip(anilist_results, titles):
             # actual image url
-            image_url = anime["coverImage"]["large"]
-            future_to_task[executor.submit(save_image_from_url, image_url, title)] = (
-                image_url
-            )
+            if os.environ.get("FASTANIME_IMAGE_PREVIEWS", "true").lower() == "true":
+                image_url = anime["coverImage"]["large"]
+                future_to_task[
+                    executor.submit(save_image_from_url, image_url, title)
+                ] = image_url
 
             mediaListName = "Not in any of your lists"
             progress = "UNKNOWN"
@@ -111,28 +111,57 @@ def write_search_results(
                 progress = anime_list["progress"]
             # handle the text data
             template = f"""
-            {get_true_fg("-"*SEPARATOR_WIDTH,*SEPARATOR_COLOR,bold=False)}
-            {get_true_fg('Title(jp):',*HEADER_COLOR)} {anime['title']['romaji']}
-            {get_true_fg('Title(eng):',*HEADER_COLOR)} {anime['title']['english']}
-            {get_true_fg('Popularity:',*HEADER_COLOR)} {anime['popularity']}
-            {get_true_fg('Favourites:',*HEADER_COLOR)} {anime['favourites']}
-            {get_true_fg('Status:',*HEADER_COLOR)} {anime['status']}
-            {get_true_fg('Episodes:',*HEADER_COLOR)} {anime['episodes']}
-            {get_true_fg('Genres:',*HEADER_COLOR)} {anilist_data_helper.format_list_data_with_comma(anime['genres'])}
-            {get_true_fg('Next Episode:',*HEADER_COLOR)} {anilist_data_helper.extract_next_airing_episode(anime['nextAiringEpisode'])}
-            {get_true_fg('Start Date:',*HEADER_COLOR)} {anilist_data_helper.format_anilist_date_object(anime['startDate'])}
-            {get_true_fg('End Date:',*HEADER_COLOR)} {anilist_data_helper.format_anilist_date_object(anime['endDate'])}
-            {get_true_fg("-"*SEPARATOR_WIDTH,*SEPARATOR_COLOR,bold=False)}
-            {get_true_fg('Media List:',*HEADER_COLOR)} {mediaListName}
-            {get_true_fg('Progress:',*HEADER_COLOR)} {progress}
-            {get_true_fg("-"*SEPARATOR_WIDTH,*SEPARATOR_COLOR,bold=False)}
-            {get_true_fg('Description:',*HEADER_COLOR)}
+            ll=2
+            while [ $ll -le $FZF_PREVIEW_COLUMNS ];do 
+                echo -n -e "{get_true_fg("─",*SEPARATOR_COLOR,bold=False)}"
+                ((ll++))
+            done
+            echo
+            echo "{get_true_fg('Title(jp):',*HEADER_COLOR)} {(anime['title']['romaji'] or "").replace('"',SINGLE_QUOTE)}"
+            echo "{get_true_fg('Title(eng):',*HEADER_COLOR)} {(anime['title']['english'] 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
+            echo "{get_true_fg('Popularity:',*HEADER_COLOR)} {anilist_data_helper.format_number_with_commas(anime['popularity'])}"
+            echo "{get_true_fg('Favourites:',*HEADER_COLOR)} {anilist_data_helper.format_number_with_commas(anime['favourites'])}"
+            echo "{get_true_fg('Status:',*HEADER_COLOR)} {str(anime['status']).replace('"',SINGLE_QUOTE)}"
+            echo "{get_true_fg('Next Episode:',*HEADER_COLOR)} {anilist_data_helper.extract_next_airing_episode(anime['nextAiringEpisode']).replace('"',SINGLE_QUOTE)}"
+            echo "{get_true_fg('Genres:',*HEADER_COLOR)} {anilist_data_helper.format_list_data_with_comma(anime['genres']).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
+            echo "{get_true_fg('Episodes:',*HEADER_COLOR)} {(anime['episodes']) or 'UNKNOWN'}"
+            echo "{get_true_fg('Start Date:',*HEADER_COLOR)} {anilist_data_helper.format_anilist_date_object(anime['startDate']).replace('"',SINGLE_QUOTE)}"
+            echo "{get_true_fg('End Date:',*HEADER_COLOR)} {anilist_data_helper.format_anilist_date_object(anime['endDate']).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
+            echo "{get_true_fg('Media List:',*HEADER_COLOR)} {mediaListName.replace('"',SINGLE_QUOTE)}"
+            echo "{get_true_fg('Progress:',*HEADER_COLOR)} {progress}"
+            ll=2
+            while [ $ll -le $FZF_PREVIEW_COLUMNS ];do 
+                echo -n -e "{get_true_fg("─",*SEPARATOR_COLOR,bold=False)}"
+                ((ll++))
+            done
+            echo
+            # echo "{get_true_fg('Description:',*HEADER_COLOR).replace('"',SINGLE_QUOTE)}"
             """
             template = textwrap.dedent(template)
             template = f"""
             {template}
+            echo "
             {textwrap.fill(clean_html(
-                str(anime['description'])), width=45)}
+                (anime['description']) or "").replace('"',SINGLE_QUOTE), width=45)}
+            "
             """
             future_to_task[executor.submit(save_info_from_str, template, title)] = title
 
@@ -212,6 +241,7 @@ def get_fzf_manga_preview(manga_results, workers=None, wait=False):
     background_worker = Thread(
         target=_worker,
     )
+    background_worker.daemon = True
     # ensure images and info exists
     background_worker.start()
 
@@ -269,8 +299,13 @@ def get_fzf_episode_preview(
                     ] = image_url
                     template = textwrap.dedent(
                         f"""
-                    {get_true_fg('Anime Title:',*HEADER_COLOR)} {anilist_result['title']['romaji'] or anilist_result['title']['english']}
-                    {get_true_fg('Episode Title:',*HEADER_COLOR)} {episode_title}
+                    ll=2
+                    while [ $ll -le $FZF_PREVIEW_COLUMNS ];do 
+                        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)}"
                     """
                     )
                     future_to_url[
@@ -288,6 +323,7 @@ def get_fzf_episode_preview(
     background_worker = Thread(
         target=_worker,
     )
+    background_worker.daemon = True
     # ensure images and info exists
     background_worker.start()
 
@@ -297,22 +333,26 @@ def get_fzf_episode_preview(
         preview = """
             %s
             title={}
+            show_image_previews="%s"
             dim=${FZF_PREVIEW_COLUMNS}x${FZF_PREVIEW_LINES}
-            if [ -s "%s\\\\\\$title" ]; then 
-                if command -v "chafa">/dev/null;then
-                    chafa -s $dim "%s\\\\\\$title"
-                else
-                    echo please install chafa to enjoy image previews
+            if [ $show_image_previews = "true" ];then 
+                if [ -s "%s\\\\\\${title}.png" ]; then 
+                    if command -v "chafa">/dev/null;then
+                        chafa -s $dim "%s\\\\\\${title}.png"
+                    else
+                        echo please install chafa to enjoy image previews
+                    fi
+                    echo 
+                else 
+                    echo Loading...
                 fi
-                echo 
-            else 
-                echo Loading...
             fi
-            if [ -s "%s\\\\\\$title" ]; then cat "%s\\\\\\$title"
+            if [ -s "%s\\\\\\$title" ]; then source "%s\\\\\\$title"
                 else echo Loading...
             fi
         """ % (
             fzf_preview,
+            os.environ.get("FASTANIME_IMAGE_PREVIEWS", "true").lower(),
             IMAGES_CACHE_DIR.replace("\\", "\\\\\\"),
             IMAGES_CACHE_DIR.replace("\\", "\\\\\\"),
             ANIME_INFO_CACHE_DIR.replace("\\", "\\\\\\"),
@@ -321,14 +361,18 @@ def get_fzf_episode_preview(
     else:
         preview = """
             %s
-            if [ -s %s/{} ]; then fzf-preview %s/{}
-            else echo Loading...
+            show_image_previews="%s"
+            if [ $show_image_previews = "true" ];then 
+                if [ -s %s/{} ]; then fzf-preview %s/{}
+                else echo Loading...
+                fi
             fi
-            if [ -s %s/{} ]; then cat %s/{}
+            if [ -s %s/{} ]; then source %s/{}
             else echo Loading...
             fi
         """ % (
             fzf_preview,
+            os.environ.get("FASTANIME_IMAGE_PREVIEWS", "true").lower(),
             IMAGES_CACHE_DIR,
             IMAGES_CACHE_DIR,
             ANIME_INFO_CACHE_DIR,
@@ -357,6 +401,7 @@ def get_fzf_anime_preview(
     background_worker = Thread(
         target=write_search_results, args=(anilist_results, titles)
     )
+    background_worker.daemon = True
     background_worker.start()
 
     # the preview script is in bash so making sure fzf doesnt use any other shell lang to process the preview script
@@ -365,22 +410,26 @@ def get_fzf_anime_preview(
         preview = """
             %s
             title={}
+            show_image_previews="%s"
             dim=${FZF_PREVIEW_COLUMNS}x${FZF_PREVIEW_LINES}
-            if [ -s "%s\\\\\\$title" ]; then 
-                if command -v "chafa">/dev/null;then
-                    chafa  -s $dim "%s\\\\\\$title"
-                else
-                    echo please install chafa to enjoy image previews
+            if [ $show_image_previews = "true" ];then
+                if [ -s "%s\\\\\\${title}.png" ]; then 
+                    if command -v "chafa">/dev/null;then
+                        chafa  -s $dim "%s\\\\\\${title}.png"
+                    else
+                        echo please install chafa to enjoy image previews
+                    fi
+                    echo 
+                else 
+                    echo Loading...
                 fi
-                echo 
-            else 
-                echo Loading...
             fi
-            if [ -s "%s\\\\\\$title" ]; then cat "%s\\\\\\$title"
+            if [ -s "%s\\\\\\$title" ]; then source "%s\\\\\\$title"
                 else echo Loading...
             fi
         """ % (
             fzf_preview,
+            os.environ.get("FASTANIME_IMAGE_PREVIEWS", "true").lower(),
             IMAGES_CACHE_DIR.replace("\\", "\\\\\\"),
             IMAGES_CACHE_DIR.replace("\\", "\\\\\\"),
             ANIME_INFO_CACHE_DIR.replace("\\", "\\\\\\"),
@@ -389,14 +438,19 @@ def get_fzf_anime_preview(
     else:
         preview = """
             %s
-            if [ -s %s/{} ]; then fzf-preview %s/{}
-            else echo Loading...
+            title={}
+            show_image_previews="%s"
+            if [ $show_image_previews = "true" ];then
+                if [ -s "%s/${title}.png" ]; then fzf-preview "%s/${title}.png"
+                else echo Loading...
+                fi
             fi
-            if [ -s %s/{} ]; then cat %s/{}
+            if [ -s "%s/$title" ]; then source "%s/$title"
             else echo Loading...
             fi
         """ % (
             fzf_preview,
+            os.environ.get("FASTANIME_IMAGE_PREVIEWS", "true").lower(),
             IMAGES_CACHE_DIR,
             IMAGES_CACHE_DIR,
             ANIME_INFO_CACHE_DIR,

fastanime/libs/fzf/__init__.py

@@ -49,7 +49,7 @@ class FZF:
         "--info=hidden",
         "--layout=reverse",
         "--height=100%",
-        "--bind=right:accept",
+        "--bind=right:accept,ctrl-/:toggle-preview,ctrl-space:toggle-wrap+toggle-preview-wrap",
         "--no-margin",
         "+m",
         "-i",

make_release

@@ -0,0 +1,11 @@
+#! /usr/bin/env sh
+CLI_DIR="$(dirname "$(realpath "$0")")"
+VERSION=$1
+[ -z "$VERSION" ] && echo no version provided && exit 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" &&
+  git commit -m "chore: bump version (v$VERSION)" &&
+  git push &&
+  gh release create "v$VERSION"

pyproject.toml

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