Improve image conversion

Preserve icc_profile convert image to RGBA or RGB

Author: MsEDok

ImageToWEBP.py

@@ -6,69 +6,86 @@
 import threading
 import time
 
+VERSION = "1.0.1"
 
-def convert_to_webp():
-    file_paths = filedialog.askopenfilenames(title="Select image files",
-                                             filetypes=[("Image files", "*.png;*.jpg;*.jpeg;*.bmp;*.tiff")])
+class ImageConverterApp:
+    def __init__(self, root):
+        self.root = root
+        self.root.title(f"Image to WebP Converter | V{VERSION}")
+        self.root.geometry("300x150")
 
-    if not file_paths:
-        return
+        self.btn_select = tk.Button(root, text="Select Images & Convert", command=self.convert_to_webp, padx=10, pady=5)
+        self.btn_select.pack(pady=10)
 
-    save_dir = filedialog.askdirectory(title="Select destination folder")
-    if not save_dir:
-        return
+        self.progress_label = tk.Label(root, text="0/0 images processed", font=("Arial", 12))
+        self.progress_label.pack(pady=5)
 
-    progress_label.config(text=f"0/{len(file_paths)} images processed")
-    time_label.config(text="Elapsed time: 0 seconds")
+        self.status_label = tk.Label(root, text="", font=("Arial", 10), fg="green")
+        self.status_label.pack(pady=5)
 
-    remaining_files = list(file_paths)
+        self.start_time = 0
+        self.completed_count = 0
+        self.num_files = 0
+        self.lock = None
 
-    start_time = time.time()
+    def convert_to_webp(self):
+        file_paths = filedialog.askopenfilenames(title="Select image files",
+                                                 filetypes=[("Image files", "*.png;*.jpg;*.jpeg")])
+        if not file_paths:
+            return
 
-    def convert_image(file_path):
-        try:
-            img = Image.open(file_path)
-            file_name = os.path.splitext(os.path.basename(file_path))[0] + ".webp"
-            save_path = os.path.join(save_dir, file_name)
-            if img.format == "JPEG":
-                img.save(save_path, "webp", lossy=True)
-            else:
-                img.save(save_path, "webp", lossless=True)
+        save_dir = filedialog.askdirectory(title="Select destination folder")
+        if not save_dir:
+            return
 
-            remaining_files.remove(file_path)
-            progress_label.config(text=f"{len(file_paths) - len(remaining_files)}/{len(file_paths)} images processed")
+        self.num_files = len(file_paths)
+        self.progress_label.config(text=f"0/{self.num_files} images processed")
+        self.status_label.config(text="", fg="green")
 
-            elapsed_time = time.time() - start_time
-            time_label.config(text=f"Elapsed time: {int(elapsed_time)} seconds")
-            root.update_idletasks()
-        except Exception as e:
-            messagebox.showerror("Error", f"Failed to convert {file_path}: {e}")
+        self.start_time = time.time()
+        self.completed_count = 0
+        self.lock = None
 
-    def convert_images():
-        max_workers = os.cpu_count() // 2
+        def convert_image(file_path):
+            try:
+                img = Image.open(file_path)
+                file_name = os.path.splitext(os.path.basename(file_path))[0] + ".webp"
+                save_path = os.path.join(save_dir, file_name)
 
-        with ThreadPoolExecutor(max_workers=max_workers) as executor:
-            futures = [executor.submit(convert_image, file_path) for file_path in file_paths]
-            for future in futures:
-                future.result()
+                icc_profile = img.info.get("icc_profile")
 
-        total_time = time.time() - start_time
-        messagebox.showinfo("Success", f"All images have been converted to WebP.\nTotal time: {int(total_time)} seconds.")
+                if img.mode in ("P", "CMYK"):
+                    img = img.convert("RGBA" if img.mode == "P" else "RGB")
 
-    threading.Thread(target=convert_images, daemon=True).start()
+                if img.format == "JPEG":
+                    img.save(save_path, "webp", lossy=True, icc_profile=icc_profile)
+                else:
+                    img.save(save_path, "webp", lossless=True, icc_profile=icc_profile)
 
+                with self.lock:
+                    self.completed_count += 1
+                    self.update_progress()
 
-root = tk.Tk()
-root.title("Image to WebP Converter")
-root.geometry("300x150")
+            except Exception as e:
+                print(f"Error converting {file_path}: {e}")
+
+        def run_conversion():
+            self.lock = threading.Lock()
+            max_workers = max(1, os.cpu_count() // 2)
+            with ThreadPoolExecutor(max_workers=max_workers) as executor:
+                executor.map(convert_image, file_paths)
 
-btn_select = tk.Button(root, text="Select Images & Convert", command=convert_to_webp, padx=10, pady=5)
-btn_select.pack(pady=10)
+            self.show_completion_message()
 
-progress_label = tk.Label(root, text="0/0 images processed", font=("Arial", 12))
-progress_label.pack(pady=5)
+        threading.Thread(target=run_conversion, daemon=True).start()
 
-time_label = tk.Label(root, text="Elapsed time: 0 seconds", font=("Arial", 10))
-time_label.pack(pady=5)
+    def update_progress(self):
+        self.progress_label.config(text=f"{self.completed_count}/{self.num_files} images processed")
 
+    def show_completion_message(self):
+        total_time = int(time.time() - self.start_time)
+        self.root.after(0, lambda: self.status_label.config(text=f"Conversion completed in {total_time} seconds!", fg="blue"))
+
+root = tk.Tk()
+app = ImageConverterApp(root)
 root.mainloop()

MapArtsMerger.py

@@ -3,7 +3,7 @@
 from tkinter import filedialog, messagebox
 from PIL import Image, ImageTk
 
-VERSION = "1.0.0"
+VERSION = "1.0.1"
 
 class ImageMerger:
     def __init__(self, root):
@@ -77,7 +77,7 @@ def select_images(self):
         self.blank_image = ImageTk.PhotoImage(Image.new("RGB", (self.preview_size, self.preview_size), "white"))
 
         max_images = self.row_count * self.col_count
-        files = sorted(filedialog.askopenfilenames(filetypes=[("Image Files", "*.png;*.jpg;*.jpeg;*.webp")]),
+        files = sorted(filedialog.askopenfilenames(filetypes=[("Image Files", "*.png;*.webp")]),
                        key=self.extract_number)
 
         if len(files) > max_images:
@@ -94,7 +94,9 @@ def load_image(self, img_path, size):
             return self.image_cache[img_path]
 
         if img_path:
-            img = Image.open(img_path).resize((size, size))
+            img = Image.open(img_path)
+            img = img.convert("RGBA" if img.mode in ("P", "CMYK") else "RGB")
+            img = img.resize((size, size))
             img_tk = ImageTk.PhotoImage(img)
             self.image_cache[img_path] = img_tk
             return img_tk
@@ -129,7 +131,7 @@ def handle_image_click(self, idx):
             self.replace_image(idx)
 
     def replace_image(self, idx):
-        file_path = filedialog.askopenfilename(filetypes=[("Image Files", "*.png;*.jpg;*.jpeg;*.webp")])
+        file_path = filedialog.askopenfilename(filetypes=[("Image Files", "*.png;*.webp")])
         if file_path:
             self.image_cache.pop(self.images[idx], None)
             self.images[idx] = file_path
@@ -171,14 +173,17 @@ def merge_images(self):
 
         merged = Image.new("RGB", (self.col_count * 128, self.row_count * 128))
         for i, img_path in enumerate(self.images):
-            img = Image.open(img_path).resize((128, 128)) if img_path else Image.new("RGB", (128, 128), "white")
+            img = Image.open(img_path) if img_path else Image.new("RGB", (128, 128), "white")
+            img = img.convert("RGBA" if img.mode in ("P", "CMYK") else "RGB")
+            img = img.resize((128, 128))
             merged.paste(img, ((i % self.col_count) * 128, (i // self.col_count) * 128))
 
         save_path = filedialog.asksaveasfilename(defaultextension=".webp",
                                                  filetypes=[("WEBP files", "*.webp")],
                                                  initialfile=f"[{map_id}]-{map_name}")
         if save_path:
-            merged.save(save_path, "WEBP", lossless=True)
+            icc_profile = merged.info.get("icc_profile")
+            merged.save(save_path, "WEBP", lossless=True, icc_profile=icc_profile)
             messagebox.showinfo("Success", "Image merged successfully!")
 
 def on_closing():