psiutils 0.2.3__tar.gz → 0.2.4__tar.gz

{psiutils-0.2.3 → psiutils-0.2.4}/PKG-INFO

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

{psiutils-0.2.3 → psiutils-0.2.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "psiutils"
-version = "0.2.3"
+version = "0.2.4"
 description = "Various TKinter utilities."
 authors = [{name = "Jeff", "email" = "<jeffwatkins2000@gmail.com>"}]
 requires-python = '==3.13.*'

psiutils-0.2.4/src/psiutils/_logger.py

@@ -0,0 +1,95 @@
+# logging_setup.py
+import logging
+from pathlib import Path
+from logging.handlers import RotatingFileHandler
+import appdirs
+import structlog
+
+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,
+    )
+
+    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')],
+        )
+    )
+    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,
+    ]

psiutils-0.2.4/src/psiutils/_version.py

@@ -0,0 +1 @@
+__version__ = '0.2.4'

{psiutils-0.2.3 → psiutils-0.2.4}/src/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-0.2.3 → psiutils-0.2.4}/src/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.3/src/psiutils/_logger.py

@@ -1,54 +0,0 @@
-import logging
-from logging.handlers import RotatingFileHandler
-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"),
-        ],
-    )
-)
-
-# === 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"),
-        ],
-    )
-)
-
-# === 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"),
-        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-0.2.3/src/psiutils/_version.py

@@ -1 +0,0 @@
-__version__ = '0.2.3'