winipedia-utils 0.1.37__py3-none-any.whl → 0.1.39__py3-none-any.whl

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/security/keyring.py

@@ -5,6 +5,9 @@ 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
@@ -15,11 +18,9 @@ def get_or_create_fernet(service_name: str, username: str) -> Fernet:
 
     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())
+    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:
@@ -27,8 +28,27 @@ def get_or_create_aes_gcm(service_name: str, username: str) -> AESGCM:
 
     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())
+    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.dist-info → winipedia_utils-0.1.39.dist-info}/METADATA

@@ -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.dist-info → winipedia_utils-0.1.39.dist-info}/RECORD

@@ -54,7 +54,7 @@ winipedia_utils/pyside/ui/pages/player.py,sha256=PPmUNejMibKeNUm-a-1VA6i14G743YF
 winipedia_utils/pyside/ui/widgets/__init__.py,sha256=p-maJQh7gYbXwhkqKU4wL6UNGzRAy988JP8_qLoTZDk,24
 winipedia_utils/pyside/ui/widgets/browser.py,sha256=5oUyQKYOYu9Zzx6adbewTtAIfnn_RVs8CLoX3rU2g28,6160
 winipedia_utils/pyside/ui/widgets/clickable_widget.py,sha256=nUZ7ngPFQ7utJuq9A-72TeT1wqCt_xubAxBg3xQSL64,856
-winipedia_utils/pyside/ui/widgets/media_player.py,sha256=R_fUhs2bP33SUyT44uS-6THWEOOezulKR08V0171fMw,11004
+winipedia_utils/pyside/ui/widgets/media_player.py,sha256=jcAGeZo3ey177K2jAmqg1LOyARzn_5z26krZGKVj99c,10909
 winipedia_utils/pyside/ui/widgets/notification.py,sha256=_zBq9Q6SDFu3fV2AkbvyCNQmOEOy1l9mKOFAAdyteg4,1941
 winipedia_utils/pyside/ui/windows/__init__.py,sha256=p-maJQh7gYbXwhkqKU4wL6UNGzRAy988JP8_qLoTZDk,24
 winipedia_utils/pyside/ui/windows/base/__init__.py,sha256=p-maJQh7gYbXwhkqKU4wL6UNGzRAy988JP8_qLoTZDk,24
@@ -69,7 +69,7 @@ winipedia_utils/resources/svgs/play_icon.svg,sha256=U0RQ-S_WbcyyjeWC55BkcOtG64Gf
 winipedia_utils/resources/svgs/svg.py,sha256=-Dw6m7cm9CHT2076oZIMx7kTQw0v_ifJajXzWcpUtI0,430
 winipedia_utils/security/__init__.py,sha256=ZBa72J6MNtYumBFMoVc0ia4jsoS7oNgjaTCW0xDb6EI,53
 winipedia_utils/security/cryptography.py,sha256=zfxSDo7aE9ecmZNC6URMSEUYRpOuJ1iESg-WCSS5HP0,822
-winipedia_utils/security/keyring.py,sha256=eJifLGKnlOF_9tB3y6fvHXxr02a-TWOXljb1JI6ztkU,1218
+winipedia_utils/security/keyring.py,sha256=35bCXBmsFWyd7Ja2w9zHElayABeRZEaNXoEDDRb8ItQ,1698
 winipedia_utils/setup.py,sha256=F4NneO0wVTf7JCXLorWjTOdJl36N5fLSksoWMe4p86o,1650
 winipedia_utils/testing/__init__.py,sha256=kXhB5xw02ec5xpcW_KV--9CBKdyCjnuR-NZzAJ5tq0g,51
 winipedia_utils/testing/assertions.py,sha256=0JF4mqVTnLQ1qkAL_FuTwyN_idr00rvVlta7aDdnUXA,851
@@ -91,7 +91,7 @@ winipedia_utils/testing/tests/base/utils/utils.py,sha256=dUPDrgAxlfREQb33zz23Mfz
 winipedia_utils/testing/tests/conftest.py,sha256=8RounBlI8Jq1aLaLNpv84MW4ne8Qq0aavQextDOp5ng,920
 winipedia_utils/text/__init__.py,sha256=j2bwtK6kyeHI6SnoBjpRju0C1W2n2paXBDlNjNtaUxA,48
 winipedia_utils/text/string.py,sha256=1jbBftlgxffGgSlPnQh3aRPIr8XekEwpSenjFCW6JyM,3478
-winipedia_utils-0.1.37.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
-winipedia_utils-0.1.37.dist-info/METADATA,sha256=VmWIeVHrm9GEwAKCx9uXVNkCFn4u475mOFlGH08CpEg,12576
-winipedia_utils-0.1.37.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-winipedia_utils-0.1.37.dist-info/RECORD,,
+winipedia_utils-0.1.39.dist-info/LICENSE,sha256=3PrKJ2CWNrnyyHaC_r0wPDSukVWgmjOxHr__eQVH7cw,1087
+winipedia_utils-0.1.39.dist-info/METADATA,sha256=PEZW6MkX2O4ZuDOXmfWUuhYLriJJQjGbOqKmvL8hOS4,12576
+winipedia_utils-0.1.39.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+winipedia_utils-0.1.39.dist-info/RECORD,,