From b070d44de756f70f7c5a8a52c09c98c0062974f1 Mon Sep 17 00:00:00 2001
From: ed <s@ocv.me>
Date: Thu, 15 Dec 2022 22:22:04 +0000
Subject: [PATCH] libvips logging + raise codec errors

---
 copyparty/th_srv.py | 8 +++++++-
 copyparty/util.py   | 4 +---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/copyparty/th_srv.py b/copyparty/th_srv.py
index 89d73caf..dfdaac8c 100644
--- a/copyparty/th_srv.py
+++ b/copyparty/th_srv.py
@@ -3,6 +3,7 @@ from __future__ import print_function, unicode_literals
 
 import base64
 import hashlib
+import logging
 import os
 import shutil
 import subprocess as sp
@@ -61,12 +62,16 @@ try:
         HAVE_AVIF = True
     except:
         pass
+
+    logging.getLogger("PIL").setLevel(logging.WARNING)
 except:
     pass
 
 try:
     HAVE_VIPS = True
     import pyvips
+
+    logging.getLogger("pyvips").setLevel(logging.WARNING)
 except:
     HAVE_VIPS = False
 
@@ -363,7 +368,8 @@ class ThumbSrv(object):
                 img = pyvips.Image.thumbnail(abspath, w, **kw)
                 break
             except:
-                pass
+                if c == crops[-1]:
+                    raise
 
         img.write_to_file(tpath, Q=40)
 
diff --git a/copyparty/util.py b/copyparty/util.py
index a2853c1f..0e9286ab 100644
--- a/copyparty/util.py
+++ b/copyparty/util.py
@@ -437,9 +437,7 @@ class HLog(logging.Handler):
         else:
             c = 1
 
-        if record.name.startswith("PIL") and lv < logging.WARNING:
-            return
-        elif record.name == "pyftpdlib":
+        if record.name == "pyftpdlib":
             m = self.ptn_ftp.match(msg)
             if m:
                 ip = m.group(1)