From 85eef7d91817403b02c4942221f904335f0cfaba Mon Sep 17 00:00:00 2001
From: rany2 <rany2@riseup.net>
Date: Tue, 10 Jan 2023 16:38:41 +0200
Subject: [PATCH] Fix bug with edge-playback not removing temp files

* `tmp.close()` even with `delete=True` will cause `edge-playback` to
  not delete because the file will be recreated by `edge-tts`
* bump edge-tts version
---
 src/edge_playback/__main__.py | 59 ++++++++++++++++++++++-------------
 src/edge_tts/version.py       |  2 +-
 2 files changed, 39 insertions(+), 22 deletions(-)

diff --git a/src/edge_playback/__main__.py b/src/edge_playback/__main__.py
index da84fb0..dd09a12 100644
--- a/src/edge_playback/__main__.py
+++ b/src/edge_playback/__main__.py
@@ -11,32 +11,44 @@ import tempfile
 from shutil import which
 
 
+def pr_err(msg: str) -> None:
+    """Print to stderr."""
+    print(msg, file=sys.stderr)
+
+
 def _main() -> None:
     depcheck_failed = False
-    if not which("mpv"):
-        print("mpv is not installed.", file=sys.stderr)
-        depcheck_failed = True
-    if not which("edge-tts"):
-        print("edge-tts is not installed.", file=sys.stderr)
-        depcheck_failed = True
+    for dep in ("edge-tts", "mpv"):
+        if not which(dep):
+            pr_err(f"{dep} is not installed.")
+            depcheck_failed = True
+
     if depcheck_failed:
-        print("Please install the missing dependencies.", file=sys.stderr)
+        pr_err("Please install the missing dependencies.")
         sys.exit(1)
 
     keep = os.environ.get("EDGE_PLAYBACK_KEEP_TEMP") is not None
-    with tempfile.NamedTemporaryFile(
-        suffix=".mp3", delete=not keep
-    ) as media, tempfile.NamedTemporaryFile(suffix=".vtt", delete=not keep) as subtitle:
-        media.close()
-        subtitle.close()
+    mp3_fname = os.environ.get("EDGE_PLAYBACK_MP3_FILE")
+    vtt_fname = os.environ.get("EDGE_PLAYBACK_VTT_FILE")
+    media, subtitle = None, None
+    try:
+        if not mp3_fname:
+            media = tempfile.NamedTemporaryFile(suffix=".mp3", delete=False)
+            media.close()
+            mp3_fname = media.name
 
-        print(f"Media file: {media.name}")
-        print(f"Subtitle file: {subtitle.name}\n")
+        if not vtt_fname:
+            subtitle = tempfile.NamedTemporaryFile(suffix=".vtt", delete=False)
+            subtitle.close()
+            vtt_fname = subtitle.name
+
+        print(f"Media file: {mp3_fname}")
+        print(f"Subtitle file: {vtt_fname}\n")
         with subprocess.Popen(
             [
                 "edge-tts",
-                f"--write-media={media.name}",
-                f"--write-subtitles={subtitle.name}",
+                f"--write-media={mp3_fname}",
+                f"--write-subtitles={vtt_fname}",
             ]
             + sys.argv[1:]
         ) as process:
@@ -45,14 +57,19 @@ def _main() -> None:
         with subprocess.Popen(
             [
                 "mpv",
-                f"--sub-file={subtitle.name}",
-                media.name,
+                f"--sub-file={vtt_fname}",
+                mp3_fname,
             ]
         ) as process:
             process.communicate()
-
-    if keep:
-        print(f"\nKeeping temporary files: {media.name} and {subtitle.name}")
+    finally:
+        if keep:
+            print(f"\nKeeping temporary files: {mp3_fname} and {vtt_fname}")
+        else:
+            if mp3_fname is not None and os.path.exists(mp3_fname):
+                os.unlink(mp3_fname)
+            if vtt_fname is not None and os.path.exists(vtt_fname):
+                os.unlink(vtt_fname)
 
 
 if __name__ == "__main__":
diff --git a/src/edge_tts/version.py b/src/edge_tts/version.py
index c637d90..aa1c517 100644
--- a/src/edge_tts/version.py
+++ b/src/edge_tts/version.py
@@ -1,4 +1,4 @@
 """Edge TTS version information."""
 
-__version__ = "6.1.0"
+__version__ = "6.1.1"
 __version_info__ = tuple(int(num) for num in __version__.split("."))