Grotti 3.3.0: Projekte mit Ordner, Datei-Löschen/Verschieben, Material-Archiv, UI-Polish.

scripts/orca_senden.py

@@ -13,8 +13,11 @@ from __future__ import annotations
 import json
 import mimetypes
 import os
+import re
 import shutil
+import subprocess
 import sys
+import time
 import uuid
 import webbrowser
 from pathlib import Path
@@ -25,7 +28,19 @@ from urllib.request import Request, urlopen
 REPO_ROOT = Path(__file__).resolve().parent.parent
 CONFIG_PATH = REPO_ROOT / "data" / "orca-senden.json"
 DEBUG_LOG = REPO_ROOT / "data" / "orca-senden-last.log"
+BROWSER_LOCK = REPO_ROOT / "data" / "orca-senden-browser.lock"
+FOCUS_PATH = REPO_ROOT / "data" / "orca-senden-focus.json"
+APP_PROFILE = REPO_ROOT / "data" / "grotti-app-profile"
 ALLOWED_SUFFIXES = (".gcode", ".gcode.3mf", ".3mf", ".gcode.pp", ".pp")
+BROWSER_DEBOUNCE_S = 25.0
+# Anycubic: MMDD-HHMM-Name.gcode — Zeitstempel raus, sonst jedes Export ein neues Fenster
+_TIME_PREFIX_RE = re.compile(r"^\d{4}-\d{4}-")
+_CHROMIUM_CANDIDATES = (
+    Path(r"C:\Program Files\Google\Chrome\Application\chrome.exe"),
+    Path(r"C:\Program Files (x86)\Microsoft\Edge\Application\msedge.exe"),
+    Path(os.path.expandvars(r"%LOCALAPPDATA%\Microsoft\Edge\Application\msedge.exe")),
+    Path(os.path.expandvars(r"%LOCALAPPDATA%\Google\Chrome\Application\chrome.exe")),
+)
 
 
 def show_error(message: str) -> None:
@@ -76,7 +91,10 @@ def load_config(path: Path = CONFIG_PATH) -> dict[str, str]:
         raise ValueError("Config: url fehlt (z. B. http://127.0.0.1:8770).")
     if not token:
         raise ValueError("Config: token fehlt (grt_… aus Einstellungen).")
-    return {"url": url, "token": token}
+    browser = str(data.get("browser") or "app").strip().lower() or "app"
+    if browser not in ("app", "tab"):
+        browser = "app"
+    return {"url": url, "token": token, "browser": browser}
 
 
 def is_gcode_path(path: Path) -> bool:
@@ -140,6 +158,83 @@ def send_page_url(base_url: str, file_id: int) -> str:
     return "%s/dateien?file=%s" % (base_url.rstrip("/"), int(file_id))
 
 
+def app_page_url(base_url: str) -> str:
+    """Stabile App-URL — Datei kommt über orca-fokus, kein neues Fenster pro Slice."""
+    return "%s/dateien?orca=1" % base_url.rstrip("/")
+
+
+def find_chromium() -> Path | None:
+    for path in _CHROMIUM_CANDIDATES:
+        try:
+            if path.is_file():
+                return path
+        except OSError:
+            continue
+    return None
+
+
+def app_already_running() -> bool:
+    """True wenn Chrome/Edge schon mit grotti-app-profile läuft (Profil-Sperre)."""
+    needle = "grotti-app-profile"
+    if sys.platform == "win32":
+        try:
+            creationflags = getattr(subprocess, "CREATE_NO_WINDOW", 0)
+            out = subprocess.check_output(
+                [
+                    "powershell",
+                    "-NoProfile",
+                    "-Command",
+                    (
+                        "Get-CimInstance Win32_Process | "
+                        "Where-Object { "
+                        "($_.Name -match '^(chrome|msedge)\\.exe$') -and "
+                        "($_.CommandLine -like '*%s*') "
+                        "} | Select-Object -First 1 -ExpandProperty ProcessId"
+                    )
+                    % needle,
+                ],
+                timeout=8,
+                stderr=subprocess.DEVNULL,
+                creationflags=creationflags,
+            )
+            return bool((out or b"").strip())
+        except (OSError, subprocess.SubprocessError):
+            pass
+    for name in ("SingletonLock", "SingletonSocket", "lockfile"):
+        path = APP_PROFILE / name
+        try:
+            if path.exists() or path.is_symlink():
+                return True
+        except OSError:
+            continue
+    return False
+
+
+def open_as_app(url: str) -> bool:
+    """Chrome/Edge --app=… → eigenes Fenster auf dem Desktop, kein Browser-Tab."""
+    binary = find_chromium()
+    if binary is None:
+        return False
+    try:
+        APP_PROFILE.mkdir(parents=True, exist_ok=True)
+        subprocess.Popen(
+            [
+                str(binary),
+                "--app=%s" % url,
+                "--user-data-dir=%s" % str(APP_PROFILE.resolve()),
+                "--no-first-run",
+                "--no-default-browser-check",
+            ],
+            stdout=subprocess.DEVNULL,
+            stderr=subprocess.DEVNULL,
+            close_fds=True,
+        )
+        return True
+    except OSError as exc:
+        write_debug(sys.argv, "app_open_fail=%s" % exc)
+        return False
+
+
 def _api_json(
     base_url: str,
     token: str,
@@ -279,7 +374,79 @@ def upload_file(
     return payload
 
 
-def open_browser(url: str) -> None:
+def browser_key(name: str) -> str:
+    """Gleicher Slice trotz Zeitstempel / -2 / Leerzeichen → ein Browserfenster."""
+    stem = Path(name or "").stem.lower()
+    stem = _TIME_PREFIX_RE.sub("", stem)
+    stem = re.sub(r"-\d+$", "", stem)
+    return re.sub(r"[^a-z0-9]+", "", stem)
+
+
+def write_focus(file_id: int, url: str, key: str = "") -> None:
+    """Offene Dateien-Seite kann auf die neueste Orca-Datei umschalten."""
+    try:
+        FOCUS_PATH.parent.mkdir(parents=True, exist_ok=True)
+        FOCUS_PATH.write_text(
+            json.dumps(
+                {
+                    "file_id": int(file_id),
+                    "url": url,
+                    "key": key,
+                    "ts": time.time(),
+                },
+                ensure_ascii=False,
+            ),
+            encoding="utf-8",
+        )
+    except (OSError, TypeError, ValueError):
+        pass
+
+
+def open_browser(
+    url: str,
+    key: str = "",
+    file_id: int | None = None,
+    mode: str = "app",
+) -> None:
+    """Anycubic/Orca starten das Skript oft 2× — nur ein Fenster pro Modell.
+
+    mode=app (Standard): Chrome/Edge als App-Fenster auf dem Desktop.
+    mode=tab: klassischer Browser-Tab.
+    """
+    token = (key or url).strip() or url
+    now = time.time()
+    if file_id is not None:
+        write_focus(int(file_id), url, key=token)
+    try:
+        BROWSER_LOCK.parent.mkdir(parents=True, exist_ok=True)
+        if BROWSER_LOCK.is_file():
+            prev = json.loads(BROWSER_LOCK.read_text(encoding="utf-8"))
+            if (
+                isinstance(prev, dict)
+                and prev.get("key") == token
+                and now - float(prev.get("ts") or 0) < BROWSER_DEBOUNCE_S
+            ):
+                write_debug(
+                    sys.argv,
+                    "browser_skip key=%s age=%.1fs focus=%s"
+                    % (token, now - float(prev.get("ts") or 0), file_id),
+                )
+                return
+        BROWSER_LOCK.write_text(
+            json.dumps({"key": token, "ts": now, "url": url, "mode": mode}, ensure_ascii=False),
+            encoding="utf-8",
+        )
+    except (OSError, TypeError, ValueError, json.JSONDecodeError):
+        pass
+    if (mode or "app").strip().lower() != "tab":
+        # Zweites Chrome mit gleichem Profil = leeres Profil / erneutes Login.
+        # Offenes Fenster pollt orca-fokus und wechselt die Datei selbst.
+        if app_already_running():
+            write_debug(sys.argv, "browser_reuse focus=%s" % file_id)
+            return
+        if open_as_app(url):
+            write_debug(sys.argv, "browser_app url=%s" % url)
+            return
     webbrowser.open(url)
 
 
@@ -319,8 +486,21 @@ def main(argv: list[str] | None = None) -> int:
             % (path, upload_name_for(path), output_target() or ""),
         )
         file_id = deliver(config["url"], config["token"], path)
-        write_debug(argv, "file_id=%s" % file_id)
-        open_browser(send_page_url(config["url"], file_id))
+        name = upload_name_for(path)
+        write_debug(argv, "file_id=%s\nupload_as=%s" % (file_id, name))
+        mode = str(config.get("browser") or "app").strip().lower()
+        # App: stabile URL; Tab: Deep-Link mit file=
+        open_url = (
+            send_page_url(config["url"], file_id)
+            if mode == "tab"
+            else app_page_url(config["url"])
+        )
+        open_browser(
+            open_url,
+            key=browser_key(name),
+            file_id=file_id,
+            mode=mode,
+        )
     except Exception as exc:
         write_debug(argv, "error=%s" % exc)
         show_error(str(exc))