Compare commits
2 Commits
bf0d7636ef
...
654f62c492
| Author | SHA1 | Date | |
|---|---|---|---|
| 654f62c492 | |||
| e85932fac6 |
@@ -1,4 +1,124 @@
|
||||
import os, json
|
||||
# -*- coding: utf-8 -*-
|
||||
# config.py – zentrale Konfiguration + persistente Settings im Benutzerordner
|
||||
|
||||
from __future__ import annotations
|
||||
import json
|
||||
import os
|
||||
import sys
|
||||
from pathlib import Path
|
||||
from typing import Any, Dict
|
||||
|
||||
# ----------------- App-Metadaten -----------------
|
||||
APP_NAME = "ZeiterfassungMERZ"
|
||||
|
||||
# ----------------- Pfade / Umgebung -----------------
|
||||
SCRIPT_DIR = Path(__file__).resolve().parent
|
||||
IS_FROZEN = getattr(sys, "frozen", False)
|
||||
APP_DIR = Path(sys.executable).parent if IS_FROZEN else SCRIPT_DIR
|
||||
MEIPASS = Path(getattr(sys, "_MEIPASS", APP_DIR)) # PyInstaller temp
|
||||
|
||||
def _user_config_base() -> Path:
|
||||
"""Benutzer-schreibbarer Basisordner je OS."""
|
||||
if os.name == "nt":
|
||||
return Path(os.getenv("APPDATA", Path.home() / "AppData" / "Roaming"))
|
||||
elif sys.platform == "darwin":
|
||||
return Path.home() / "Library" / "Application Support"
|
||||
else:
|
||||
return Path(os.getenv("XDG_CONFIG_HOME", Path.home() / ".config"))
|
||||
|
||||
CONFIG_DIR = _user_config_base() / APP_NAME
|
||||
CONFIG_DIR.mkdir(parents=True, exist_ok=True)
|
||||
|
||||
SETTINGS_PATH = CONFIG_DIR / "settings.json"
|
||||
|
||||
# ----------------- Defaults -----------------
|
||||
DEFAULTS: Dict[str, Any] = {
|
||||
"SERVER_EXCEL": "", # Pfad zur Bearbeitungs-Excel
|
||||
"DATUM_FORMAT": "%Y-%m-%d %H:%M:%S",# Anzeige-/Eingabeformat in der GUI
|
||||
"theme": "light", # evtl. zukünftig genutzt
|
||||
}
|
||||
|
||||
# ----------------- Settings I/O -----------------
|
||||
def _load_settings() -> Dict[str, Any]:
|
||||
if not SETTINGS_PATH.exists():
|
||||
_save_settings(DEFAULTS.copy())
|
||||
return DEFAULTS.copy()
|
||||
try:
|
||||
text = SETTINGS_PATH.read_text(encoding="utf-8")
|
||||
data = json.loads(text)
|
||||
if not isinstance(data, dict):
|
||||
return DEFAULTS.copy()
|
||||
# fehlende Defaults ergänzen
|
||||
for k, v in DEFAULTS.items():
|
||||
data.setdefault(k, v)
|
||||
return data
|
||||
except Exception:
|
||||
# Fallback: neu initialisieren
|
||||
_save_settings(DEFAULTS.copy())
|
||||
return DEFAULTS.copy()
|
||||
|
||||
def _save_settings(data: Dict[str, Any]) -> None:
|
||||
SETTINGS_PATH.write_text(
|
||||
json.dumps(data, ensure_ascii=False, indent=2) + "\n",
|
||||
encoding="utf-8",
|
||||
newline="\n",
|
||||
)
|
||||
|
||||
def set_option(key: str, value: Any) -> None:
|
||||
s = _load_settings()
|
||||
s[key] = value
|
||||
_save_settings(s)
|
||||
|
||||
def get_option(key: str, default: Any = None) -> Any:
|
||||
s = _load_settings()
|
||||
return s.get(key, default)
|
||||
|
||||
# ----------------- Öffentliche API / Variablen -----------------
|
||||
# Hinweis: LOGO_PATH wird so aufgelöst, dass es sowohl im Source-Run
|
||||
# als auch in der PyInstaller-EXE funktioniert.
|
||||
def _resolve_logo_path() -> str:
|
||||
# 1) mitgeliefertes Logo in _MEIPASS/config oder _MEIPASS
|
||||
for p in (MEIPASS / "Merz_Logo.png", MEIPASS / "config" / "Merz_Logo.png"):
|
||||
if p.exists():
|
||||
return str(p)
|
||||
# 2) neben den Skripten (Entwicklungsumgebung)
|
||||
for p in (SCRIPT_DIR / "Merz_Logo.png", SCRIPT_DIR / "config" / "Merz_Logo.png"):
|
||||
if p.exists():
|
||||
return str(p)
|
||||
# 3) Fallback: leerer String → GUI zeigt einfach kein Bild
|
||||
return ""
|
||||
|
||||
# Load Settings zur Modul-Init
|
||||
_settings = _load_settings()
|
||||
|
||||
# Exponierte Konstanten / Variablen
|
||||
LOGO_PATH: str = _resolve_logo_path()
|
||||
DATUM_FORMAT: str = _settings.get("DATUM_FORMAT", DEFAULTS["DATUM_FORMAT"])
|
||||
SERVER_EXCEL: str = _settings.get("SERVER_EXCEL", DEFAULTS["SERVER_EXCEL"])
|
||||
|
||||
def set_server_excel(path: str) -> str:
|
||||
"""
|
||||
Setzt den Pfad zur Bearbeitungs-Excel (normalisiert), speichert ihn
|
||||
in settings.json und aktualisiert die Modulvariable SERVER_EXCEL.
|
||||
"""
|
||||
global SERVER_EXCEL
|
||||
norm = os.path.abspath(os.path.expanduser(path)) if path else ""
|
||||
set_option("SERVER_EXCEL", norm)
|
||||
SERVER_EXCEL = norm
|
||||
return SERVER_EXCEL
|
||||
|
||||
def set_datum_format(fmt: str) -> str:
|
||||
"""
|
||||
Optional: DATUM_FORMAT zur Laufzeit anpassen (z. B. '%d.%m.%Y %H:%M').
|
||||
"""
|
||||
global DATUM_FORMAT
|
||||
DATUM_FORMAT = fmt
|
||||
set_option("DATUM_FORMAT", fmt)
|
||||
return DATUM_FORMAT
|
||||
|
||||
|
||||
|
||||
"""import os, json
|
||||
from pathlib import Path
|
||||
|
||||
# --- Static paths/consts ---
|
||||
@@ -44,7 +164,7 @@ _SETTINGS = load_settings()
|
||||
SERVER_EXCEL = _SETTINGS_SERVER_EXCEL = _SETTINGS.get("server_excel", "") # will be normalized below
|
||||
|
||||
def set_server_excel(path: str):
|
||||
"""Setzt den Pfad zur Bearbeitungs-Excel, speichert ihn in settings.json und aktualisiert SERVER_EXCEL."""
|
||||
#Setzt den Pfad zur Bearbeitungs-Excel, speichert ihn in settings.json und aktualisiert SERVER_EXCEL.
|
||||
global SERVER_EXCEL, _SETTINGS
|
||||
# Normalisieren (absoluter Pfad)
|
||||
norm = os.path.abspath(os.path.expanduser(path)) if path else ""
|
||||
@@ -56,3 +176,4 @@ def set_server_excel(path: str):
|
||||
# Beim Import sicherstellen, dass SERVER_EXCEL normalisiert ist
|
||||
if SERVER_EXCEL:
|
||||
SERVER_EXCEL = set_server_excel(SERVER_EXCEL)
|
||||
"""
|
||||
Reference in New Issue
Block a user