winipedia-utils 0.1.37__tar.gz → 0.1.39__tar.gz

{winipedia_utils-0.1.37 → winipedia_utils-0.1.39}/PKG-INFO

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

{winipedia_utils-0.1.37 → winipedia_utils-0.1.39}/pyproject.toml

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

{winipedia_utils-0.1.37 → winipedia_utils-0.1.39}/winipedia_utils/pyside/ui/widgets/media_player.py

@@ -267,12 +267,8 @@ class MediaPlayer(QMediaPlayer):
             source_url=QUrl.fromLocalFile(path),
         )
 
-    def set_source_device(
-        self, io_device: PyQIODevice, source_url: QUrl | None = None
-    ) -> None:
+    def set_source_device(self, io_device: PyQIODevice, source_url: QUrl) -> None:
         """Play the video."""
-        if source_url is None:
-            source_url = QUrl()
         self.source_url = source_url
         self.io_device = io_device
         self.setSourceDevice(self.io_device, self.source_url)

winipedia_utils-0.1.39/winipedia_utils/security/keyring.py

@@ -0,0 +1,54 @@
+"""Keyring utilities for secure storage and retrieval of secrets.
+
+This module provides utility functions for working with keyring,
+including getting and creating secrets and fernets.
+These utilities help with secure storage and retrieval of secrets.
+"""
+
+from base64 import b64decode, b64encode
+from collections.abc import Callable
+
+import keyring
+from cryptography.fernet import Fernet
+from cryptography.hazmat.primitives.ciphers.aead import AESGCM
+
+
+def get_or_create_fernet(service_name: str, username: str) -> Fernet:
+    """Get the app secret using keyring.
+
+    If it does not exist, create it with a Fernet.
+    """
+    return get_or_create_key(
+        service_name, username, Fernet, lambda: Fernet.generate_key()
+    )
+
+
+def get_or_create_aes_gcm(service_name: str, username: str) -> AESGCM:
+    """Get the app secret using keyring.
+
+    If it does not exist, create it with a AESGCM.
+    """
+    return get_or_create_key(
+        service_name, username, AESGCM, lambda: AESGCM.generate_key(bit_length=256)
+    )
+
+
+def get_or_create_key[T](
+    service_name: str,
+    username: str,
+    key_class: Callable[[bytes], T],
+    generate_key_func: Callable[..., bytes],
+) -> T:
+    """Get the app secret using keyring.
+
+    If it does not exist, create it with the generate_func.
+    """
+    service_name = f"{service_name}_{key_class.__name__}"
+    key = keyring.get_password(service_name, username)
+    if key is None:
+        binary_key = generate_key_func()
+        key = b64encode(binary_key).decode("ascii")
+        keyring.set_password(service_name, username, key)
+
+    binary_key = b64decode(key)
+    return key_class(binary_key)

winipedia_utils-0.1.37/winipedia_utils/security/keyring.py

@@ -1,34 +0,0 @@
-"""Keyring utilities for secure storage and retrieval of secrets.
-
-This module provides utility functions for working with keyring,
-including getting and creating secrets and fernets.
-These utilities help with secure storage and retrieval of secrets.
-"""
-
-import keyring
-from cryptography.fernet import Fernet
-from cryptography.hazmat.primitives.ciphers.aead import AESGCM
-
-
-def get_or_create_fernet(service_name: str, username: str) -> Fernet:
-    """Get the app secret using keyring.
-
-    If it does not exist, create it with a Fernet.
-    """
-    secret = keyring.get_password(service_name, username)
-    if secret is None:
-        secret = Fernet.generate_key().decode()
-        keyring.set_password(service_name, username, secret)
-    return Fernet(secret.encode())
-
-
-def get_or_create_aes_gcm(service_name: str, username: str) -> AESGCM:
-    """Get the app secret using keyring.
-
-    If it does not exist, create it with a AESGCM.
-    """
-    secret = keyring.get_password(service_name, username)
-    if secret is None:
-        secret = AESGCM.generate_key(bit_length=256).decode()
-        keyring.set_password(service_name, username, secret)
-    return AESGCM(secret.encode())