Grotti 2.2.6: Wand-Vorschau, dichterer 3D-Pfad, ASCII-Dateinamen.

Kacheln zeigen Moonraker-Thumbnails; Toolpath-Thinning behält ganze Schichten; Nicht-ASCII-Namen vermeiden 10115 beim Senden.

grotti/moonraker.py

@@ -165,18 +165,53 @@ def post_json(host, path, payload, timeout=20):
         raise PrinterError("Der Drucker ist nicht erreichbar.") from exc
 
 
+def safe_upload_name(filename):
+    """Dateiname für Moonraker/Rinkhals/gklib — nur ASCII.
+
+    `filename` vs. `filename*` mit CJK führte zu Upload unter `_` und Start
+    unter dem Originalnamen → Fehler 10115 „gcode … not found“.
+    """
+    raw = (filename or "").replace("\\", "/")
+    parts = [part for part in raw.split("/") if part]
+    base = parts[-1] if parts else "job.gcode"
+    out = []
+    for ch in base:
+        if ch.isascii() and ch not in '"\\':
+            out.append(ch if ch not in " \t" else "_")
+        else:
+            out.append("_")
+    text = "".join(out)
+    while "__" in text:
+        text = text.replace("__", "_")
+    while "_-" in text or "-_" in text:
+        text = text.replace("_-", "-").replace("-_", "-")
+    text = text.strip("._-") or "job"
+    lower = text.lower()
+    if not (lower.endswith(".gcode") or lower.endswith(".gcode.3mf") or lower.endswith(".3mf") or lower.endswith(".acm")):
+        # Suffix vom Original behalten, falls nur der Stamm zerstört wurde
+        if base.lower().endswith(".gcode.3mf"):
+            text += ".gcode.3mf"
+        elif base.lower().endswith(".gcode"):
+            text += ".gcode"
+        elif base.lower().endswith(".acm"):
+            text += ".acm"
+    if parts:
+        parts[-1] = text
+        return "/".join(parts)
+    return text
+
+
 def multipart(filename, content):
     boundary = "----GrottiBoundary7f3a"
-    ascii_name = "".join(ch if ch.isascii() and ch not in '"\\' else "_" for ch in filename) or "job.gcode"
-    quoted = urllib.parse.quote(filename)
+    name = safe_upload_name(filename)
     fields = (
         "--%s\r\nContent-Disposition: form-data; name=\"root\"\r\n\r\ngcodes\r\n" % boundary
     ).encode("ascii")
     head = (
         "--%s\r\n"
-        "Content-Disposition: form-data; name=\"file\"; filename=\"%s\"; filename*=UTF-8''%s\r\n"
+        "Content-Disposition: form-data; name=\"file\"; filename=\"%s\"\r\n"
         "Content-Type: application/octet-stream\r\n\r\n"
-    ) % (boundary, ascii_name, quoted)
+    ) % (boundary, name)
     tail = ("\r\n--%s--\r\n" % boundary).encode("ascii")
     return boundary, fields + head.encode("ascii") + content + tail
 
@@ -217,6 +252,7 @@ def upload_timeout(size):
 
 
 def upload(host, filename, content, on_progress=None):
+    filename = safe_upload_name(filename)
     boundary, body = multipart(filename, content)
     stream = _UploadBody(body, on_progress=on_progress)
     request = urllib.request.Request(
@@ -236,7 +272,8 @@ def upload(host, filename, content, on_progress=None):
     except (urllib.error.URLError, TimeoutError) as exc:
         raise PrinterError("Hochladen ist fehlgeschlagen.") from exc
     item = (payload.get("result") or {}).get("item") or {}
-    return item.get("path") or filename
+    # Immer denselben ASCII-Namen nutzen, den wir hochgeladen haben
+    return safe_upload_name(item.get("path") or filename)
 
 
 def start_print(host, filename, bed_leveling=False, ams_settings=None):