From f1e0c44bdd52461e612920ef4d2d83447b69bd20 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Tue, 20 Sep 2022 23:25:35 +0200
Subject: [PATCH] better autocorrect for poor ffmpeg builds

---
 copyparty/ico.py    |  2 +-
 copyparty/th_srv.py | 30 ++++++++++++++++++++----------
 2 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/copyparty/ico.py b/copyparty/ico.py
index 3ef812de..89973e88 100644
--- a/copyparty/ico.py
+++ b/copyparty/ico.py
@@ -45,7 +45,7 @@ class Ico(object):
                 pb = ImageDraw.Draw(img)
                 tw, th = pb.textsize(ext)
                 pb.text(((w - tw) // 2, (h - th) // 2), ext, fill="#" + c[6:])
-                img = img.resize((w * 3, h * 3), Image.Resampling.NEAREST)
+                img = img.resize((w * 3, h * 3), Image.NEAREST)
 
                 buf = BytesIO()
                 img.save(buf, format="PNG", compress_level=1)
diff --git a/copyparty/th_srv.py b/copyparty/th_srv.py
index 8a1d6e15..75d9051f 100644
--- a/copyparty/th_srv.py
+++ b/copyparty/th_srv.py
@@ -266,13 +266,14 @@ class ThumbSrv(object):
             if fun:
                 try:
                     fun(abspath, tpath)
-                except:
+                except Exception as ex:
                     msg = "{} could not create thumbnail of {}\n{}"
                     msg = msg.format(fun.__name__, abspath, min_ex())
                     c: Union[str, int] = 1 if "<Signals.SIG" in msg else "1;30"
                     self.log(msg, c)
-                    with open(tpath, "wb") as _:
-                        pass
+                    if getattr(ex, "returncode", 0) != 321:
+                        with open(tpath, "wb") as _:
+                            pass
 
             with self.mutex:
                 subs = self.busy[tpath]
@@ -418,21 +419,30 @@ class ThumbSrv(object):
 
         c: Union[str, int] = "1;30"
         t = "FFmpeg failed (probably a corrupt video file):\n"
-        if cmd[-1].lower().endswith(b".webp") and (
-            "Error selecting an encoder" in serr
-            or "Automatic encoder selection failed" in serr
-            or "Default encoder for format webp" in serr
-            or "Please choose an encoder manually" in serr
+        if (
+            (not self.args.th_ff_jpg or time.time() - int(self.args.th_ff_jpg) < 60)
+            and cmd[-1].lower().endswith(b".webp")
+            and (
+                "Error selecting an encoder" in serr
+                or "Automatic encoder selection failed" in serr
+                or "Default encoder for format webp" in serr
+                or "Please choose an encoder manually" in serr
+            )
         ):
-            self.args.th_ff_jpg = True
+            self.args.th_ff_jpg = time.time()
             t = "FFmpeg failed because it was compiled without libwebp; enabling --th-ff-jpg to force jpeg output:\n"
+            ret = 321
             c = 1
 
         if (
+            not self.args.th_ff_swr or time.time() - int(self.args.th_ff_swr) < 60
+        ) and (
             "Requested resampling engine is unavailable" in serr
             or "output pad on Parsed_aresample_" in serr
         ):
-            t = "FFmpeg failed because it was compiled without libsox; you must set --th-ff-swr to force swr resampling:\n"
+            self.args.th_ff_swr = time.time()
+            t = "FFmpeg failed because it was compiled without libsox; enabling --th-ff-swr to force swr resampling:\n"
+            ret = 321
             c = 1
 
         lines = serr.strip("\n").split("\n")