gitea-mirror/FastAnime
1
0
Fork 0
mirror of https://github.com/Benexl/FastAnime.git synced 2026-02-04 11:07:48 -08:00
Code Issues Packages Projects Releases Wiki Activity

feat(cli_download+search): implement quality selection and improve general interface

Browse Source
This commit is contained in:
Benex254
2024-08-11 11:27:54 +03:00
parent 4e19c2c108
commit 35caa93a56
2 changed files with 67 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
fastanime/cli/commands/download.py
View File

@@ -37,7 +37,7 @@ def download(config: "Config", anime_title, episode_range, highest_priority):
from ...libs.fzf import fzf
from ...Utility.downloader.downloader import downloader
from ..utils.tools import exit_app
from ..utils.utils import fuzzy_inquirer
from ..utils.utils import filter_by_quality, fuzzy_inquirer
anime_provider = AnimeProvider(config.provider)
@@ -104,36 +104,37 @@ def download(config: "Config", anime_title, episode_range, highest_priority):
if not streams:
print("No streams skipping")
continue
with Progress() as progress:
if highest_priority:
progress.add_task("Fetching highest priority stream", total=None)
streams = list(streams)
links = [
(link.get("priority", 0), link["link"])
for server in streams
for link in server["links"]
]
link = max(links, key=lambda x: x[0])[1]
episode_title = streams[0]["episode_title"]
elif config.server == "top":
progress.add_task("Fetching Top Server", total=None)
# ---- fetch servers ----
if config.server == "top":
with Progress() as progress:
progress.add_task("Fetching top server...", total=None)
server = next(streams)
link = server["links"][config.quality]["link"]
episode_title = server["episode_title"]
stream_link = filter_by_quality(config.quality, server["links"])
if not stream_link:
print("Quality not found")
input("Enter to continue")
continue
link = stream_link["link"]
episode_title = server["episode_title"]
else:
with Progress() as progress:
progress.add_task("Fetching servers", total=None)
# prompt for server selection
servers = {server["server"]: server for server in streams}
servers_names = list(servers.keys())
if config.use_fzf:
server = fzf.run(servers_names, "Select an link: ")
else:
# TODO: Make this better but no rush whats the point of manual selection
progress.add_task("Fetching links", total=None)
streams = list(streams)
links = [
link["link"] for server in streams for link in server["links"]
]
episode_title = streams[0]["episode_title"]
if config.use_fzf:
link = fzf.run(links, "Select link", "Links")
else:
link = fuzzy_inquirer("Select link", links)
server = fuzzy_inquirer("Select link", servers_names)
stream_link = filter_by_quality(
config.quality, servers[server]["links"]
)
if not stream_link:
print("Quality not found")
continue
link = stream_link["link"]
episode_title = servers[server]["episode_title"]
print(f"[purple]Now Downloading:[/] {search_result} Episode {episode}")
downloader._download_file(

52
fastanime/cli/commands/search.py
View File

@@ -26,7 +26,7 @@ def search(config: Config, anime_title: str, episode_range: str):
from ...libs.rofi import Rofi
from ..utils.mpv import run_mpv
from ..utils.tools import exit_app
from ..utils.utils import fuzzy_inquirer
from ..utils.utils import filter_by_quality, fuzzy_inquirer
anime_provider = AnimeProvider(config.provider)
@@ -102,6 +102,7 @@ def search(config: Config, anime_title: str, episode_range: str):
)
except StopIteration:
print("[green]Completed binge sequence[/]:smile:")
input("Enter to continue...")
if not episode or episode not in episodes:
if config.use_fzf:
@@ -121,25 +122,48 @@ def search(config: Config, anime_title: str, episode_range: str):
print("Failed to get streams")
return
# ---- fetch servers ----
with Progress() as progress:
try:
# ---- fetch servers ----
if config.server == "top":
progress.add_task("Fetching top server...", total=None)
server = next(streams)
link = server["links"][config.quality]["link"]
with Progress() as progress:
progress.add_task("Fetching top server...", total=None)
server = next(streams)
stream_link = filter_by_quality(config.quality, server["links"])
if not stream_link:
print("Quality not found")
input("Enter to continue")
stream_anime()
return
link = stream_link["link"]
episode_title = server["episode_title"]
else:
progress.add_task("Fetching servers", total=None)
links = [link["link"] for server in streams for link in server["links"]]
with Progress() as progress:
progress.add_task("Fetching servers", total=None)
# prompt for server selection
servers = {server["server"]: server for server in streams}
servers_names = list(servers.keys())
if config.use_fzf:
link = fzf.run(links, "Select an link: ", header=search_result)
server = fzf.run(servers_names, "Select an link: ")
elif config.use_rofi:
link = Rofi.run(links, "Select an link")
server = Rofi.run(servers_names, "Select an link")
else:
link = fuzzy_inquirer("Select link", links)
server = fuzzy_inquirer("Select link", servers_names)
stream_link = filter_by_quality(
config.quality, servers[server]["links"]
)
if not stream_link:
print("Quality not found")
input("Enter to continue")
stream_anime()
return
link = stream_link["link"]
episode_title = servers[server]["episode_title"]
print(f"[purple]Now Playing:[/] {search_result} Episode {episode}")
print(f"[purple]Now Playing:[/] {search_result} Episode {episode}")
run_mpv(link, search_result)
run_mpv(link, episode_title)
except Exception as e:
print(e)
input("Enter to continue")
stream_anime()
stream_anime()