imdiff 0.2.7__tar.gz → 0.2.8__tar.gz

{imdiff-0.2.7 → imdiff-0.2.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.7
+Version: 0.2.8
 Summary: Compare image files in different directories
 Author-email: "John T. Goetz" <theodore.goetz@gmail.com>
 Project-URL: homepage, https://gitlab.com/johngoetz/imdiff

{imdiff-0.2.7 → imdiff-0.2.8}/imdiff/gui/dir_diff_main_window.py

@@ -74,12 +74,12 @@ class DirDiffMainWindow(ttk.Window):
         sys.exit()
 
     def on_select(self, comparator):
+        self.after_idle(self.image_frame.clear)
+        self.after_idle(self.status_bar.clear)
+        self.update_idletasks()
         if comparator:
             self.after_idle(self.image_frame.load_comparator, comparator)
             self.after_idle(self.status_bar.update_labels, comparator)
-        else:
-            self.after_idle(self.image_frame.clear)
-            self.after_idle(self.status_bar.clear)
 
     def update_item(self, file_path, comparator):
         self.after_idle(self.file_list_frame.update_file_item, file_path)

{imdiff-0.2.7 → imdiff-0.2.8}/imdiff/gui/file_list_frame.py

@@ -161,7 +161,7 @@ class FileListFrame(ttk.Frame):
         if file_path := self.file_treeview.focus():
             if self.on_select_command and self.files:
                 self.on_select_command(self.files[file_path])
-            self.update_file_item(file_path)
+            self.after_idle(self.update_file_item, file_path)
         else:
             self.on_select_command(None)
         return 'break'
@@ -237,7 +237,8 @@ class FileListFrame(ttk.Frame):
         self.file_treeview.heading('#0', command=lambda: self.sort_filepaths(0, True))
         self.file_treeview.heading('stat', command=lambda: self.sort_stat(False))
 
-    def get_diff_info(self, file_path):
+    @staticmethod
+    def get_diff_info(file_path, comparator):
         category_chars = {
             'identical': '=',
             'missing': '-',
@@ -247,13 +248,6 @@ class FileListFrame(ttk.Frame):
             'not-found': 'F',
         }
 
-        comparator = self.files[file_path]
-
-        proc = multiprocessing.Process(target=comparator.calculate_diff_info)
-        proc.start()
-        while proc.is_alive():
-            self.update()
-            time.sleep(0.1)
         diff_info = comparator.diff_info
 
         if diff_info == 'failed-to-load':
@@ -273,17 +267,17 @@ class FileListFrame(ttk.Frame):
     @separate_thread
     def process_files(self):
         while self.file_processing_queue.status == IterableQueue.Status.Filling:
-            self.update()
+            self.update_idletasks()
         assert self.file_processing_queue.status == IterableQueue.Status.Complete
         assert self.file_properties_queue.status == IterableQueue.Status.Filling
-        with concurrent.futures.ThreadPoolExecutor() as executor:
+        with concurrent.futures.ProcessPoolExecutor() as executor:
             self.executor = executor
             try:
                 jobs = []
                 for file_path in self.file_processing_queue:
-                    jobs.append(executor.submit(self.get_diff_info, file_path))
+                    jobs.append(executor.submit(
+                        FileListFrame.get_diff_info, file_path, self.files[file_path]))
                 for job in concurrent.futures.as_completed(jobs):
-                    self.update()
                     file_path, category, diff_info = job.result()
                     self.file_properties_queue.put((file_path, category, diff_info))
                 self.file_properties_queue.status = IterableQueue.Status.Complete
@@ -395,7 +389,8 @@ class FileListFrame(ttk.Frame):
             self.delete(file_path)
             return
 
-        file_path, category, diff_info = self.get_diff_info(file_path)
+        res = FileListFrame.get_diff_info(file_path, self.files[file_path])
+        file_path, category, diff_info = res
         self.set_file_properties(file_path, category, diff_info)
 
     def sort_filepaths(self, nparts, reverse):

{imdiff-0.2.7 → imdiff-0.2.8}/imdiff/gui/image_frame.py

@@ -1,5 +1,7 @@
 import logging
 import platform
+import multiprocessing
+import time
 
 import tkinter as tk
 import ttkbootstrap as ttk
@@ -10,6 +12,8 @@ from .image_canvas import ImageCanvas
 from .image_scaling import ImageScaling
 from .zoom_menu import ZoomMenu
 
+from ..util import separate_thread
+
 
 log = logging.getLogger(__name__)
 
@@ -258,12 +262,14 @@ class ImageFrame(ttk.Frame):
                 self.images['diff'].scaled_image = None
                 self.images['diff'].load_image(self.comparator.diff)
 
+    @separate_thread
     def load_images(self, left, right):
         self.comparator = ImageComparator(left, right)
         self.images['left'].load_image(self.comparator.left)
         self.images['right'].load_image(self.comparator.right)
         self.show_diff()
 
+    @separate_thread
     def load_comparator(self, comparator):
         self.comparator = comparator
         self.images['left'].load_image(self.comparator.left)

{imdiff-0.2.7 → imdiff-0.2.8}/imdiff/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.2.7'
+__version__ = '0.2.8'
 version_info = __version__.split('.')

{imdiff-0.2.7 → imdiff-0.2.8}/imdiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.7
+Version: 0.2.8
 Summary: Compare image files in different directories
 Author-email: "John T. Goetz" <theodore.goetz@gmail.com>
 Project-URL: homepage, https://gitlab.com/johngoetz/imdiff