From 6bcc77ea44972f59a71df1fca728cdf88ffc38ab Mon Sep 17 00:00:00 2001 From: Benex254 Date: Thu, 22 Aug 2024 19:09:00 +0300 Subject: [PATCH] fix: incorrect episode regex --- fastanime/cli/commands/download.py | 2 +- fastanime/cli/commands/search.py | 2 +- fastanime/cli/interfaces/anilist_interfaces.py | 6 +++--- fastanime/cli/interfaces/utils.py | 2 +- fastanime/cli/utils/player.py | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/fastanime/cli/commands/download.py b/fastanime/cli/commands/download.py index 9f76b15..77773b8 100644 --- a/fastanime/cli/commands/download.py +++ b/fastanime/cli/commands/download.py @@ -297,7 +297,7 @@ def download( import re for episode_detail in anilist_anime_info["episodes"]: - if re.match(f"Episode {episode}", episode_detail["title"]): + if re.match(f"Episode {episode} ", episode_detail["title"]): episode_title = episode_detail["title"] break print(f"[purple]Now Downloading:[/] {episode_title}") diff --git a/fastanime/cli/commands/search.py b/fastanime/cli/commands/search.py index 882ae18..fc7acb9 100644 --- a/fastanime/cli/commands/search.py +++ b/fastanime/cli/commands/search.py @@ -231,7 +231,7 @@ def search(config: Config, anime_titles: str, episode_range: str): import re for episode_detail in anilist_anime_info["episodes"]: - if re.match(f"Episode {episode}", episode_detail["title"]): + if re.match(f"Episode {episode} ", episode_detail["title"]): episode_title = episode_detail["title"] break print( diff --git a/fastanime/cli/interfaces/anilist_interfaces.py b/fastanime/cli/interfaces/anilist_interfaces.py index 2f174b0..9362ebf 100644 --- a/fastanime/cli/interfaces/anilist_interfaces.py +++ b/fastanime/cli/interfaces/anilist_interfaces.py @@ -128,7 +128,7 @@ def media_player_controls( "streamingEpisodes" ]: if re.match( - f"Episode {current_episode_number}", episode_detail["title"] + f"Episode {current_episode_number} ", episode_detail["title"] ): episode_title = episode_detail["title"] break @@ -533,7 +533,7 @@ def provider_anime_episode_servers_menu( for episode_detail in fastanime_runtime_state.selected_anime_anilist[ "streamingEpisodes" ]: - if re.match(f"Episode {current_episode_number}", episode_detail["title"]): + if re.match(f"Episode {current_episode_number} ", episode_detail["title"]): episode_title = episode_detail["title"] break @@ -694,7 +694,7 @@ def provider_anime_episodes_menu( e = fastanime_runtime_state.selected_anime_anilist["episodes"] if e: - eps = range(1, e) + eps = range(0, e + 1) else: eps = total_episodes preview = get_fzf_episode_preview( diff --git a/fastanime/cli/interfaces/utils.py b/fastanime/cli/interfaces/utils.py index 5e676b9..d9559d9 100644 --- a/fastanime/cli/interfaces/utils.py +++ b/fastanime/cli/interfaces/utils.py @@ -192,7 +192,7 @@ def get_fzf_episode_preview( 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"] diff --git a/fastanime/cli/utils/player.py b/fastanime/cli/utils/player.py index 9cb1d92..a32bd8d 100644 --- a/fastanime/cli/utils/player.py +++ b/fastanime/cli/utils/player.py @@ -141,7 +141,7 @@ class MpvPlayer(object): "streamingEpisodes" ]: if re.match( - f"Episode {current_episode_number}", episode_detail["title"] + f"Episode {current_episode_number} ", episode_detail["title"] ): self.current_media_title = episode_detail["title"] break