diff --git a/fastanime/.vscode/settings.json b/fastanime/.vscode/settings.json deleted file mode 100644 index 3a65021..0000000 --- a/fastanime/.vscode/settings.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "python.analysis.typeCheckingMode": "basic", - "python.analysis.autoImportCompletions": true -} diff --git a/fastanime/Model/my_list_screen.py b/fastanime/Model/my_list_screen.py index 2e4af8f..b2fcfce 100644 --- a/fastanime/Model/my_list_screen.py +++ b/fastanime/Model/my_list_screen.py @@ -1,5 +1,5 @@ -from anixstream.libs.anilist import AniList -from anixstream.Utility import media_card_loader, show_notification +from ..libs.anilist import AniList +from ..Utility import media_card_loader, show_notification from .base_model import BaseScreenModel diff --git a/fastanime/Utility/anilist_data_helper.py b/fastanime/Utility/anilist_data_helper.py index b878439..d8266ad 100644 --- a/fastanime/Utility/anilist_data_helper.py +++ b/fastanime/Utility/anilist_data_helper.py @@ -1,6 +1,6 @@ from datetime import datetime -from anixstream.libs.anilist.anilist_data_schema import ( +from ..libs.anilist.anilist_data_schema import ( AnilistDateObject, AnilistMediaNextAiringEpisode, ) diff --git a/fastanime/Utility/user_data_helper.py b/fastanime/Utility/user_data_helper.py index 40b15d8..a9fd049 100644 --- a/fastanime/Utility/user_data_helper.py +++ b/fastanime/Utility/user_data_helper.py @@ -14,13 +14,16 @@ data_folder = os.path.join(app_dir, "data") today = date.today() now = datetime.now() -if user_data_path := os.path.exists(os.path.join(data_folder, "user_data.json")): - user_data = JsonStore(user_data_path) +if os.path.exists(os.path.join(data_folder, "user_data.json")): + user_data = JsonStore(os.path.join(data_folder, "user_data.json")) else: - os.makedirs(data_folder, exist_ok=True) + # os.makedir(data_folder, exist_ok=True) + print("op2") user_data_path = os.path.join(data_folder, "user_data.json") user_data = JsonStore(user_data_path) + print("op2") + # Get the user data def get_user_anime_list() -> list: diff --git a/fastanime/View/DownloadsScreen/components/task_card.kv b/fastanime/View/DownloadsScreen/components/task_card.kv index 0b411fe..2cbd4fc 100644 --- a/fastanime/View/DownloadsScreen/components/task_card.kv +++ b/fastanime/View/DownloadsScreen/components/task_card.kv @@ -1,4 +1,4 @@ -#:import color_text anixstream.Utility.kivy_markup_helper.color_text +#:import color_text fastanime.Utility.kivy_markup_helper.color_text : adaptive_height:True diff --git a/fastanime/View/base_screen.py b/fastanime/View/base_screen.py index 477909e..117cc4c 100644 --- a/fastanime/View/base_screen.py +++ b/fastanime/View/base_screen.py @@ -64,7 +64,7 @@ class BaseScreenView(MDScreen, Observer): super().__init__(**kw) # Often you need to get access to the application object from the view # class. You can do this using this attribute. - from anixstream.__main__ import AniXStreamApp + from ..__main__ import AniXStreamApp self.app: AniXStreamApp = MDApp.get_running_app() # type: ignore # Adding a view class as observer. diff --git a/fastanime/View/components/media_card/media_card.py b/fastanime/View/components/media_card/media_card.py index 58c4724..752d266 100644 --- a/fastanime/View/components/media_card/media_card.py +++ b/fastanime/View/components/media_card/media_card.py @@ -20,7 +20,7 @@ class MediaCard(ButtonBehavior, HoverBehavior, MDBoxLayout): title = StringProperty() is_play = ObjectProperty() trailer_url = StringProperty() - _trailer_url: str | None = StringProperty() + _trailer_url: str | None = StringProperty(allow_none=True) episodes = StringProperty() favourites = StringProperty() popularity = StringProperty() @@ -97,7 +97,7 @@ class MediaCard(ButtonBehavior, HoverBehavior, MDBoxLayout): ): self.trailer_url = trailer_url else: - self._trailer_url = None + self._trailer_url = "" # ---------------respond to user actions and call appropriate model------------------------- def on_is_in_my_list(self, instance, in_user_anime_list):