psiutils 0.2.2__py3-none-any.whl → 0.2.4__py3-none-any.whl

psiutils/_logger.py

@@ -1,54 +1,95 @@
+# logging_setup.py
 import logging
+from pathlib import Path
 from logging.handlers import RotatingFileHandler
+import appdirs
 import structlog
 
-# === 1. Console handler with pretty dev output ===
-console_handler = logging.StreamHandler()
-console_handler.setLevel(logging.INFO)
-console_handler.setFormatter(
-    structlog.stdlib.ProcessorFormatter(
-        processor=structlog.dev.ConsoleRenderer(),
-        foreign_pre_chain=[
-            structlog.processors.TimeStamper(fmt="iso"),
-        ],
+LOG_FILE_NAME = 'app.log'
+MAX_BYTES = 5_000_000
+BACKUP_COUNT = 5
+
+
+def psi_logger(app_name: str, level=logging.INFO):
+    """
+    Creates and configures a logger for the specified application.
+
+    Args:
+        app_name (str): The name of the application.
+        level (int): The logging level (default is logging.INFO).
+
+    Returns:
+        Logger: A configured logger for the application.
+
+    Examples:
+        logger = psi_logger("my_app", logging.DEBUG)
+    """
+
+    log_file = _log_file(app_name)
+    console_handler = _console_handler(level)
+    file_handler = _file_handler(log_file, level)
+
+    root_logger = logging.getLogger()
+    root_logger.setLevel(level)
+    root_logger.addHandler(console_handler)
+    root_logger.addHandler(file_handler)
+
+    structlog.configure(
+        processors=_processors(),
+        wrapper_class=structlog.make_filtering_bound_logger(level),
+        context_class=dict,
+        logger_factory=structlog.stdlib.LoggerFactory(),
+        cache_logger_on_first_use=True,
     )
-)
-
-# === 2. File handler with JSON output ===
-file_handler = RotatingFileHandler(
-    "app.log", maxBytes=5_000_000, backupCount=5, encoding="utf-8"
-)
-file_handler.setLevel(logging.INFO)
-file_handler.setFormatter(
-    structlog.stdlib.ProcessorFormatter(
-        processor=structlog.processors.JSONRenderer(),  # Structured JSON
-        foreign_pre_chain=[
-            structlog.processors.TimeStamper(fmt="iso"),
-        ],
+
+    return structlog.get_logger()
+
+
+def _log_file(app_name: str) -> Path:
+    """Return the path to the application log file."""
+    log_dir = Path(appdirs.user_data_dir(app_name))
+    log_dir.mkdir(parents=True, exist_ok=True)
+    return Path(log_dir, LOG_FILE_NAME)
+
+
+def _console_handler(level=logging.INFO) -> logging.StreamHandler:
+    """Return the console handler for the logger."""
+    console_handler = logging.StreamHandler()
+    console_handler.setLevel(level)
+    console_handler.setFormatter(
+        structlog.stdlib.ProcessorFormatter(
+            processor=structlog.dev.ConsoleRenderer(),
+            foreign_pre_chain=[structlog.processors.TimeStamper(fmt='iso')],
+        )
     )
-)
-
-# === 3. Attach both handlers ===
-root_logger = logging.getLogger()
-root_logger.setLevel(logging.INFO)
-root_logger.addHandler(console_handler)
-root_logger.addHandler(file_handler)
-
-# === 4. Configure structlog to use stdlib logging ===
-structlog.configure(
-    processors=[
-        structlog.processors.TimeStamper(fmt="iso"),
+    return console_handler
+
+
+def _file_handler(log_file: Path, level=logging.INFO) -> RotatingFileHandler:
+    """Return the console handler for the logger."""
+    file_handler = RotatingFileHandler(
+        str(log_file),
+        maxBytes=MAX_BYTES,
+        backupCount=BACKUP_COUNT,
+        encoding='utf-8'
+    )
+    file_handler.setLevel(level)
+    file_handler.setFormatter(
+        structlog.stdlib.ProcessorFormatter(
+            processor=structlog.processors.JSONRenderer(),
+            foreign_pre_chain=[structlog.processors.TimeStamper(fmt='iso')],
+        )
+    )
+    return file_handler
+
+
+def _processors() -> list:
+    return [
+        structlog.processors.TimeStamper(fmt='iso'),
         structlog.stdlib.add_log_level,
         structlog.stdlib.add_logger_name,
         structlog.stdlib.PositionalArgumentsFormatter(),
         structlog.processors.StackInfoRenderer(),
         structlog.processors.format_exc_info,
         structlog.stdlib.ProcessorFormatter.wrap_for_formatter,
-    ],
-    wrapper_class=structlog.make_filtering_bound_logger(logging.INFO),
-    context_class=dict,
-    logger_factory=structlog.stdlib.LoggerFactory(),
-    cache_logger_on_first_use=True,
-)
-
-logger = structlog.get_logger()
+    ]

psiutils/_version.py

@@ -1 +1 @@
-__version__ = '0.2.2'
+__version__ = '0.2.4'

psiutils/buttons.py

@@ -63,14 +63,14 @@ class IconButton(ttk.Frame):
 
     def bind_widgets(self):
         for widget in (self, self.button_label):
-            widget.bind("<Button-1>", self._on_click)
-            widget.bind("<Enter>", self._enter_button)
-            widget.bind("<Leave>", lambda e: self.config(relief="raised"))
+            widget.bind('<Button-1>', self._on_click)
+            widget.bind('<Enter>', self._enter_button)
+            widget.bind('<Leave>', lambda e: self.config(relief='raised'))
 
     def _enter_button(self, event) -> None:
         if self._state == tk.DISABLED:
             return
-        self.config(relief="sunken")
+        self.config(relief='sunken')
         event.widget.winfo_toplevel().config(cursor=HAND)
 
     def _on_click(self, *args):
@@ -122,8 +122,11 @@ class ButtonFrame(ttk.Frame):
         }
 
     def icon_button(
-            self, id: str, dimmable: bool = False, command=None) -> IconButton:
-        button = self.icon_buttons[id]
+            self,
+            id_: str,
+            dimmable: bool = False,
+            command: object = None) -> IconButton:
+        button = self.icon_buttons[id_]
         button.dimmable = dimmable
         button.command = command
         return button
@@ -267,5 +270,5 @@ def list_icon_buttons() -> None:
 
     for name, button in icon_buttons.items():
         print(f'{name:<{name_length}} '
-               f'{button[0]:<{text_length}} '
-               f'{button[1]:<{icon_length}}')
+              f'{button[0]:<{text_length}} '
+              f'{button[1]:<{icon_length}}')

psiutils/known_paths.py

@@ -24,23 +24,25 @@ from pathlib import Path
 import platform
 from typing import Any
 
-MS_FOLDERS = r'SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
+#MS_FOLDERS =
+# r'SOFTWARE\Microsoft\Windows\CurrentVersion\Explorer\Shell Folders'
 
 
 class GUID(ctypes.Structure):
     _fields_ = [
-        ("Data1", wintypes.DWORD),
-        ("Data2", wintypes.WORD),
-        ("Data3", wintypes.WORD),
-        ("Data4", wintypes.BYTE * 8)
+        ("Data1", ctypes.c_ulong),
+        ("Data2", ctypes.c_ushort),
+        ("Data3", ctypes.c_ushort),
+        ("Data4", ctypes.c_ubyte * 8),
     ]
 
-    def __init__(self, uuid_: Any) -> None:
+    def __init__(self, guid_string):
+        str_uuid = UUID(guid_string)
         ctypes.Structure.__init__(self)
-        (self.Data1, self.Data2, self.Data3,
-         self.Data4[0], self.Data4[1], rest) = uuid_.fields
-        for index in range(2, 8):
-            self.Data4[index] = rest >> (8 - index - 1)*8 & 0xff
+        self.Data1 = str_uuid.time_low
+        self.Data2 = str_uuid.time_mid
+        self.Data3 = str_uuid.time_hi_version
+        self.Data4[:] = str_uuid.bytes[8:]
 
 
 class folder_id:
@@ -163,11 +165,22 @@ class PathNotFoundException(Exception):
 
 
 def get_path(folder: str) -> str | None:
-    import winreg
-    fid = f'{{{getattr(folder_id, folder)}}}'
-    with winreg.OpenKey(winreg.HKEY_CURRENT_USER, MS_FOLDERS) as key:
-        location = winreg.QueryValueEx(key, fid)[0]
-    return location
+    # FOLDERID_Documents GUID
+    fid = GUID(f'{{{getattr(folder_id, folder)}}}')
+
+    SHGetKnownFolderPath = ctypes.windll.shell32.SHGetKnownFolderPath
+    SHGetKnownFolderPath.argtypes = [
+        ctypes.POINTER(GUID),
+        wintypes.DWORD, wintypes.HANDLE,
+        ctypes.POINTER(ctypes.c_wchar_p)]
+    SHGetKnownFolderPath.restype = ctypes.HRESULT
+
+    path_ptr = ctypes.c_wchar_p()
+    result = SHGetKnownFolderPath(
+        ctypes.byref(fid), 0, None, ctypes.byref(path_ptr))
+    if result != 0:
+        raise OSError("SHGetKnownFolderPath failed")
+    return Path(path_ptr.value)
 
 
 def get_downloads_dir() -> Path | str:

psiutils/utilities.py

@@ -7,8 +7,7 @@ import platform
 
 from psiconfig import TomlConfig
 import psiutils.text as txt
-from psiutils._logger import logger
-
+from psiutils._logger import psi_logger
 
 DEFAULT_GEOMETRY = '500x400'
 

{psiutils-0.2.2.dist-info → psiutils-0.2.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: psiutils
-Version: 0.2.2
+Version: 0.2.4
 Summary: Various TKinter utilities.
 Author: Jeff
 Author-email: Jeff <<jeffwatkins2000@gmail.com>>

{psiutils-0.2.2.dist-info → psiutils-0.2.4.dist-info}/RECORD

@@ -1,8 +1,8 @@
 psiutils/__init__.py,sha256=B8mLHCYCnD0LcwsGAtS3HM9kYdwVnhf6dNXL6i1H4kY,145
 psiutils/_about_frame.py,sha256=xZQivwvZc-k8C-SkwQne-dBr4gavDAL_32fv8E-7Wt0,7644
-psiutils/_logger.py,sha256=52Bn2dAcDm54G7VsH4jDIZRM1gMXHumVCPfVzOS-1X4,1725
-psiutils/_version.py,sha256=pKh2_hmFNUwG0JxbL18qxdmi_nmFpgRbR8X6IPZr08o,21
-psiutils/buttons.py,sha256=O_0lZD7KszUoP9hsVijxQSScrANpExDviH8-KWEJtAg,8521
+psiutils/_logger.py,sha256=9nXxKWUyu4xqIILjTSUKRAMOG4cFy_EGJTTo0FtUAGU,2859
+psiutils/_version.py,sha256=qfsPKGSX4YbTkJ_mvg4kfAF60Sx0Ol77KSinJilpkVw,21
+psiutils/buttons.py,sha256=38vQc6A0ub1p4GHukNQB3ICx7vi-9M4RAt-eeuDCeBg,8567
 psiutils/constants.py,sha256=T8AjYBkmuziAWjXgON-Sj0AM62NAGluj_Y6glrOFbHc,1107
 psiutils/drag_manager.py,sha256=L04GzKIinWXzGCawvTnn18F1AEt8PUPS1U-HqCVrh48,3470
 psiutils/errors.py,sha256=tAypFkpzpbeOppO9zKQimlnRVyr3sMPoiwh0yK3Yc88,562
@@ -35,6 +35,7 @@ psiutils/icons/reset.png,sha256=UJHvnseHeMJoPNCn-WydTnfX-Lrlp9tgSlcIq6jWUBg,1296
 psiutils/icons/revert.png,sha256=vWIyLx7dQfTOkI8igLmVtmV8hnBfIh089QmKRRobVmk,1268
 psiutils/icons/save.png,sha256=RSIfWkVE537tMgchS5VFmHughVQqkKMyjMLY0ccDy98,613
 psiutils/icons/script.png,sha256=CG5MYayO1X5O7q40byfMwya1_52rp8BYq-FWUDBG5fg,803
+psiutils/icons/search.png,sha256=egPfxgBOZGOeVIV8nvAnwCnv_4vstFzRVmZiqiOPBIA,1491
 psiutils/icons/send.png,sha256=4PSUVt8NAKLIxYEYpdMQHNigmfjyUSL8VAsMBmBxxmM,968
 psiutils/icons/start.png,sha256=lzi6occJJXKXlRoFjx76h1YhQy2lLk9IqCf-xDKadDc,1936
 psiutils/icons/update.png,sha256=buOCd1Mq5M8Jbcd2HX6eZjLAQPxM5psFTGNqkkI7c7c,2212
@@ -43,13 +44,13 @@ psiutils/icons/windows.png,sha256=orrq_I9aYHMcUJHdtfLWbAEJZwzPjja9VMwZPm9jsjg,22
 psiutils/images/icon-error.png,sha256=Fk1IMjyqXACUbfcCGTHM-Q1Gb_53hzzyRGO1JbxgNB8,5957
 psiutils/images/icon-info.png,sha256=JFCbGkYfO1BD7VRYQXmTMjOePPRrwjkl-KSFHtKIBE4,5979
 psiutils/images/icon-query.png,sha256=e18hqkew4eOxABvECKn7BGO2VTHTE-XLMWPSQfSW9dU,2808
-psiutils/known_paths.py,sha256=P5AR482y-9YQjL_4VUx4cUTPYhffiTrWLEqQGYL24R4,9158
+psiutils/known_paths.py,sha256=Ydhk-Ie_q827ti35Hru8YwUx5awdO2FEG845k1N0hPo,9543
 psiutils/menus.py,sha256=4pUHb3fEYzLnsftxdKB_NjlPryj_pu7WN5Iy5Quy9-M,1746
 psiutils/messagebox.py,sha256=14W4KzEg8Fi1OCiOX9zZvomoSqibAYNipQpa95Tco5M,4969
 psiutils/text.py,sha256=5M5EOGfKLj_2JeH1lweDX8MJR6bk_aZl2pnRXj3FiHk,824
 psiutils/treeview.py,sha256=jtSzLWrnFIBDWV5YhWNRoZwgW-Kj8_7XVqZyusr-riQ,2826
-psiutils/utilities.py,sha256=rAtDvUYn_1AF22x8kRVeeTh7POLN58wXUA5G_nEULS4,2911
+psiutils/utilities.py,sha256=KZkpCmkvQooRSRe3bfKFHbi4HHX3PSMSj0g4DIpbom0,2914
 psiutils/widgets.py,sha256=ooGAy0IU3ct9aeqnBqMUr2AVyqg_zKHG8Fm9Gm-Wn5Y,11114
-psiutils-0.2.2.dist-info/WHEEL,sha256=NHRAbdxxzyL9K3IO2LjmlNqKSyPZnKv2BD16YYVKo18,79
-psiutils-0.2.2.dist-info/METADATA,sha256=63d5U_djo-6I0hq9bvqrA6aXSQkyOEDuwLXnFB-M3NY,1976
-psiutils-0.2.2.dist-info/RECORD,,
+psiutils-0.2.4.dist-info/WHEEL,sha256=Jb20R3Ili4n9P1fcwuLup21eQ5r9WXhs4_qy7VTrgPI,79
+psiutils-0.2.4.dist-info/METADATA,sha256=RCRhoq5FsNq8a-RMpzTDAQ87y68V7LWSTSKDxnONBek,1976
+psiutils-0.2.4.dist-info/RECORD,,

{psiutils-0.2.2.dist-info → psiutils-0.2.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: uv 0.8.14
+Generator: uv 0.8.15
 Root-Is-Purelib: true
 Tag: py3-none-any