imdiff 0.2.6__tar.gz → 0.2.7__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.6
+Version: 0.2.7
 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.6 → imdiff-0.2.7}/imdiff/gui/file_list_frame.py

@@ -64,6 +64,7 @@ class FileListFrame(ttk.Frame):
         self.file_queue = IterableQueue()
         self.file_processing_queue = IterableQueue()
         self.file_properties_queue = IterableQueue()
+        self.text_file_queue = IterableQueue()
         self.leftdir = None
         self.rightdir = None
         self.progress_var = tk.IntVar()
@@ -191,6 +192,7 @@ class FileListFrame(ttk.Frame):
         self.file_queue.status = IterableQueue.Status.Inactive
         self.file_processing_queue.status = IterableQueue.Status.Inactive
         self.file_properties_queue.status = IterableQueue.Status.Inactive
+        self.text_file_queue.status = IterableQueue.Status.Inactive
         if executor := self.executor:
             executor.shutdown(wait=False, cancel_futures=True)
 
@@ -203,17 +205,18 @@ class FileListFrame(ttk.Frame):
     @separate_thread
     def queue_files(self):
         assert self.file_queue.status == IterableQueue.Status.Filling
+        assert self.text_file_queue.status == IterableQueue.Status.Filling
         if self.leftdir and self.rightdir:
             for file_path, left, right in list_files(self.leftdir, self.rightdir):
                 if is_image(left) or is_image(right):
                     file_cmp = ImageComparator(left, right)
                     self.files[file_path] = file_cmp
                     self.file_queue.put(file_path)
-                elif self.button_text_diff.configure('bootstyle') != ttk.DANGER:
+                elif self.text_file_queue.status == IterableQueue.Status.Filling:
                     if left.is_file() and right.is_file():
-                        if not filecmp.cmp(left, right):
-                            self.button_text_diff.configure(bootstyle=ttk.DANGER)
+                        self.text_file_queue.put(file_path)
             self.file_queue.status = IterableQueue.Status.Complete
+            self.text_file_queue.status = IterableQueue.Status.Complete
 
     def append_file_entry(self, file_path):
         self.file_entries.append(file_path)
@@ -228,6 +231,7 @@ class FileListFrame(ttk.Frame):
         assert self.file_processing_queue.status == IterableQueue.Status.Filling
         for file_path in self.file_queue:
             self.append_file_entry(file_path)
+        for file_path in self.file_entries:
             self.file_processing_queue.put(file_path)
         self.file_processing_queue.status = IterableQueue.Status.Complete
         self.file_treeview.heading('#0', command=lambda: self.sort_filepaths(0, True))
@@ -244,6 +248,12 @@ class FileListFrame(ttk.Frame):
         }
 
         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':
@@ -262,22 +272,35 @@ class FileListFrame(ttk.Frame):
 
     @separate_thread
     def process_files(self):
+        while self.file_processing_queue.status == IterableQueue.Status.Filling:
+            self.update()
+        assert self.file_processing_queue.status == IterableQueue.Status.Complete
         assert self.file_properties_queue.status == IterableQueue.Status.Filling
-        with concurrent.futures.ThreadPoolExecutor(
-            max_workers=multiprocessing.cpu_count()
-        ) as executor:
+        with concurrent.futures.ThreadPoolExecutor() 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))
                 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
             finally:
                 self.executor = None
 
+    @separate_thread
+    def process_text_files(self):
+        assert self.text_file_queue.status == IterableQueue.Status.Filling
+        for file_path in self.text_file_queue:
+            left = self.leftdir / file_path
+            right = self.rightdir / file_path
+            if not filecmp.cmp(left, right):
+                self.button_text_diff.configure(bootstyle=ttk.DANGER)
+                self.text_file_queue.status = IterableQueue.Status.Complete
+                break
+
     def show_progress_bar(self, initial_value=0):
         self.progress_var.set(initial_value)
         self.progress_bar.grid(column=0, row=2, columnspan=2, sticky='sew')
@@ -310,12 +333,14 @@ class FileListFrame(ttk.Frame):
         self.num_files_loaded = 0
         self.show_progress_bar(0)
         self.file_queue.status = IterableQueue.Status.Filling
+        self.text_file_queue.status = IterableQueue.Status.Filling
         self.queue_files()
         self.file_processing_queue.status = IterableQueue.Status.Filling
         self.append_files_to_list()
         self.file_properties_queue.status = IterableQueue.Status.Filling
         self.process_files()
         self.update_properties()
+        self.process_text_files()
 
     def select_next(self):
         select_next = None

{imdiff-0.2.6 → imdiff-0.2.7}/imdiff/image_comparator.py

@@ -96,38 +96,41 @@ class ImageComparator:
                 self._diff = Image.fromarray(data)
         return self._diff
 
+    def calculate_diff_info(self):
+        if self.left_file and self.left_file.is_file():
+            if self.right_file and self.right_file.is_file():
+                if file_compare(self.left_file, self.right_file):
+                    self._diff_info = 'identical'
+                else:
+                    try:
+                        left_size = Size((self.left.width, self.left.height))
+                        right_size = Size((self.right.width, self.right.height))
+                        if left_size != right_size:
+                            self._diff_info = 'different-size'
+                        else:
+                            left_data = np.array(self.left)
+                            right_data = np.array(self.right)
+                            errors = left_data.astype(int) - right_data
+                            normalized_rmse = (
+                                np.sqrt(np.mean(np.square(errors))) / 0xFF
+                            )
+                            self._diff_info = normalized_rmse
+                    except:
+                        self._diff_info = 'failed-to-load'
+            else:
+                self._diff_info = 'missing'
+        elif self.right_file and self.right_file.is_file():
+            if self.right:
+                self._diff_info = 'new'
+            else:
+                self._diff_info = 'failed-to-load'
+        else:
+            self._diff_info = 'not-found'
+
     @property
     def diff_info(self):
         if self._diff_info is None:
-            if self.left_file and self.left_file.is_file():
-                if self.right_file and self.right_file.is_file():
-                    if file_compare(self.left_file, self.right_file):
-                        self._diff_info = 'identical'
-                    else:
-                        try:
-                            left_size = Size((self.left.width, self.left.height))
-                            right_size = Size((self.right.width, self.right.height))
-                            if left_size != right_size:
-                                self._diff_info = 'different-size'
-                            else:
-                                left_data = np.array(self.left)
-                                right_data = np.array(self.right)
-                                errors = left_data.astype(int) - right_data
-                                normalized_rmse = (
-                                    np.sqrt(np.mean(np.square(errors))) / 0xFF
-                                )
-                                self._diff_info = normalized_rmse
-                        except:
-                            self._diff_info = 'failed-to-load'
-                else:
-                    self._diff_info = 'missing'
-            elif self.right_file and self.right_file.is_file():
-                if self.right:
-                    self._diff_info = 'new'
-                else:
-                    self._diff_info = 'failed-to-load'
-            else:
-                self._diff_info = 'not-found'
+            self.calculate_diff_info()
         return self._diff_info
 
     @property

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

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

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

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