diff --git a/fastanime/Model/anime_screen.py b/fastanime/Model/anime_screen.py index aa1c029..b008dc5 100644 --- a/fastanime/Model/anime_screen.py +++ b/fastanime/Model/anime_screen.py @@ -1,13 +1,15 @@ -from ..libs.anilist import AniList -from .base_model import BaseScreenModel -from ..libs.anime_provider.allanime_api import anime_provider -from kivy.cache import Cache from fuzzywuzzy import fuzz +from kivy.cache import Cache + +from ..libs.anilist import AniList +from ..libs.anime_provider.allanime.api import anime_provider +from .base_model import BaseScreenModel +from ..Utility.data import anime_maps def anime_title_percentage_match( possible_user_requested_anime_title: str, title: tuple -) -> int: +) -> float: """Returns the percentage match between the possible title and user title Args: @@ -17,6 +19,8 @@ def anime_title_percentage_match( Returns: int: the percentage match """ + if normalized_anime_title := anime_maps.get(possible_user_requested_anime_title): + possible_user_requested_anime_title = normalized_anime_title print(locals()) # compares both the romaji and english names and gets highest Score percentage_ratio = max( diff --git a/fastanime/Utility/data.py b/fastanime/Utility/data.py index 1017bb6..ef4e3ac 100644 --- a/fastanime/Utility/data.py +++ b/fastanime/Utility/data.py @@ -2,6 +2,9 @@ Just contains some useful data used across the codebase """ +anime_maps = {"1P": "one piece"} + + themes_available = [ "Aliceblue", "Antiquewhite", diff --git a/fastanime/View/AnimeScreen/anime_screen.py b/fastanime/View/AnimeScreen/anime_screen.py index 4adb6be..35931e8 100644 --- a/fastanime/View/AnimeScreen/anime_screen.py +++ b/fastanime/View/AnimeScreen/anime_screen.py @@ -48,13 +48,13 @@ class AnimeScreenView(BaseScreenView): def next_episode(self): next_episode = self.current_episode + 1 if next_episode <= self.total_episodes: - self.current_episode = next_episode + # self.current_episode = next_episode self.update_current_episode(str(next_episode)) def previous_episode(self): previous_episode = self.current_episode - 1 if previous_episode > 0: - self.current_episode = previous_episode + # self.current_episode = previous_episode self.update_current_episode(str(previous_episode)) def on_current_anime_data(self, instance, value): @@ -66,6 +66,7 @@ class AnimeScreenView(BaseScreenView): self.update_episodes(data["availableEpisodesDetail"]["sub"][::-1]) def update_current_episode(self, episode): + self.current_episode = int(episode) self.controller.fetch_streams(self.current_title, episode) self.update_current_video_stream("dropbox") self.video_player.state = "play" diff --git a/fastanime/__main__.py b/fastanime/__main__.py index 97ad8dd..c92401c 100644 --- a/fastanime/__main__.py +++ b/fastanime/__main__.py @@ -89,7 +89,6 @@ class FastAnime(MDApp): "theme_color": "Cyan", "theme_style": "Dark", "downloads_dir": downloads_dir, - "is_startup_anime_enable": False, }, ) diff --git a/fastanime/configs/general_settings_panel.json b/fastanime/configs/general_settings_panel.json index e775149..fffc159 100644 --- a/fastanime/configs/general_settings_panel.json +++ b/fastanime/configs/general_settings_panel.json @@ -16,7 +16,7 @@ "desc": "Sets the app to dark or light theme", "section": "Preferences", "key": "theme_style", - "options":["Light","Dark"] + "options": ["Light", "Dark"] }, { "type": "path", @@ -24,12 +24,5 @@ "desc": "location to download your videos", "section": "Preferences", "key": "downloads_dir" - }, - { - "type": "bool", - "title": "Show Startup anime", - "desc": "whether to show the startup anime, switch it off for faster app startup times", - "section": "Preferences", - "key": "is_startup_anime_enable" } ] diff --git a/fastanime/libs/mpv/player.py b/fastanime/libs/mpv/player.py index cfd2d30..2b20056 100644 --- a/fastanime/libs/mpv/player.py +++ b/fastanime/libs/mpv/player.py @@ -16,7 +16,7 @@ class MPVPlayer: def run_mpv(self, url): self.mpv_process = Popen( ["mpv", "--input-ipc-server=/tmp/mpvsocket", "--osc", url], - stdin=DEVNULL, + stdin=PIPE, stdout=DEVNULL, stderr=DEVNULL, preexec_fn=os.setsid, diff --git a/mpv-shot0001.jpg b/mpv-shot0001.jpg new file mode 100644 index 0000000..3c8d839 Binary files /dev/null and b/mpv-shot0001.jpg differ