Release: v3.1.0

2026-09-16 20:22:34 +02:00
parent ce1ccb91bb
commit a9a9a89cba
26 changed files with 552 additions and 332 deletions
@@ -95,7 +95,8 @@ class PlikUploader:
        self._notify = notify_fn

    def upload_recording(self, output_dir: str, output_file: str, job_name: str,
-                         segment_mode: bool, delete_after: bool, ntfy_enabled: bool):
+                         segment_mode: bool, delete_after: bool, ntfy_enabled: bool,
+                         save_url_fn: Callable = None):
        plik_url = self.config.get("plik", "url", default="")
        if not plik_url:
            self._log("WARN", f"Plik-Upload übersprungen: Keine URL konfiguriert [{job_name}]", job_name)
@@ -107,15 +108,15 @@ class PlikUploader:
        def _do_upload():
            try:
                if segment_mode:
-                    self._upload_segments(output_dir, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled)
+                    self._upload_segments(output_dir, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled, save_url_fn)
                else:
-                    self._upload_single(output_file, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled)
+                    self._upload_single(output_file, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled, save_url_fn)
            except Exception as e:
                self._log("ERROR", f"Plik-Upload Fehler: {e} [{job_name}]", job_name)

        threading.Thread(target=_do_upload, daemon=True).start()

-    def _upload_single(self, file_path, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled):
+    def _upload_single(self, file_path, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled, save_url_fn=None):
        if not os.path.isfile(file_path) or os.path.getsize(file_path) == 0:
            self._log("WARN", f"Plik-Upload übersprungen: Datei fehlt oder leer [{job_name}]", job_name)
            return
@@ -127,6 +128,8 @@ class PlikUploader:
            self._log("INFO", f"Plik-Upload abgeschlossen: {result['browser_url']} [{job_name}]", job_name)
            if result.get("download_url"):
                self._log("INFO", f"Plik-Download: {result['download_url']} [{job_name}]", job_name)
+            if save_url_fn:
+                save_url_fn(result["browser_url"])
            if self._notify:
                self._notify("upload", "Plik-Upload", f"{job_name}: {result['browser_url']}", ntfy_enabled)
            if delete_after:
@@ -135,7 +138,7 @@ class PlikUploader:
        else:
            self._log("ERROR", f"Plik-Upload fehlgeschlagen [{job_name}]", job_name)

-    def _upload_segments(self, output_dir, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled):
+    def _upload_segments(self, output_dir, job_name, plik_url, api_key, ttl, delete_after, ntfy_enabled, save_url_fn=None):
        if not os.path.isdir(output_dir):
            return

@@ -161,8 +164,11 @@ class PlikUploader:
            else:
                self._log("ERROR", f"Plik Segment-Upload fehlgeschlagen: {fname} [{job_name}]", job_name)

-        if uploaded > 0 and self._notify:
-            msg = f"{job_name}: {uploaded} Segment(e) hochgeladen"
-            if last_browser_url:
-                msg += f"\n{last_browser_url}"
-            self._notify("upload", "Plik-Upload", msg, ntfy_enabled)
+        if uploaded > 0:
+            if save_url_fn and last_browser_url:
+                save_url_fn(last_browser_url)
+            if self._notify:
+                msg = f"{job_name}: {uploaded} Segment(e) hochgeladen"
+                if last_browser_url:
+                    msg += f"\n{last_browser_url}"
+                self._notify("upload", "Plik-Upload", msg, ntfy_enabled)