winipedia-utils 0.1.52__tar.gz → 0.1.54__tar.gz

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: winipedia-utils
-Version: 0.1.52
+Version: 0.1.54
 Summary: A package with many utility functions
 License: MIT
 Author: Winipedia

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/pyproject.toml

@@ -1,7 +1,7 @@
 # Project section
 [project]
 name = "winipedia-utils"
-version = "0.1.52"
+version = "0.1.54"
 description = "A package with many utility functions"
 readme = "README.md"
 requires-python = ">=3.12,<3.14"

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/django/command.py

@@ -12,12 +12,12 @@ from typing import Any, final
 
 from django.core.management import BaseCommand
 
-from winipedia_utils.oop.mixins.mixin import ABCImplementationLoggingMixin
+from winipedia_utils.oop.mixins.mixin import ABCLoggingMixin
 
 logger = logging.getLogger(__name__)
 
 
-class ABCBaseCommand(ABCImplementationLoggingMixin, BaseCommand):
+class ABCBaseCommand(ABCLoggingMixin, BaseCommand):
     """Abstract base class for Django management commands with logging and validation.
 
     This class serves as a foundation for creating Django management commands that

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/modules/package.py

@@ -368,14 +368,23 @@ def get_main_package() -> ModuleType:
 
     Even when this package is installed as a module.
     """
+    from winipedia_utils.modules.module import to_module_name
+
     main = sys.modules.get("__main__")
     if main is None:
         msg = "No __main__ module found"
         raise ValueError(msg)
 
-    package_name = main.__package__
-    if package_name is None:
-        msg = "No __package__ found in __main__"
-        raise ValueError(msg)
+    package_name = getattr(main, "__package__", None)
+    if package_name:
+        package_name = package_name.split(".")[0]
+        return import_module(package_name)
+
+    file_name = getattr(main, "__file__", None)
+    if file_name:
+        package_name = to_module_name(file_name)
+        package_name = package_name.split(".")[0]
+        return import_module(package_name)
 
-    return import_module(package_name)
+    msg = "Not able to determine the main package"
+    raise ValueError(msg)

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/oop/mixins/meta.py

@@ -21,7 +21,7 @@ from winipedia_utils.text.string import value_to_truncated_string
 logger = get_logger(__name__)
 
 
-class LoggingMeta(ABCMeta):
+class ABCLoggingMeta(ABCMeta):
     """Metaclass that automatically adds logging to class methods.
 
     Wraps non-magic methods with a logging decorator that tracks method calls,
@@ -30,11 +30,11 @@ class LoggingMeta(ABCMeta):
     """
 
     def __new__(
-        mcs: type["LoggingMeta"],
+        mcs: type["ABCLoggingMeta"],
         name: str,
         bases: tuple[type, ...],
         dct: dict[str, Any],
-    ) -> "LoggingMeta":
+    ) -> "ABCLoggingMeta":
         """Create a new class with logging-wrapped methods.
 
         Args:
@@ -169,7 +169,7 @@ class LoggingMeta(ABCMeta):
         return wrapper
 
 
-class ImplementationMeta(ABCMeta):
+class StrictABCMeta(ABCMeta):
     """Metaclass that enforces implementation.
 
     Ensures that concrete subclasses properly implement all required attributes
@@ -179,7 +179,7 @@ class ImplementationMeta(ABCMeta):
     """
 
     def __init__(
-        cls: "ImplementationMeta",
+        cls: "StrictABCMeta",
         name: str,
         bases: tuple[type, ...],
         namespace: dict[str, Any],
@@ -319,7 +319,7 @@ class ImplementationMeta(ABCMeta):
         return list(attrs)
 
 
-class ABCImplementationLoggingMeta(ImplementationMeta, LoggingMeta):
+class StrictABCLoggingMeta(StrictABCMeta, ABCLoggingMeta):
     """Combined metaclass that merges implementation, logging, and ABC functionality.
 
     This metaclass combines the features of:

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/oop/mixins/mixin.py

@@ -11,12 +11,12 @@ enforcement and built-in logging capabilities.
 """
 
 from winipedia_utils.logging.logger import get_logger
-from winipedia_utils.oop.mixins.meta import ABCImplementationLoggingMeta
+from winipedia_utils.oop.mixins.meta import ABCLoggingMeta, StrictABCLoggingMeta
 
 logger = get_logger(__name__)
 
 
-class ABCImplementationLoggingMixin(metaclass=ABCImplementationLoggingMeta):
+class StrictABCLoggingMixin(metaclass=StrictABCLoggingMeta):
     """mixin class that provides implementation, logging, and ABC functionality.
 
     This mixin can be used as a base class for other mixins that need:
@@ -26,3 +26,12 @@ class ABCImplementationLoggingMixin(metaclass=ABCImplementationLoggingMeta):
 
     Subclasses must set __abstract__ = False when they provide concrete implementations.
     """
+
+
+class ABCLoggingMixin(metaclass=ABCLoggingMeta):
+    """Mixin class that provides automatic method logging with performance tracking.
+
+    This mixin can be used as a base class for other mixins that need:
+    - Automatic method logging (from LoggingMeta)
+
+    """

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/pyside/ui/base/base.py

@@ -5,7 +5,7 @@ This module contains the base UI class for the VideoVault application.
 
 from abc import abstractmethod
 from types import ModuleType
-from typing import TYPE_CHECKING, Any, Self, cast, final
+from typing import TYPE_CHECKING, Any, Self, cast
 
 from PySide6.QtCore import QObject
 from PySide6.QtGui import QIcon
@@ -15,7 +15,7 @@ from winipedia_utils.modules.class_ import (
     get_all_nonabstract_subclasses,
 )
 from winipedia_utils.modules.package import get_main_package, walk_package
-from winipedia_utils.oop.mixins.meta import ABCImplementationLoggingMeta
+from winipedia_utils.oop.mixins.meta import ABCLoggingMeta
 from winipedia_utils.resources.svgs.svg import get_svg_path
 from winipedia_utils.text.string import split_on_uppercase
 
@@ -25,17 +25,16 @@ if TYPE_CHECKING:
     from winipedia_utils.pyside.ui.windows.base.base import Base as BaseWindow
 
 
-class QABCImplementationLoggingMeta(
-    ABCImplementationLoggingMeta,
+class QABCLoggingMeta(
+    ABCLoggingMeta,
     type(QObject),  # type: ignore[misc]
 ):
     """Metaclass for the QABCImplementationLoggingMixin."""
 
 
-class Base(metaclass=QABCImplementationLoggingMeta):
+class Base(metaclass=QABCLoggingMeta):
     """Base UI class for a Qt application."""
 
-    @final
     def __init__(self, *args: Any, **kwargs: Any) -> None:
         """Initialize the base UI."""
         super().__init__(*args, **kwargs)
@@ -76,7 +75,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         """
 
     @classmethod
-    @final
     def get_display_name(cls) -> str:
         """Get the display name of the UI.
 
@@ -86,7 +84,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         return " ".join(split_on_uppercase(cls.__name__))
 
     @classmethod
-    @final
     def get_subclasses(cls, package: ModuleType | None = None) -> list[type[Self]]:
         """Get all subclasses of the UI.
 
@@ -106,7 +103,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         children = get_all_nonabstract_subclasses(cls)
         return sorted(children, key=lambda cls: cls.__name__)
 
-    @final
     def set_current_page(self, page_cls: type["BasePage"]) -> None:
         """Set the current page in the stack.
 
@@ -115,7 +111,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         """
         self.get_stack().setCurrentWidget(self.get_page(page_cls))
 
-    @final
     def get_stack(self) -> QStackedWidget:
         """Get the stack widget of the window.
 
@@ -126,7 +121,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
 
         return window.stack
 
-    @final
     def get_stack_pages(self) -> list["BasePage"]:
         """Get all pages from the stack.
 
@@ -139,7 +133,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         # get all the pages
         return [cast("BasePage", stack.widget(i)) for i in range(stack.count())]
 
-    @final
     def get_page[T: "BasePage"](self, page_cls: type[T]) -> T:
         """Get a specific page from the stack.
 
@@ -155,7 +148,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         return cast("T", page)
 
     @classmethod
-    @final
     def get_svg_icon(cls, svg_name: str, package: ModuleType | None = None) -> QIcon:
         """Get a QIcon for an SVG file.
 
@@ -170,7 +162,6 @@ class Base(metaclass=QABCImplementationLoggingMeta):
         return QIcon(str(get_svg_path(svg_name, package=package)))
 
     @classmethod
-    @final
     def get_page_static[T: "BasePage"](cls, page_cls: type[T]) -> T:
         """Get a page statically from the main window.
 

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/pyside/ui/pages/base/base.py

@@ -4,7 +4,7 @@ This module contains the base page class for the VideoVault application.
 """
 
 from functools import partial
-from typing import final
+from typing import TYPE_CHECKING, Any
 
 from PySide6.QtCore import Qt
 from PySide6.QtWidgets import (
@@ -19,11 +19,19 @@ from PySide6.QtWidgets import (
 
 from winipedia_utils.pyside.ui.base.base import Base as BaseUI
 
+if TYPE_CHECKING:
+    from winipedia_utils.pyside.ui.windows.base.base import Base as BaseWindow
+
 
 class Base(BaseUI, QWidget):
     """Base page class for the VideoVault application."""
 
-    @final
+    def __init__(self, base_window: "BaseWindow", *args: Any, **kwargs: Any) -> None:
+        """Initialize the base page."""
+        super().__init__(*args, **kwargs)
+        self.base_window = base_window
+        self.base_window.add_page(self)
+
     def base_setup(self) -> None:
         """Setup the base Qt object of the UI.
 
@@ -39,7 +47,6 @@ class Base(BaseUI, QWidget):
 
         self.add_menu_dropdown_button()
 
-    @final
     def add_menu_dropdown_button(self) -> None:
         """Add a dropdown menu that leads to each page.
 
@@ -58,11 +65,10 @@ class Base(BaseUI, QWidget):
         self.menu_dropdown = QMenu(self.menu_button)
         self.menu_button.setMenu(self.menu_dropdown)
 
-        for page_cls in Base.get_subclasses():
+        for page_cls in self.base_window.get_all_page_classes():
             action = self.menu_dropdown.addAction(page_cls.get_display_name())
             action.triggered.connect(partial(self.set_current_page, page_cls))
 
-    @final
     def add_to_page_button(
         self, to_page_cls: type["Base"], layout: QLayout
     ) -> QPushButton:

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/pyside/ui/pages/browser.py

@@ -3,8 +3,6 @@
 This module contains the add downloads page class for the VideoVault application.
 """
 
-from typing import final
-
 from winipedia_utils.pyside.ui.pages.base.base import Base as BasePage
 from winipedia_utils.pyside.ui.widgets.browser import Browser as BrowserWidget
 
@@ -12,7 +10,6 @@ from winipedia_utils.pyside.ui.widgets.browser import Browser as BrowserWidget
 class Browser(BasePage):
     """Add downloads page for the VideoVault application."""
 
-    @final
     def setup(self) -> None:
         """Setup the UI.
 
@@ -20,7 +17,6 @@ class Browser(BasePage):
         """
         self.add_brwoser()
 
-    @final
     def add_brwoser(self) -> None:
         """Add a browser to surf the web.
 

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/pyside/ui/pages/player.py

@@ -6,7 +6,7 @@ This module contains the player page class for the VideoVault application.
 from abc import abstractmethod
 from collections.abc import Callable
 from pathlib import Path
-from typing import Any, final
+from typing import Any
 
 from cryptography.hazmat.primitives.ciphers.aead import AESGCM
 
@@ -26,7 +26,6 @@ class Player(BasePage):
             position: The position to start playback from in milliseconds.
         """
 
-    @final
     def setup(self) -> None:
         """Setup the UI.
 
@@ -34,7 +33,6 @@ class Player(BasePage):
         """
         self.media_player = MediaPlayer(self.v_layout)
 
-    @final
     def play_file_from_func(
         self,
         play_func: Callable[..., Any],
@@ -58,7 +56,6 @@ class Player(BasePage):
         # Stop current playback and clean up resources
         play_func(path=path, position=position, **kwargs)
 
-    @final
     def play_file(self, path: Path, position: int = 0) -> None:
         """Play a regular video file.
 
@@ -70,7 +67,6 @@ class Player(BasePage):
             self.media_player.play_file, path=path, position=position
         )
 
-    @final
     def play_encrypted_file(
         self, path: Path, aes_gcm: AESGCM, position: int = 0
     ) -> None:

{winipedia_utils-0.1.52 → winipedia_utils-0.1.54}/winipedia_utils/pyside/ui/windows/base/base.py

@@ -5,7 +5,6 @@ This module contains the base window class for the VideoVault application.
 
 from abc import abstractmethod
 from collections.abc import Generator
-from typing import final
 
 from PySide6.QtWidgets import QMainWindow, QStackedWidget
 
@@ -16,12 +15,16 @@ from winipedia_utils.pyside.ui.pages.base.base import Base as BasePage
 class Base(BaseUI, QMainWindow):
     """Base window class for the VideoVault application."""
 
+    @classmethod
+    @abstractmethod
+    def get_all_page_classes(cls) -> list[type[BasePage]]:
+        """Get all page classes."""
+
     @classmethod
     @abstractmethod
     def get_start_page_cls(cls) -> type[BasePage]:
         """Get the start page class."""
 
-    @final
     def base_setup(self) -> None:
         """Get the Qt object of the UI."""
         self.setWindowTitle(self.get_display_name())
@@ -29,24 +32,19 @@ class Base(BaseUI, QMainWindow):
         self.stack = QStackedWidget()
         self.setCentralWidget(self.stack)
 
-        self.add_pages()
+        self.make_pages()
 
         self.set_start_page()
 
-    @final
-    def add_pages(self) -> None:
+    def add_page(self, page: BasePage) -> None:
         """Add the pages to the window."""
-        self.pages = list(self.make_pages())
-        for page in self.pages:
-            self.stack.addWidget(page)
+        self.stack.addWidget(page)
 
-    @final
     def make_pages(self) -> Generator[BasePage, None, None]:
         """Get the pages to add to the window."""
-        for page_cls in BasePage.get_subclasses():
-            yield page_cls()
+        for page_cls in self.get_all_page_classes():
+            yield page_cls(base_window=self)
 
-    @final
     def set_start_page(self) -> None:
         """Set the start page."""
         self.set_current_page(self.get_start_page_cls())