Big UI update, luluvdo support, some other small changes

Author: Commandcracker

README.md

@@ -125,8 +125,9 @@ List of supported video hoster.
 - [x] SpeedFiles
 - [x] Vidmoly
 - [x] Streamtape (Removed from AniWorld & SerienStream)
+- [x] Luluvdo
 - [ ] Filemoon
-- [ ] Luluvdo
+- [ ] LoadX
 
 ## Player
 

pyproject.toml

@@ -7,15 +7,16 @@ maintainers = [{name="Commandcracker"}]
 license = {file = "LICENSE.txt"}
 readme = "README.md"
 dependencies = [
-  "textual==0.67.0", # 3.0.1
+  "textual>=3.0.1",
   "beautifulsoup4>=4.13.3",
   "httpx[http2]>=0.28.1",
   "pypresence>=4.3.0",
   "packaging>=24.2",
   "platformdirs>=4.3.7",
   "toml>=0.10.2",
   "fuzzywuzzy>=0.18.0",
-  "async_lru>=2.0.5"
+  "async_lru>=2.0.5",
+  "rich-argparse>=1.7.0"
   #"yt-dlp>=2025.3.31",
   #"mpv>=1.0.7",
 ]

src/gucken/__init__.py

@@ -1,4 +1,4 @@
 import warnings
 warnings.filterwarnings('ignore', message='Using slow pure-python SequenceMatcher. Install python-Levenshtein to remove this warning')
 
-__version__ = "0.2.8"
+__version__ = "0.3.0"

src/gucken/gucken.py

@@ -1,5 +1,3 @@
-from textual._types import IgnoreReturnCallbackType
-from textual.command import Hits, Provider as TextualProvider, Hit, DiscoveryHit
 import argparse
 import logging
 from asyncio import gather, set_event_loop, new_event_loop
@@ -13,6 +11,7 @@
 from time import sleep, time
 from typing import ClassVar, List, Union
 from async_lru import alru_cache
+from os import getenv
 
 from fuzzywuzzy import fuzz
 from platformdirs import user_config_path, user_log_path
@@ -41,7 +40,7 @@
     TabPane,
 )
 from textual.worker import get_current_worker
-
+from rich_argparse import RichHelpFormatter
 from .aniskip import (
     generate_chapters_file,
     get_timings_from_search
@@ -58,7 +57,7 @@
 from .settings import gucken_settings_manager
 from .update import check
 from .utils import detect_player, is_android, set_default_vlc_interface_cfg, get_vlc_intf_user_path
-
+from . import __version__
 
 def sort_favorite_lang(
         language_list: List[Language], pio_list: List[str]
@@ -204,59 +203,17 @@ def move_item(lst: list, from_index: int, to_index: int) -> list:
 CLIENT_ID = "1238219157464416266"
 
 
-class GuckenCommands(TextualProvider):
-
-    @property
-    def _commands(self) -> tuple[tuple[str, IgnoreReturnCallbackType, str], ...]:
-        return (
-            (
-                "Toggle light/dark mode",  # 🌇 / 🌃
-                self.app.action_toggle_dark,
-                "Toggle the application between light and dark mode",
-            ),
-            (
-                "Quit the application",  # ❌
-                self.app.action_quit,
-                "Quit the application as soon as possible",
-            ),
-        )
-
-    """
-    (
-        "Application folders",  # 📁
-        self.app.action_quit,
-        "Displays a list of all folders used",
-    ),
-    (
-        "Create Shortcut",  # 🔗
-        self.app.action_quit,
-        "The will create shortcuts to gucken",
-    )
-    """
-
-    async def discover(self) -> Hits:
-        for name, runnable, help_text in self._commands:
-            yield DiscoveryHit(name, runnable, help=help_text)
-
-    async def search(self, query: str) -> Hits:
-        matcher = self.matcher(query)
-        for name, runnable, help_text in self._commands:
-            if (match := matcher.match(name)) > 0:
-                yield Hit(match, matcher.highlight(name), runnable, help=help_text)
-
-
 class GuckenApp(App):
-    TITLE = "Gucken TUI"
-    # TODO: color theme https://textual.textualize.io/guide/design/#designing-with-colors
-
+    TITLE = f"Gucken {__version__}"
     CSS_PATH = [join("resources", "gucken.css")]
     custom_css = user_config_path("gucken").joinpath("custom.css")
     if custom_css.exists():
         CSS_PATH.append(custom_css)
     BINDINGS: ClassVar[list[BindingType]] = [
         Binding("q", "quit", "Quit", show=False, priority=False),
     ]
-    COMMANDS = {GuckenCommands}
+
+    # TODO: theme_changed_signal
 
     def __init__(self, debug: bool, search: str):
         super().__init__(watch_css=debug)
@@ -322,7 +279,7 @@ def compose(self) -> ComposeResult:
                     yield ClickableDataTable(id="season_list")
             with TabPane("Settings", id="setting"):  # Settings "⚙"
                 # TODO: dont show unneeded on android
-                with ScrollableContainer():
+                with ScrollableContainer(id="settings_container"):
                     yield SortableTable(id="lang")
                     yield SortableTable(id="host")
                     yield RadioButton(
@@ -373,7 +330,7 @@ def compose(self) -> ComposeResult:
                         )
         # yield Footer()
         with Center(id="footer"):
-            yield Label("Made by Commandcracker with [red]:heart:[/red]")
+            yield Label("Made by Commandcracker with [red]❤[/red]")
 
     @on(Input.Changed)
     async def input_changed(self, event: Input.Changed):
@@ -445,12 +402,12 @@ def select_changed(self, event: Select.Changed) -> None:
 
     # TODO: dont lock - no async
     async def on_mount(self) -> None:
-        self.dark = gucken_settings_manager.settings["settings"]["ui"]["dark"]
+        self.theme = getenv("TEXTUAL_THEME") or gucken_settings_manager.settings["settings"]["ui"]["theme"]
 
-        def update_dark(value: bool):
-            gucken_settings_manager.settings["settings"]["ui"]["dark"] = value
+        def on_theme_change(old_value: str, new_value: str) -> None:
+            gucken_settings_manager.settings["settings"]["ui"]["theme"] = new_value
 
-        self.watch(self, "dark", update_dark)
+        self.watch(self.app, "theme", on_theme_change, init=False)
 
         lang = self.query_one("#lang", DataTable)
         lang.add_columns("Language")
@@ -471,11 +428,10 @@ def set_search():
 
             self.call_later(set_search)
 
-        self.query_one("#info", TabPane).loading = True
+        self.query_one("#info", TabPane).set_loading(True)
 
         table = self.query_one("#season_list", DataTable)
         table.cursor_type = "row"
-        table.add_columns("FT", "S", "F", "Title", "Hoster", "Sprache")
 
         if self.query_one("#update_checker", RadioButton).value is True:
             self.update_check()
@@ -534,7 +490,7 @@ def lookup_anime(self, keyword: str) -> None:
         if keyword is None:
             if not worker.is_cancelled:
                 self.call_from_thread(results_list_view.clear)
-                results_list_view.loading = False
+                self.call_from_thread(results_list_view.set_loading, False)
             return
 
         aniworld_to = self.query_one("#aniworld_to", Checkbox).value
@@ -550,7 +506,7 @@ def lookup_anime(self, keyword: str) -> None:
         if worker.is_cancelled:
             return
         self.call_from_thread(results_list_view.clear)
-        results_list_view.loading = True
+        self.call_from_thread(results_list_view.set_loading, True)
         if worker.is_cancelled:
             return
         results = self.sync_gather(search_providers)
@@ -577,7 +533,7 @@ def fuzzy_sort_key(result):
             if worker.is_cancelled:
                 return
             self.call_from_thread(results_list_view.extend, items)
-        results_list_view.loading = False
+        self.call_from_thread(results_list_view.set_loading, False)
         if len(final_results) > 0:
 
             def select_first_index():
@@ -621,15 +577,15 @@ async def on_key(self, event: events.Key) -> None:
     async def play_selected(self):
         dt = self.query_one("#season_list", DataTable)
         # TODO: show loading
-        dt.loading = True
+        #dt.set_loading(True)
         index = self.app.query_one("#results", ListView).index
         series_search_result = self.current[index]
         self.play(
             series_search_result=series_search_result,
             episodes=self.current_info.episodes,
             index=dt.cursor_row,
         )
-        dt.loading = False
+        #dt.set_loading(False)
 
     @alru_cache(maxsize=32, ttl=600)  # Cache 32 entries. Clear entry after 10 minutes.
     async def get_series(self, series_search_result: SearchResult):
@@ -642,7 +598,7 @@ async def open_info(self) -> None:
         ]
         info_tab = self.query_one("#info", TabPane)
         info_tab.disabled = False
-        info_tab.loading = True
+        info_tab.set_loading(True)
         table = self.query_one("#season_list", DataTable)
         table.focus(scroll_visible=False)
         md = self.query_one("#markdown", Markdown)
@@ -651,7 +607,10 @@ async def open_info(self) -> None:
         self.current_info = series
         await md.update(series.to_markdown())
 
-        table.clear()
+        # make sure to reset colum spacing
+        table.clear(columns=True)
+        table.add_columns("FT", "S", "F", "Title", "Hoster", "Sprache")
+
         c = 0
         for ep in series.episodes:
             hl = []
@@ -671,7 +630,7 @@ async def open_info(self) -> None:
                 " ".join(sort_favorite_hoster_by_key(hl, self.hoster)),
                 " ".join(ll),
             )
-        info_tab.loading = False
+        info_tab.set_loading(False)
 
     @work(exclusive=True, thread=True)
     async def update_check(self):
@@ -931,19 +890,32 @@ async def play_next(should_next):
 
 def main():
     parser = argparse.ArgumentParser(
-        prog='Gucken',
-        description="Gucken is a Terminal User Interface which allows you to browse and watch your favorite anime's with style."
+        prog='gucken',
+        description="Gucken is a Terminal User Interface which allows you to browse and watch your favorite anime's with style.",
+        formatter_class=RichHelpFormatter
     )
     parser.add_argument("search", nargs='?')
-    parser.add_argument("--debug", "--dev", action="store_true")
+    parser.add_argument(
+        "--debug", "--dev",
+        action="store_true",
+        help='enables logging and live tcss reload'
+    )
+    parser.add_argument(
+        '-V', '--version',
+        action='store_true',
+        help='display version information.'
+    )
     args = parser.parse_args()
+    if args.version:
+        exit(f"gucken {__version__}")
     if args.debug:
         logs_path = user_log_path("gucken", ensure_exists=True)
         logging.basicConfig(
             filename=logs_path.joinpath("gucken.log"), encoding="utf-8", level=logging.INFO, force=True
         )
 
     register_atexit(gucken_settings_manager.save)
+    print(f"\033]0;Gucken {__version__}\007", end='', flush=True)
     gucken_app = GuckenApp(debug=args.debug, search=args.search)
     gucken_app.run()
     print(choice(exit_quotes))

src/gucken/hoster/_hosters.py

@@ -1,5 +1,6 @@
 from textual._two_way_dict import TwoWayDict
 
+from .loadx import LoadXHoster
 from .veo import VOEHoster
 from .vidoza import VidozaHoster
 from .speedfiles import SpeedFilesHoster
@@ -17,6 +18,7 @@
         "DS": DoodstreamHoster,
         "VM": VidmolyHoster,
         "FM": FilemoonHoster,
+        "LX": LoadXHoster,
         "LU": LuluvdoHoster,
         "ST": StreamtapeHoster
     }

src/gucken/hoster/common.py

@@ -1,8 +1,7 @@
 from abc import abstractmethod
 from dataclasses import dataclass
 
-from ..networking import AsyncClient
-from httpx import HTTPError
+from httpx import HTTPError, AsyncClient
 
 
 @dataclass
@@ -12,7 +11,7 @@ class DirectLink:
 
     async def check_is_working(self) -> bool:
         try:
-            async with AsyncClient(verify=False, auto_referer=False) as client:
+            async with AsyncClient(verify=False) as client:
                 response = await client.head(
                     self.url, headers=self.headers
                 )

src/gucken/hoster/filemoon.py

@@ -9,4 +9,5 @@
 # TODO: WIP !!!
 class FilemoonHoster(Hoster):
     async def get_direct_link(self) -> DirectLink:
+        # See https://github.com/shashstormer/godstream/blob/master/extractors/filemoon.py
         return DirectLink("WIP")

src/gucken/hoster/loadx.py

@@ -0,0 +1,15 @@
+from re import compile as re_compile
+
+from ..networking import AsyncClient
+
+from .common import DirectLink, Hoster
+
+LOADX_PATTERN = re_compile("")
+
+# TODO: WIP !!!
+class LoadXHoster(Hoster):
+    async def get_direct_link(self) -> DirectLink:
+        # https://github.com/Gujal00/ResolveURL/blob/master/script.module.resolveurl/lib/resolveurl/plugins/loadx.py
+        # https://github.com/bytedream/stream-bypass/blob/c4085f9ac83d9313ebc8e9629067c91dc7fbe064/src/lib/match.ts#L122
+
+        return DirectLink("WIP")

src/gucken/hoster/luluvdo.py

@@ -1,12 +1,22 @@
 from re import compile as re_compile
 
-from ..networking import AsyncClient
+from httpx import AsyncClient
 
 from .common import DirectLink, Hoster
 
-LULUVODO_PATTERN = re_compile("")
+LULUVODO_PATTERN = re_compile(r'file:\s*"([^"]+)"')
 
-# TODO: WIP !!!
 class LuluvdoHoster(Hoster):
+    requires_headers = True
+
     async def get_direct_link(self) -> DirectLink:
-        return DirectLink("WIP")
+        async with AsyncClient(verify=False, follow_redirects=True, headers={"user-agent": "Mozilla/5.0 (Android 15; Mobile; rv:132.0) Gecko/132.0 Firefox/132.0"}) as client:
+            response = await client.get(self.url)
+            luluvdo_id = response.url.path.split('/')[-1]
+            url = f"https://luluvdo.com/dl?op=embed&file_code={luluvdo_id}"
+            response = await client.get(url)
+            match = LULUVODO_PATTERN.search(response.text)
+            return DirectLink(
+                url=match.group(1),
+                headers={"user-agent": client.headers["user-agent"]},
+            )