Merge pull request 'dev' (#8) from Daniel/Plugin_SN_Basis:dev into main, Basisfunktion für sn_Verfahrensgebiet

Reviewed-on: #8

.gitea/workflows/release.yml

@@ -0,0 +1,289 @@
+name: Release Plugin
+run-name: "Release | ${{ github.ref_name }}"
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  release:
+    runs-on: alpine-latest
+    defaults:
+      run:
+        shell: bash
+    
+    steps:
+      - name: Notwendige Abhängigkeiten installieren
+        shell: sh
+        run: |
+          apk add --no-cache git zip curl jq rsync bash
+          git config --global http.sslVerify false
+
+      - name: Code holen
+        run: |
+          # Tag aus GitHub Actions Kontext extrahieren
+          TAG="${GITHUB_REF#refs/tags/}"
+
+          # Repo-URL dynamisch aus vars und github.repository bauen
+          REPO_URL="https://${RELEASE_TOKEN}:x-oauth-basic@${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}.git"
+
+          # Repository klonen
+          git clone "$REPO_URL" repo
+          cd repo
+
+          git checkout "$TAG"
+        env:
+          RELEASE_TOKEN: ${{ secrets.RELEASE_TOKEN }}
+
+      - name: Version und Kanal bestimmen
+        id: releaseinfo
+        run: |
+          TAG="${{ github.ref_name }}"
+          VERSION="${TAG#v}"
+          
+          case "$TAG" in
+            *-unstable*)
+              CHANNEL="unstable"
+              DRAFT="false"
+              PRERELEASE="true"
+              ;;
+            *-testing*)
+              CHANNEL="testing"
+              DRAFT="false"
+              PRERELEASE="true"
+              ;;
+            *)
+              CHANNEL="stable"
+              DRAFT="false"
+              PRERELEASE="false"
+              ;;
+          esac
+
+          echo "version=$VERSION"       >> $GITHUB_OUTPUT
+          echo "channel=$CHANNEL"       >> $GITHUB_OUTPUT
+          echo "draft=$DRAFT"           >> $GITHUB_OUTPUT
+          echo "prerelease=$PRERELEASE" >> $GITHUB_OUTPUT
+
+      - name: plugin.info einlesen
+        id: info
+        run: |
+          cd repo
+          while IFS='=' read -r key value; do
+            echo "$key=$value" >> $GITHUB_OUTPUT
+          done < plugin.info
+
+      - name: Changelog einlesen
+        id: changelog
+        run: |
+          cd repo
+
+          # Aktueller Block = alles vor dem ersten ---
+          CURRENT=$(awk '/^---/{exit} {print}' changelog.txt)
+
+          # Vollständige Historie = alles nach dem ersten ---
+          HISTORY=$(awk 'found{print} /^---/{found=1}' changelog.txt)
+
+          # Gitea Release Body zusammenbauen
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          FULL=$(printf "## %s\n%s\n\n%s" "$VERSION" "$CURRENT" "$HISTORY")
+
+          echo "DEBUG | Aktueller Changelog:"
+          echo "$CURRENT"
+
+          # Für GITHUB_OUTPUT: Multiline via EOF-Marker
+          echo "current<<EOF" >> $GITHUB_OUTPUT
+          echo "$CURRENT"     >> $GITHUB_OUTPUT
+          echo "EOF"          >> $GITHUB_OUTPUT
+
+          echo "full<<EOF"    >> $GITHUB_OUTPUT
+          echo "$FULL"        >> $GITHUB_OUTPUT
+          echo "EOF"          >> $GITHUB_OUTPUT
+
+      - name: metadata.txt erzeugen
+        run: |
+          cd repo
+
+          # ------------------------ GEÄNDERT ------------------------
+          # Temporär die Vorlage aus dem hidden/templates Branch holen
+          git fetch origin hidden/templates
+          git checkout origin/hidden/templates -- metadata.template
+          TEMPLATE="metadata.template"
+          # -----------------------------------------------------------
+
+          # TEMPLATE="templates/metadata.template"
+          OUT="metadata.txt"
+
+          CONTENT=$(cat "$TEMPLATE")
+
+          CONTENT="${CONTENT//\{\{NAME\}\}/${{ steps.info.outputs.name }}}"
+          CONTENT="${CONTENT//\{\{QGIS_MIN\}\}/${{ steps.info.outputs.qgisMinimumVersion }}}"
+          CONTENT="${CONTENT//\{\{QGIS_MAX\}\}/${{ steps.info.outputs.qgisMaximumVersion }}}"
+          CONTENT="${CONTENT//\{\{DESCRIPTION\}\}/${{ steps.info.outputs.description }}}"
+          CONTENT="${CONTENT//\{\{VERSION\}\}/${{ steps.releaseinfo.outputs.version }}}"
+          CONTENT="${CONTENT//\{\{AUTHOR\}\}/${{ steps.info.outputs.author }}}"
+          CONTENT="${CONTENT//\{\{EMAIL\}\}/${{ steps.info.outputs.email }}}"
+          CONTENT="${CONTENT//\{\{HOMEPAGE\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{TRACKER\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{REPOSITORY\}\}/${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}}"
+          CONTENT="${CONTENT//\{\{EXPERIMENTAL\}\}/${{ steps.info.outputs.experimental }}}"
+          CONTENT="${CONTENT//\{\{DEPRECATED\}\}/${{ steps.info.outputs.deprecated }}}"
+          CONTENT="${CONTENT//\{\{QT6\}\}/${{ steps.info.outputs.supportsQt6 }}}"
+
+          printf "%s\n" "$CONTENT" > "$OUT"
+          rm $TEMPLATE
+
+      - name: ZIP-Datei erstellen
+        id: zip
+        run: |
+          cd repo
+
+          ZIP_FOLDER="${{ steps.info.outputs.zip_folder }}"
+          ZIP_FILE="${ZIP_FOLDER}.zip"
+
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          REPO_NAME="${GITHUB_REPOSITORY##*/}"
+          #ZIP_NAME="${REPO_NAME}-${VERSION}.zip"
+
+
+          mkdir -p dist/${ZIP_FOLDER}
+
+          rsync -a \
+            --exclude='.git' \
+            --exclude='.gitea' \
+            --exclude='.plugin' \
+            --exclude='dist' \
+            ./ dist/${ZIP_FOLDER}/
+
+          cd dist
+          zip -r "${ZIP_FILE}" "${ZIP_FOLDER}/" \
+            -x "*.pyc" -x "*/__pycache__/*"
+          cd ..
+
+          echo "zip_file=${ZIP_FILE}" >> $GITHUB_OUTPUT
+
+      - name: Gitea-Release erstellen
+        id: create_release
+        run: |
+          TAG="${{ github.ref_name }}"
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          CHANNEL="${{ steps.releaseinfo.outputs.channel }}"
+
+          API_URL="https://${{ vars.RELEASE_URL }}/api/v1/repos/${GITHUB_REPOSITORY}/releases"
+
+          JSON=$(jq -n \
+            --arg tag "$TAG" \
+            --arg name "Version $VERSION" \
+            --arg body  "${{ steps.changelog.outputs.current }}" \
+            --argjson draft "${{ steps.releaseinfo.outputs.draft }}" \
+            --argjson prerelease "${{ steps.releaseinfo.outputs.prerelease }}" \
+            '{tag_name: $tag, name: $name, body: $body, draft: $draft, prerelease: $prerelease}')
+
+          API_RESPONSE=$(curl -s -X POST "$API_URL" \
+            -H "accept: application/json" \
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON")
+
+          RELEASE_ID=$(echo "$API_RESPONSE" | jq -r '.id')
+
+            if [ "$RELEASE_ID" = "null" ] || [ -z "$RELEASE_ID" ]; then
+              echo "Fehler beim Erstellen des Releases!"
+              echo "$API_RESPONSE"
+              exit 1
+            fi
+
+            echo "release_id=$RELEASE_ID" >> $GITHUB_OUTPUT
+
+      - name: ZIP-Datei hochladen
+        run: |
+          RELEASE_ID="${{ steps.create_release.outputs.release_id }}"
+          ZIP_FILE="${{ steps.zip.outputs.zip_file }}"
+
+          API_URL="https://${{ vars.RELEASE_URL }}/api/v1/repos/${GITHUB_REPOSITORY}/releases/${RELEASE_ID}/assets?name=${ZIP_FILE}"
+
+          curl -s -X POST "$API_URL" \
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            -H "Content-Type: application/zip" \
+            --data-binary "@repo/dist/${ZIP_FILE}" \
+            -o upload_response.json
+
+          # Optional: Fehlerprüfung
+          if jq -e '.id' upload_response.json >/dev/null 2>&1; then
+            echo "ZIP erfolgreich hochgeladen."
+          else
+            echo "Fehler beim Hochladen der ZIP!"
+            exit 1
+          fi
+
+      - name: Payload erzeugen
+        run: |
+          cd repo
+
+          VERSION="${{ steps.releaseinfo.outputs.version }}"
+          CHANNEL="${{ steps.releaseinfo.outputs.channel }}"
+          ZIP_FILE="${{ steps.zip.outputs.zip_file }}"
+
+          DOWNLOAD_URL="https://${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}/releases/download/${{ github.ref_name }}/${ZIP_FILE}"
+
+          jq -n \
+            --arg name         "${{ steps.info.outputs.name }}" \
+            --arg version      "$VERSION" \
+            --arg channel      "$CHANNEL" \
+            --arg description  "${{ steps.info.outputs.description }}" \
+            --arg author       "${{ steps.info.outputs.author }}" \
+            --arg email        "${{ steps.info.outputs.email }}" \
+            --arg qgis_min     "${{ steps.info.outputs.qgisMinimumVersion }}" \
+            --arg qgis_max     "${{ steps.info.outputs.qgisMaximumVersion }}" \
+            --arg homepage     "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
+            --arg tracker      "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
+            --arg repository   "${{ vars.RELEASE_URL }}/${GITHUB_REPOSITORY}" \
+            --arg experimental "${{ steps.info.outputs.experimental }}" \
+            --arg deprecated   "${{ steps.info.outputs.deprecated }}" \
+            --arg qt6          "${{ steps.info.outputs.supportsQt6 }}" \
+            --arg id           "${{ steps.info.outputs.zip_folder }}" \
+            --arg url          "$DOWNLOAD_URL" \
+            --arg changelog    "${{ steps.changelog.outputs.current }}" \
+            '{
+              name:         $name,
+              version:      $version,
+              channel:      $channel,
+              description:  $description,
+              author:       $author,
+              email:        $email,
+              qgis_min:     $qgis_min,
+              qgis_max:     $qgis_max,
+              homepage:     $homepage,
+              tracker:      $tracker,
+              repository:   $repository,
+              experimental: $experimental,
+              deprecated:   $deprecated,
+              qt6:          $qt6,
+              id:           $id,
+              url:          $url,
+              changelog:    $changelog
+            }' > payload.json
+
+      - name: Repository aktualisieren
+        run: |
+          OWNER="AG_QGIS"
+          WORKFLOW="update.yml"
+
+          PAYLOAD_B64=$(base64 -w0 repo/payload.json)
+
+          FULL_NAME="${{ steps.info.outputs.name }}"
+          NAME=$(echo "$FULL_NAME" | awk -F'|' '{gsub(/^ +| +$/,"",$2); print $2}')
+          TAG="${{ steps.releaseinfo.outputs.version }}"
+
+          JSON="{\"ref\":\"hidden/workflows\",\"inputs\":{\"payload\":\"$PAYLOAD_B64\",\"name\":\"$NAME\",\"tag\":\"$TAG\"}}"
+
+          #JSON="{\"ref\":\"hidden/workflows\",\"inputs\":{\"payload\":\"$PAYLOAD_B64\"}}"
+
+          echo "DEBUG | Sende JSON:"
+          echo "$JSON"
+
+          curl -X POST \
+            -H "Authorization: token ${{ secrets.RELEASE_TOKEN }}" \
+            -H "Content-Type: application/json" \
+            -d "$JSON" \
+            "https://${{ vars.RELEASE_URL }}/api/v1/repos/${OWNER}/Repository/actions/workflows/${WORKFLOW}/dispatches"

functions/__init__.py

@@ -15,7 +15,7 @@ from .ly_metadata_wrapper import (
     is_layer_editable,
 )
 from .ly_style_wrapper import apply_style
-from .dialog_wrapper import ask_yes_no
+from .dialog_wrapper import ask_yes_no, ask_overwrite_append_cancel_custom
 
 from .message_wrapper import (
     _get_message_bar,

functions/dialog_wrapper.py

@@ -2,8 +2,10 @@
 sn_basis/functions/dialog_wrapper.py – Benutzer-Dialoge (Qt5/6/Mock-kompatibel)
 """
 from typing import Any
+from typing import Literal, Optional
 from sn_basis.functions.qt_wrapper import (
-    QMessageBox, YES, NO, QT_VERSION
+    QMessageBox, YES, NO, CANCEL, QT_VERSION, exec_dialog, ICON_QUESTION,
+    
 )
 
 def ask_yes_no(
@@ -35,3 +37,48 @@ def ask_yes_no(
     except Exception as e:
         print(f"⚠️ ask_yes_no Fehler: {e}")
         return default
+
+
+OverwriteDecision = Optional[Literal["overwrite", "append", "cancel"]]
+
+
+def ask_overwrite_append_cancel_custom(
+    parent,
+    title: str,
+    message: str,
+) -> Literal["overwrite", "append", "cancel"]:
+    """Zeigt Dialog mit benutzerdefinierten Buttons: Überschreiben/Anhängen/Abbrechen.
+
+    Parameters
+    ----------
+    parent :
+        Eltern-Widget oder None.
+    title : str
+        Dialog-Titel.
+    message : str
+        Hauptmeldung mit Erklärung.
+
+    Returns
+    -------
+    Literal["overwrite", "append", "cancel"]
+        Genaue Entscheidung des Nutzers.
+    """
+    msg = QMessageBox(parent)
+    msg.setIcon(ICON_QUESTION)
+    msg.setWindowTitle(title)
+    msg.setText(message)
+    
+    # Eigene Buttons mit exakten Texten
+    overwrite_btn = msg.addButton("Überschreiben", QMessageBox.ButtonRole.AcceptRole)
+    append_btn = msg.addButton("Anhängen", QMessageBox.ButtonRole.ActionRole)
+    cancel_btn = msg.addButton("Abbrechen", QMessageBox.ButtonRole.RejectRole)
+    
+    exec_dialog(msg)
+    
+    clicked = msg.clickedButton()
+    if clicked == overwrite_btn:
+        return "overwrite"
+    elif clicked == append_btn:
+        return "append"
+    else:  # cancel_btn
+        return "cancel"

functions/ly_style_wrapper.py

@@ -1,23 +1,44 @@
 # sn_basis/functions/ly_style_wrapper.py
 
 from sn_basis.functions.ly_existence_wrapper import layer_exists
-from sn_basis.functions.sys_wrapper import (
+from sn_basis.functions.sys_wrapper import get_plugin_root, join_path
-    get_plugin_root,
+from sn_basis.modules.stilpruefer import Stilpruefer
-    join_path,
+from typing import Optional
-    file_exists,
-)
-
 
 def apply_style(layer, style_name: str) -> bool:
+    """
+    Wendet einen Layerstil an, sofern er gültig ist.
+
+    - Validierung erfolgt ausschließlich über Stilpruefer
+    - Keine eigenen Dateisystem- oder Endungsprüfungen
+    - Keine Seiteneffekte bei ungültigem Stil
+    """
+    print(">>> apply_style() START")
+
     if not layer_exists(layer):
         return False
 
-    style_path = join_path(get_plugin_root(), "styles", style_name)
+    # Stilpfad zusammensetzen
-    if not file_exists(style_path):
+    style_path = join_path(get_plugin_root(), "sn_verfahrensgebiet","styles", style_name)
+
+    # Stil prüfen
+    pruefer = Stilpruefer()
+    ergebnis = pruefer.pruefe(style_path)
+    print(">>> Stilprüfung:", ergebnis)
+
+    print(
+    f"[Stilprüfung] ok={ergebnis.ok} | "
+    f"aktion={ergebnis.aktion} | "
+    f"meldung={ergebnis.meldung}"
+)
+
+
+    if not ergebnis.ok:
         return False
 
+    # Stil anwenden
     try:
-        ok, _ = layer.loadNamedStyle(style_path)
+        ok, _ = layer.loadNamedStyle(str(ergebnis.kontext))
         if ok:
             getattr(layer, "triggerRepaint", lambda: None)()
             return True

functions/qgiscore_wrapper.py

@@ -36,6 +36,9 @@ try:
         Qgis as _Qgis,
         QgsMapLayerProxyModel as _QgsMaplLayerProxyModel,
         QgsVectorFileWriter as _QgsVectorFileWriter,
+        QgsFeature as _QgsFeature,  
+        QgsField as _QgsField,
+        QgsGeometry as _QgsGeometry,    
     )
 
     QgsProject = _QgsProject
@@ -45,6 +48,9 @@ try:
     Qgis = _Qgis
     QgsMapLayerProxyModel = _QgsMaplLayerProxyModel
     QgsVectorFileWriter = _QgsVectorFileWriter
+    QgsFeature = _QgsFeature
+    QgsField = _QgsField
+    QgsGeometry = _QgsGeometry 
 
     QGIS_AVAILABLE = True
 

functions/qt_wrapper.py

@@ -11,6 +11,7 @@ NO: Optional[Any] = None
 CANCEL: Optional[Any] = None
 ICON_QUESTION: Optional[Any] = None
 
+
 # Qt-Klassen (werden dynamisch gesetzt)
 QDockWidget: Type[Any] = object
 QMessageBox: Type[Any] = object
@@ -36,6 +37,8 @@ QToolButton: Type[Any] = object
 QSizePolicy: Type[Any] = object
 Qt: Type[Any] = object
 QComboBox: Type[Any] = object
+QHBoxLayout: Type[Any] = object
+
 
 def exec_dialog(dialog: Any) -> Any:
     """Führt Dialog modal aus (Qt6: exec(), Qt5: exec_(), Mock: YES)"""
@@ -77,12 +80,14 @@ try:
         QToolButton as _QToolButton,
         QSizePolicy as _QSizePolicy,
         QComboBox as _QComboBox,
+        QHBoxLayout as _QHBoxLayout,
     )
     from qgis.PyQt.QtCore import (
         QEventLoop as _QEventLoop,
         QUrl as _QUrl,
         QCoreApplication as _QCoreApplication,
         Qt as _Qt,
+        QVariant as _QVariant
     )
     from qgis.PyQt.QtNetwork import (
         QNetworkRequest as _QNetworkRequest,
@@ -115,12 +120,16 @@ try:
     QToolButton = _QToolButton
     QSizePolicy = _QSizePolicy
     QComboBox = _QComboBox
-    
+    QVariant = _QVariant
+    QHBoxLayout= _QHBoxLayout
     # ✅ QT6 ENUMS
     YES = QMessageBox.StandardButton.Yes
     NO = QMessageBox.StandardButton.No
     CANCEL = QMessageBox.StandardButton.Cancel
     ICON_QUESTION = QMessageBox.Icon.Question
+    AcceptRole = QMessageBox.ButtonRole.AcceptRole
+    ActionRole = QMessageBox.ButtonRole.ActionRole  
+    RejectRole = QMessageBox.ButtonRole.RejectRole
     
     # Qt6 Enum-Aliase
     ToolButtonTextBesideIcon = Qt.ToolButtonStyle.ToolButtonTextBesideIcon
@@ -161,12 +170,14 @@ except (ImportError, AttributeError):
             QToolButton as _QToolButton,
             QSizePolicy as _QSizePolicy,
             QComboBox as _QComboBox,
+            QHBoxLayout as _QHBoxLayout,
         )
         from PyQt5.QtCore import (
             QEventLoop as _QEventLoop,
             QUrl as _QUrl,
             QCoreApplication as _QCoreApplication,
             Qt as _Qt,
+            QVariant as _QVariant
         )
         from PyQt5.QtNetwork import (
             QNetworkRequest as _QNetworkRequest,
@@ -199,12 +210,18 @@ except (ImportError, AttributeError):
         QToolButton = _QToolButton
         QSizePolicy = _QSizePolicy
         QComboBox = _QComboBox
+        QVariant = _QVariant
+        QHBoxLayout = _QHBoxLayout
         
         # ✅ PYQT5 ENUMS
         YES = QMessageBox.Yes
         NO = QMessageBox.No
         CANCEL = QMessageBox.Cancel
         ICON_QUESTION = QMessageBox.Question
+        AcceptRole = QMessageBox.AcceptRole
+        ActionRole = QMessageBox.ActionRole
+        RejectRole = QMessageBox.RejectRole
+
         
         # PyQt5 Enum-Aliase
         ToolButtonTextBesideIcon = Qt.ToolButtonTextBesideIcon
@@ -244,6 +261,10 @@ except (ImportError, AttributeError):
             No = NO
             Cancel = CANCEL
             Question = ICON_QUESTION
+            AcceptRole = 0
+            ActionRole = 3
+            RejectRole = 1
+
             
             @classmethod
             def question(cls, parent, title, message, buttons, default_button):
@@ -423,9 +444,71 @@ except (ImportError, AttributeError):
 
         QComboBox = _MockComboBox
 
+        
+        # ---------------------------
+        # Mock für QVariant
+        # ---------------------------
+
+        class _MockQVariant:
+            """
+            Minimaler Ersatz für QtCore.QVariant.
+
+            Ziel:
+            - Werte transparent durchreichen
+            - Typ-Konstanten bereitstellen
+            - Keine Qt-Abhängigkeiten
+            """
+
+            # Typ-Konstanten (symbolisch, Werte egal)
+            Invalid = 0
+            Int = 1
+            Double = 2
+            String = 3
+            Bool = 4
+            Date = 5
+            DateTime = 6
+
+            def __init__(self, value: Any = None):
+                self._value = value
+
+            def value(self) -> Any:
+                return self._value
+
+            def __repr__(self) -> str:
+                return f"QVariant({self._value!r})"
+
+            # Optional: automatische Entpackung
+            def __int__(self):
+                return int(self._value)
+
+            def __float__(self):
+                return float(self._value)
+
+            def __str__(self):
+                return str(self._value)
+        QVariant = _MockQVariant
+
+        class _MockQHBoxLayout:
+            def __init__(self, *args, **kwargs):
+                self._widgets = []
+
+            def addWidget(self, widget):
+                self._widgets.append(widget)
+
+            def addLayout(self, layout):
+                pass
+
+            def addStretch(self, *args, **kwargs):
+                pass
+
+            def setSpacing(self, *args, **kwargs):
+                pass
+
+            def setContentsMargins(self, *args, **kwargs):
+                pass
+        QHBoxLayout = _MockQHBoxLayout
         def exec_dialog(dialog: Any) -> Any:
             return YES
-
 # --------------------------- TEST ---------------------------
 if __name__ == "__main__":
     debug_qt_status()

metadata.txt

@@ -1,13 +0,0 @@
-[general]
-name=LNO Sachsen | Basisfunktionen 
-qgisMinimumVersion=3.0
-description=Plugin mit Basisfunktionen
-version=25.11.4
-author=Michael Otto
-email=michael.otto@landkreis-mittelsachsen.de
-about=Plugin mit Basisfunktionen
-category=Plugins
-homepage=https://entwicklung.vln-sn.de/AG_QGIS/Plugin_SN_Basis
-repository=https://entwicklung.vln-sn.de/AG_QGIS/Repository
-supportsQt6=true
-experimental=true

modules/Pruefmanager.py

@@ -5,7 +5,7 @@ sn_basis/modules/Pruefmanager.py
 from __future__ import annotations
 from typing import Optional, Any
 
-from sn_basis.functions import ask_yes_no, info, warning, error
+from sn_basis.functions import ask_yes_no, info, warning, error, ask_overwrite_append_cancel_custom
 from sn_basis.modules.pruef_ergebnis import pruef_ergebnis, PruefAktion
 print("DEBUG: Pruefmanager DATEI GELADEN:", __file__)
 
@@ -60,6 +60,26 @@ class Pruefmanager:
     # VERFAHRENS-DB-spezifische Entscheidungen
     # ------------------------------------------------------------------
     def _handle_datei_existiert(self, ergebnis: pruef_ergebnis) -> pruef_ergebnis:
+        """Handhabt das Szenario, dass die Ziel-Verfahrens-DB bereits existiert.
+
+        Zeigt einen einzigen Dialog mit drei Optionen an:
+        - **Überschreiben**: Bestehende Layer ersetzen (entspricht YES)
+        - **Anhängen**: Neue Layer zur Datei hinzufügen (entspricht NO)  
+        - **Abbrechen**: Vorgang beenden (entspricht CANCEL)
+
+        Parameters
+        ----------
+        ergebnis : pruef_ergebnis
+            Eingabe-Ergebnis mit Dateipfad im ``kontext``-Attribut.
+
+        Returns
+        -------
+        pruef_ergebnis
+            Ergebnis mit Aktion:
+            - ``datei_existiert_ueberschreiben``
+            - ``datei_existiert_anhaengen``  
+            - ``datei_existiert_ueberspringen`` (für Cancel-Fall)
+        """
         if self.ui_modus != "qgis":
             return ergebnis
 
@@ -72,48 +92,34 @@ class Pruefmanager:
             "Was soll geschehen?\n\n"
             "• **Überschreiben**: Bestehende Layer ersetzen\n"
             "• **Anhängen**: Neue Layer hinzufügen\n"
-            "• **Überspringen**: Nur temporäre Layer erzeugen"
+            "• **Abbrechen**: Vorgang beenden"
         )
 
-        # Vereinfacht: Erst Überschreiben? → Dann Anhängen? → Überspringen
+        # Einzelner Dialog mit drei Optionen
-        if ask_yes_no(
+        entscheidung = ask_overwrite_append_cancel_custom(
-            titel, 
+            parent=self.parent,
-            f"{meldung}\n\n**Überschreiben** (alle Layer ersetzen)?",
+            title=titel,
-            default=False, 
+            message=meldung
-            parent=self.parent
+        )
-        ):
+
+        if entscheidung == "overwrite":
             return pruef_ergebnis(
                 ok=True,
                 aktion="datei_existiert_ueberschreiben",
                 kontext=ergebnis.kontext,
             )
-
+        elif entscheidung == "append":
-        if ask_yes_no(
-            titel,
-            f"{meldung}\n\n**Anhängen** (neue Layer hinzufügen)?", 
-            default=False,
-            parent=self.parent
-        ):
             return pruef_ergebnis(
                 ok=True,
                 aktion="datei_existiert_anhaengen",
                 kontext=ergebnis.kontext,
             )
-
+        else:  # cancel
-        if ask_yes_no(
-            titel,
-            f"{meldung}\n\n**Überspringen** (nur temporäre Layer)?",
-            default=True,
-            parent=self.parent
-        ):
             return pruef_ergebnis(
                 ok=True,
                 aktion="datei_existiert_ueberspringen",
                 kontext=ergebnis.kontext,
             )
-
-        return ergebnis
-
     # ------------------------------------------------------------------
     # Basis-Entscheidungen (KORREKT: → pruef_ergebnis)
     # ------------------------------------------------------------------

modules/stilpruefer.py

@@ -6,7 +6,7 @@ Die Anwendung erfolgt später über eine Aktion.
 
 from pathlib import Path
 
-from sn_basis.functions import file_exists
+from sn_basis.functions.sys_wrapper import file_exists
 from sn_basis.modules.pruef_ergebnis import pruef_ergebnis
 
 

plugin.info

@@ -0,0 +1,11 @@
+name=LNO Sachsen | Basisfunktionen
+description=Plugin mit Basisfunktionen
+author=Daniel Helbig
+email=daniel.helbig@kreis-meissen.de
+qgisMinimumVersion=3.0
+qgisMaximumVersion=3.99
+deprecated=False
+experimental=False
+supportsQt6=Yes
+
+zip_folder=sn_basis