Merge aa8616a40a into 333567f481

sticker/lib/util.py

@@ -120,28 +120,26 @@ def process_frame(frame):
 
 
 def webp_to_others(data: bytes, mimetype: str) -> bytes:
-    with tempfile.NamedTemporaryFile(suffix=".webp") as webp:
+    format = mimetypes.guess_extension(mimetype)[1:]
-        webp.write(data)
+    print(format)
-        webp.flush()
+    with Image.open(BytesIO(data)) as webp:
-        ext = mimetypes.guess_extension(mimetype)
+        with BytesIO() as img:
-        with tempfile.NamedTemporaryFile(suffix=ext) as img:
             print(".", end="", flush=True)
-            im = Image.open(webp.name)
+            webp.info.pop('background', None)
-            im.info.pop('background', None)
 
             if mimetype == "image/gif":
                 frames = []
-                duration = []
+                duration = [100, ]
 
-                for frame in ImageSequence.Iterator(im):
+                for frame in ImageSequence.Iterator(webp):
                     frame = process_frame(frame)
                     frames.append(frame)
-                    duration.append(frame.info.get('duration', 100))
+                    duration.append(frame.info.get('duration', duration[-1]))
 
-                frames[0].save(img.name, save_all=True, lossless=True, quality=100, method=6,
+                frames[0].save(img, format=format, save_all=True, lossless=True, quality=100, method=6,
-                               append_images=frames[1:], loop=0, duration=duration, disposal=2)
+                               append_images=frames[1:], loop=0, duration=duration[1:], disposal=2)
             else:
-                im.save(img.name, save_all=True, lossless=True, quality=100, method=6)
+                webp.save(img, format=format, lossless=True, quality=100, method=6)
 
             img.seek(0)
             return img.read()