Merge pull request #163 from Oreo-Kuuki/patch-1

So like this, right?

.envrc

@@ -1,5 +1,6 @@
 VIU_APP_NAME="viu-dev"
-export VIU_APP_NAME
+PATH="./.venv/bin/:$PATH"
+export PATH VIU_APP_NAME
 if command -v nix >/dev/null;then
 	use flake
 fi

.github/workflows/stale.yml

@@ -0,0 +1,57 @@
+name: Mark Stale Issues and Pull Requests
+
+on:
+  schedule:
+    # Runs every day at 6:30 UTC
+    - cron: "30 6 * * *"
+  # Allows you to run this workflow manually from the Actions tab for testing
+  workflow_dispatch:
+
+jobs:
+  stale:
+    runs-on: ubuntu-latest
+    permissions:
+      issues: write
+      pull-requests: write
+
+    steps:
+      - uses: actions/stale@v5
+        with:
+          repo-token: ${{ secrets.GITHUB_TOKEN }}
+
+          stale-issue-message: |
+            Greetings @{{author}},
+
+            This bug report is like an ancient scroll detailing a legendary beast. Our small guild of developers is often on many quests at once, so our response times can be slower than a tortoise in a time-stop spell. We deeply appreciate your patience!
+
+            **Seeking Immediate Help or Discussion?**
+            Our **[Discord Tavern](https://discord.gg/HBEmAwvbHV)** is the best place to get a quick response from the community for general questions or setup help!
+
+            **Want to Be the Hero?**
+            You could try to tame this beast yourself! With modern grimoires (like AI coding assistants) and our **[Contribution Guide](https://github.com/viu-media/Viu/blob/master/CONTRIBUTIONS.md)**, you might just be the hero we're waiting for. We would be thrilled to review your solution!
+
+            ---
+            To keep our quest board tidy, we need to know if this creature is still roaming the lands in the latest version of `viu`. If we don't get an update within **7 days**, we'll assume it has vanished and archive the scroll.
+
+            Thanks for being our trusted scout!
+
+          stale-pr-message: |
+            Hello @{{author}}, it looks like this powerful contribution has been left in the middle of its training arc! 💪
+
+            Our review dojo is managed by just a few senseis who are sometimes away on long missions, so thank you for your patience as we work through the queue.
+
+            We were excited to see this new technique being developed. Are you still planning to complete its training, or have you embarked on a different quest? If you need a sparring partner (reviewer) or some guidance from a senpai, just let us know!
+
+            To keep our dojo tidy, we'll be archiving unfinished techniques. If we don't hear back within **7 days**, we'll assume it's time to close this PR for now. You can always resume your training and reopen it when you're ready.
+
+            Thank you for your incredible effort!
+
+          # --- Labels and Timing ---
+          stale-issue-label: "stale"
+          stale-pr-label: "stale"
+
+          # How many days of inactivity before an issue/PR is marked as stale.
+          days-before-stale: 14
+
+          # How many days of inactivity to wait before closing a stale issue/PR.
+          days-before-close: 7

.github/workflows/test.yml

@@ -13,7 +13,7 @@ jobs:
 
     strategy:
       matrix:
-        python-version: ["3.11", "3.12"] 
+        python-version: ["3.11", "3.12"]
 
     steps:
       - uses: actions/checkout@v4
@@ -41,5 +41,7 @@ jobs:
       - name: Run type checking
         run: uv run pyright
 
-      - name: Run tests
-        run: uv run pytest tests
+      # TODO: write tests
+
+      # - name: Run tests
+      #   run: uv run pytest tests

.pre-commit-config.yaml

@@ -1,33 +1,10 @@
-default_language_version:
-  python: python3.12
-
 repos:
-  - repo: https://github.com/pycqa/isort
-    rev: 5.12.0
+  - repo: https://github.com/astral-sh/ruff-pre-commit
+    # Ruff version.
+    rev: v0.14.2
     hooks:
-      - id: isort
-        name: isort (python)
-        args: ["--profile", "black"]
-
-  - repo: https://github.com/PyCQA/autoflake
-    rev: v2.2.1
-    hooks:
-      - id: autoflake
-        args:
-          [
-            "--in-place",
-            "--remove-unused-variables",
-            "--remove-all-unused-imports",
-          ]
-  # - repo: https://github.com/astral-sh/ruff-pre-commit
-  #   rev: v0.4.10
-  #   hooks:
-  #     - id: ruff
-  #       args: [--fix]
-
-  - repo: https://github.com/psf/black-pre-commit-mirror
-    rev: 24.4.2
-    hooks:
-      - id: black
-        name: black
-        #language_version: python3.10
+      # Run the linter.
+      - id: ruff-check
+        args: [--fix]
+      # Run the formatter.
+      - id: ruff-format

dev/generate_anilist_media_tags.py

@@ -1,9 +1,10 @@
 #!/usr/bin/env -S uv run --script
-import httpx
 import json
-from viu_media.core.utils.graphql import execute_graphql
-from pathlib import Path
 from collections import defaultdict
+from pathlib import Path
+
+import httpx
+from viu_media.core.utils.graphql import execute_graphql
 
 DEV_DIR = Path(__file__).resolve().parent
 media_tags_type_py = (
@@ -26,6 +27,7 @@ template = """\
 
 from enum import Enum
 
+
 class MediaTag(Enum):\
 """
 

viu_media/assets/normalizer.json

@@ -4,7 +4,8 @@
     "Magia Record: Mahou Shoujo Madoka☆Magica Gaiden (TV)": "Mahou Shoujo Madoka☆Magica",
     "Dungeon ni Deai o Motomeru no wa Machigatte Iru Darouka": "Dungeon ni Deai wo Motomeru no wa Machigatteiru Darou ka",
     "Hazurewaku no \"Joutai Ijou Skill\" de Saikyou ni Natta Ore ga Subete wo Juurin suru made": "Hazure Waku no [Joutai Ijou Skill] de Saikyou ni Natta Ore ga Subete wo Juurin Suru made",
-    "Re:Zero kara Hajimeru Isekai Seikatsu Season 3": "Re:Zero kara Hajimeru Isekai Seikatsu 3rd Season"
+    "Re:Zero kara Hajimeru Isekai Seikatsu Season 3": "Re:Zero kara Hajimeru Isekai Seikatsu 3rd Season",
+    "Hanka×Hanka (2011)": "Hunter × Hunter (2011)"
   },
   "hianime": {
     "My Star": "Oshi no Ko"

viu_media/cli/commands/search.py

@@ -30,7 +30,6 @@ if TYPE_CHECKING:
 @click.option(
     "--anime-title",
     "-t",
-    required=True,
     shell_complete=anime_titles_shell_complete,
     multiple=True,
     help="Specify which anime to download",
@@ -52,6 +51,10 @@ def search(config: AppConfig, **options: "Unpack[Options]"):
     from ...libs.provider.anime.provider import create_provider
     from ...libs.selectors.selector import create_selector
 
+    if not options["anime_title"]:
+        raw = click.prompt("What are you in the mood for? (comma-separated)")
+        options["anime_title"] = [a.strip() for a in raw.split(",") if a.strip()]
+
     feedback = FeedbackService(config)
     provider = create_provider(config.general.provider)
     selector = create_selector(config)
@@ -173,6 +176,22 @@ def stream_anime(
             if not server_name:
                 raise ViuError("Server not selected")
             server = servers[server_name]
+    quality = [
+        ep_stream.link
+        for ep_stream in server.links
+        if ep_stream.quality == config.stream.quality
+    ]
+    if not quality:
+        feedback.warning("Preferred quality not found, selecting quality...")
+        stream_link = selector.choose(
+            "Select Quality", [link.quality for link in server.links]
+        )
+        if not stream_link:
+            raise ViuError("Quality not selected")
+        stream_link = next(
+            (link.link for link in server.links if link.quality == stream_link), None
+        )
+
     stream_link = server.links[0].link
     if not stream_link:
         raise ViuError(

viu_media/cli/commands/update.py

@@ -1,6 +1,5 @@
 """Update command for Viu CLI."""
 
-import sys
 from typing import TYPE_CHECKING
 
 import click

viu_media/cli/service/download/service.py

@@ -296,8 +296,7 @@ class DownloadService:
                         message=message,
                         app_name="Viu",
                         app_icon=app_icon,
-                        timeout=self.app_config.general.desktop_notification_duration
-                        * 60,
+                        timeout=self.app_config.general.desktop_notification_duration,
                     )
                 except:  # noqa: E722
                     pass
@@ -318,7 +317,7 @@ class DownloadService:
                     message=message,
                     app_name="Viu",
                     app_icon=app_icon,
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
             except:  # noqa: E722
                 pass

viu_media/cli/service/feedback/service.py

@@ -41,7 +41,7 @@ class FeedbackService:
                     message=message,
                     app_name=CLI_NAME,
                     app_icon=str(ICON_PATH),
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 return
             except:  # noqa: E722
@@ -67,7 +67,7 @@ class FeedbackService:
                     message=message,
                     app_name=CLI_NAME,
                     app_icon=str(ICON_PATH),
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 return
             except:  # noqa: E722
@@ -94,7 +94,7 @@ class FeedbackService:
                     message=message,
                     app_name=CLI_NAME,
                     app_icon=str(ICON_PATH),
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 return
             except:  # noqa: E722
@@ -120,7 +120,7 @@ class FeedbackService:
                     message=message,
                     app_name=CLI_NAME,
                     app_icon=str(ICON_PATH),
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 return
             except:  # noqa: E722
@@ -176,7 +176,7 @@ class FeedbackService:
                     message="No current way to display info in rofi, use fzf and the terminal instead",
                     app_name=CLI_NAME,
                     app_icon=str(ICON_PATH),
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 return
             except:  # noqa: E722

viu_media/cli/service/notification/service.py

@@ -101,7 +101,7 @@ class NotificationService:
                     message=message,
                     app_name="Viu",
                     app_icon=app_icon,  # plyer supports file paths or URLs depending on platform
-                    timeout=self.app_config.general.desktop_notification_duration * 60,
+                    timeout=self.app_config.general.desktop_notification_duration,
                 )
                 logger.info(f"Displayed notification: {message}")
                 self._mark_seen(

viu_media/core/config/defaults.py

@@ -6,7 +6,7 @@ GENERAL_PYGMENT_STYLE = "github-dark"
 GENERAL_PREFERRED_SPINNER = "smiley"
 GENERAL_API_CLIENT = "anilist"
 GENERAL_PREFERRED_TRACKER = "local"
-GENERAL_DESKTOP_NOTIFICATION_DURATION = 5
+GENERAL_DESKTOP_NOTIFICATION_DURATION = 5 * 60
 GENERAL_PROVIDER = "allanime"
 
 

viu_media/core/constants.py

@@ -25,7 +25,7 @@ ANILIST_AUTH = (
 )
 
 try:
-    APP_DIR = Path(str(resources.files(CLI_NAME.lower())))
+    APP_DIR = Path(str(resources.files(PROJECT_NAME.lower())))
 
 except ModuleNotFoundError:
     from pathlib import Path

viu_media/libs/media_api/_media_tags.py

@@ -6,6 +6,7 @@
 
 from enum import Enum
 
+
 class MediaTag(Enum):
     #
     # TECHNICAL

viu_media/libs/media_api/utils/debug.py

@@ -30,8 +30,6 @@ def test_media_api(api_client: BaseApiClient):
     """
     from ....core.constants import APP_ASCII_ART
     from ..params import (
-        MediaAiringScheduleParams,
-        MediaCharactersParams,
         MediaRecommendationParams,
         MediaRelationsParams,
         MediaSearchParams,

viu_media/libs/player/syncplay/player.py

@@ -1,65 +0,0 @@
-"""
-Syncplay integration for Viu.
-
-This module provides a procedural function to launch Syncplay with the given media and options.
-"""
-
-import shutil
-import subprocess
-
-from .tools import exit_app
-
-
-def SyncPlayer(url: str, anime_title=None, headers={}, subtitles=[], *args):
-    """
-    Launch Syncplay for synchronized playback with friends.
-
-    Args:
-        url: The media URL to play.
-        anime_title: Optional title to display in the player.
-        headers: Optional HTTP headers to pass to the player.
-        subtitles: Optional list of subtitle dicts with 'url' keys.
-        *args: Additional arguments (unused).
-
-    Returns:
-        Tuple of ("0", "0") for compatibility.
-    """
-    # TODO: handle m3u8 multi quality streams
-    #
-    # check for SyncPlay
-    SYNCPLAY_EXECUTABLE = shutil.which("syncplay")
-    if not SYNCPLAY_EXECUTABLE:
-        print("Syncplay not found")
-        exit_app(1)
-        return "0", "0"
-    # start SyncPlayer
-    mpv_args = []
-    if headers:
-        mpv_headers = "--http-header-fields="
-        for header_name, header_value in headers.items():
-            mpv_headers += f"{header_name}:{header_value},"
-        mpv_args.append(mpv_headers)
-    for subtitle in subtitles:
-        mpv_args.append(f"--sub-file={subtitle['url']}")
-    if not anime_title:
-        subprocess.run(
-            [
-                SYNCPLAY_EXECUTABLE,
-                url,
-            ],
-            check=False,
-        )
-    else:
-        subprocess.run(
-            [
-                SYNCPLAY_EXECUTABLE,
-                url,
-                "--",
-                f"--force-media-title={anime_title}",
-                *mpv_args,
-            ],
-            check=False,
-        )
-
-    # for compatability
-    return "0", "0"

viu_media/libs/provider/anime/allanime/utils.py

@@ -88,4 +88,5 @@ def decode_hex_string(hex_string):
     # Decode each hex pair
     decoded_chars = [hex_to_char.get(pair.lower(), pair) for pair in hex_pairs]
 
-    return "".join(decoded_chars)
+    # TODO: Better type handling
+    return "".join(decoded_chars)  # type: ignore

viu_media/libs/provider/anime/animepahe/mappers.py

@@ -1,5 +1,3 @@
-from typing import Any
-
 from ..types import (
     Anime,
     AnimeEpisodeInfo,
@@ -87,13 +85,16 @@ def map_to_anime_result(
 
 
 def map_to_server(
-    episode: AnimeEpisodeInfo, translation_type: Any, quality: Any, stream_link: Any
+    episode: AnimeEpisodeInfo,
+    translation_type: str,
+    stream_links: list[tuple[str, str]],
 ) -> Server:
     links = [
         EpisodeStream(
-            link=stream_link,
-            quality=quality,
+            link=link[1],
+            quality=link[0] if link[0] in ["360", "480", "720", "1080"] else "1080",  # type:ignore
             translation_type=translation_type_map[translation_type],
         )
+        for link in stream_links
     ]
     return Server(name="kwik", links=links, episode_title=episode.title)

viu_media/libs/provider/anime/animepahe/provider.py

@@ -131,15 +131,17 @@ class AnimePahe(BaseAnimeProvider):
         res_dicts = [extract_attributes(item) for item in resolutionMenuItems]
         quality = None
         translation_type = None
-        stream_link = None
+        stream_links = []
 
         # TODO: better document the scraping process
         for res_dict in res_dicts:
             # the actual attributes are data attributes in the original html 'prefixed with data-'
             embed_url = res_dict["src"]
+            logger.debug(f"Found embed url: {embed_url}")
             data_audio = "dub" if res_dict["audio"] == "eng" else "sub"
 
             if data_audio != params.translation_type:
+                logger.debug(f"Found {data_audio} but wanted {params.translation_type}")
                 continue
 
             if not embed_url:
@@ -155,22 +157,26 @@ class AnimePahe(BaseAnimeProvider):
             )
             embed_response.raise_for_status()
             embed_page = embed_response.text
+            logger.debug("Processing embed page for JS decoding")
 
             decoded_js = process_animepahe_embed_page(embed_page)
             if not decoded_js:
                 logger.error("failed to decode embed page")
                 continue
+            logger.debug(f"Decoded JS: {decoded_js[:100]}...")
             juicy_stream = JUICY_STREAM_REGEX.search(decoded_js)
             if not juicy_stream:
                 logger.error("failed to find juicy stream")
                 continue
+            logger.debug(f"Found juicy stream: {juicy_stream.group(1)}")
             juicy_stream = juicy_stream.group(1)
             quality = res_dict["resolution"]
+            logger.debug(f"Found quality: {quality}")
             translation_type = data_audio
-            stream_link = juicy_stream
+            stream_links.append((quality, juicy_stream))
 
-        if translation_type and quality and stream_link:
-            yield map_to_server(episode, translation_type, quality, stream_link)
+        if translation_type and stream_links:
+            yield map_to_server(episode, translation_type, stream_links)
 
     @lru_cache()
     def _get_episode_info(

viu_media/libs/provider/anime/utils/debug.py

@@ -69,6 +69,9 @@ def test_anime_provider(AnimeProvider: Type[BaseAnimeProvider]):
     for i, stream in enumerate(episode_streams):
         print(f"{i + 1}: {stream.name}")
     stream = episode_streams[int(input("Select your preferred server: ")) - 1]
+    for i, link in enumerate(stream.links):
+        print(f"{i + 1}: {link.quality}")
+    link = stream.links[int(input("Select your preferred quality: ")) - 1]
     if executable := shutil.which("mpv"):
         cmd = executable
     elif executable := shutil.which("xdg-open"):
@@ -84,4 +87,4 @@ def test_anime_provider(AnimeProvider: Type[BaseAnimeProvider]):
         "Episode: ",
         stream.episode_title if stream.episode_title else episode_number,
     )
-    subprocess.run([cmd, stream.links[0].link])
+    subprocess.run([cmd, link.link])

viu_media/libs/provider/scraping/html_parser.py

@@ -1,3 +1,4 @@
+# pyright: reportAttributeAccessIssue=false, reportPossiblyUnboundVariable=false
 """
 HTML parsing utilities with optional lxml support.
 

viu_media/libs/selectors/inquirer/selector.py

@@ -1,4 +1,4 @@
-from InquirerPy.prompts import FuzzyPrompt
+from InquirerPy.prompts import FuzzyPrompt  # pyright: ignore[reportPrivateImportUsage]
 from rich.prompt import Confirm, Prompt
 
 from ..base import BaseSelector

viu_media/viu.py

@@ -8,7 +8,7 @@ if getattr(sys, "frozen", False):
     sys.path.insert(0, application_path)
 
 # Import and run the main application
-from viu import Cli
+from viu_media import Cli
 
 if __name__ == "__main__":
     Cli()