imdiff 0.3.1__tar.gz → 0.4.1__tar.gz

{imdiff-0.3.1 → imdiff-0.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imdiff
-Version: 0.3.1
+Version: 0.4.1
 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.4.1/imdiff/__init__.py

@@ -0,0 +1,4 @@
+from .version import __version__, version_info
+
+from .directory_comparator import dir_diff
+from .image_comparator import ImageComparator

{imdiff-0.3.1 → imdiff-0.4.1}/imdiff/__main__.py

@@ -1,6 +1,6 @@
 import sys
 
-from .cli import main
+from .cli.main import main
 
 
 if __name__ == '__main__':

{imdiff-0.3.1 → imdiff-0.4.1}/imdiff/cli/main.py

@@ -1,10 +1,8 @@
 import argparse
-import logging
 import pathlib
 
 from . import dir_diff, image_diff
 
-
 def parse_args():
     parser = argparse.ArgumentParser(
         prog='imdiff',
@@ -31,7 +29,6 @@ def parse_args():
     args = parser.parse_args()
     return args
 
-
 def main():
     #logging.basicConfig(level=logging.DEBUG)
     args = parse_args()

imdiff-0.4.1/imdiff/directory_comparator.py

@@ -0,0 +1,45 @@
+import collections
+import difflib
+import pathlib
+
+from .list_files import is_image, list_files
+from .image_comparator import ImageComparator
+
+def dir_diff(leftdir, rightdir):
+    leftdir = pathlib.Path(leftdir)
+    rightdir = pathlib.Path(rightdir)
+    if not leftdir.is_dir():
+        raise FileNotFoundError(leftdir)
+    if not rightdir.is_dir():
+        raise FileNotFoundError(rightdir)
+
+    rmse_threshold = 0.02
+
+    dinfo = collections.defaultdict(list)
+    for subpath, left, right in list_files(leftdir, rightdir):
+        if not left.is_file():
+            dinfo['missing'].append(subpath)
+        elif not right.is_file():
+            dinfo['new'].append(subpath)
+        elif is_image(left) and is_image(right):
+            icmp = ImageComparator(left, right)
+            if isinstance(icmp.diff_info, str):
+                dinfo[icmp.diff_info].append(subpath)
+            else:
+                assert isinstance(icmp.diff_info, float)
+                if icmp.diff_info > rmse_threshold:
+                    dinfo['different'].append(subpath)
+                else:
+                    dinfo['similar'].append(subpath)
+        else:
+            diff_output = list(difflib.unified_diff(
+                left.read_text().splitlines(),
+                right.read_text().splitlines(),
+                fromfile=str(left),
+                tofile=str(right),
+                lineterm=''))
+            if diff_output:
+                dinfo['different'].append(subpath)
+            else:
+                dinfo['identical'].append(subpath)
+    return dinfo

{imdiff-0.3.1 → imdiff-0.4.1}/imdiff/gui/file_list_frame.py

@@ -36,18 +36,17 @@ class IterableQueue(queue.Queue):
         return self
 
     def __next__(self):
-        status = self.status
-        if status == IterableQueue.Status.Inactive:
+        if self.status == IterableQueue.Status.Inactive:
             raise StopIteration
         while True:
             try:
-                if item := self.get_nowait():
-                    return item
+                # Block briefly to avoid busy-waiting and allow UI updates to run
+                return self.get(timeout=0.05)
             except queue.Empty:
-                if status == IterableQueue.Status.Complete:
+                # When the producer marks the queue Complete and it's empty, stop
+                if self.status == IterableQueue.Status.Complete:
                     self.status = IterableQueue.Status.Inactive
                     raise StopIteration
-            time.sleep(0.01)
 
 
 class FileListFrame(ttk.Frame):
@@ -67,7 +66,7 @@ class FileListFrame(ttk.Frame):
         self.text_file_queue = IterableQueue()
         self.leftdir = None
         self.rightdir = None
-        self.progress_var = tk.IntVar()
+
 
         self.button_choose_left_dir = ttk.Button(
             self, text=f'{self.left_label.capitalize()}...', command=self.askleftdir
@@ -79,9 +78,7 @@ class FileListFrame(ttk.Frame):
             self, text=f'Text Diff', command=self.textdiff
         )
         self.treeview_frame = tk.Frame(self)
-        self.progress_bar = ttk.Progressbar(
-            self.treeview_frame, orient=tk.HORIZONTAL, variable=self.progress_var
-        )
+
         self.file_treeview = ttk.Treeview(self.treeview_frame, columns=('stat',))
         self.file_treeview.heading('#0', text='File (▲)')
         self.file_treeview.heading('stat', text='Stat')
@@ -220,22 +217,33 @@ class FileListFrame(ttk.Frame):
 
     def append_file_entry(self, file_path):
         self.file_entries.append(file_path)
-        self.file_treeview.insert('', 'end', file_path, text=file_path)
-        col_width = max(200, self.file_treeview.column('#0', 'width'))
-        item_width = int(0.85 * tk.font.Font().measure(file_path))
-        if item_width > col_width:
-            self.file_treeview.column('#0', width=item_width)
+        self.after_idle(lambda: self.file_treeview.insert('', 'end', file_path, text=file_path))
 
     @separate_thread
     def append_files_to_list(self):
         assert self.file_processing_queue.status == IterableQueue.Status.Filling
+
+        BATCH_SIZE = 200
+        batch = []
+
+        def flush_batch(items):
+            for p in items:
+                self.file_treeview.insert('', 'end', p, text=p)
+
         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_entries.append(file_path)
+            self.file_processing_queue.put(file_path)  # stream to processing queue
+            batch.append(file_path)
+            if len(batch) >= BATCH_SIZE:
+                self.after(0, flush_batch, batch[:])
+                batch.clear()
+
+        if batch:
+            self.after(0, flush_batch, batch[:])
+
         self.file_processing_queue.status = IterableQueue.Status.Complete
-        self.file_treeview.heading('#0', command=lambda: self.sort_filepaths(0, True))
-        self.file_treeview.heading('stat', command=lambda: self.sort_stat(False))
+        self.after_idle(lambda: self.file_treeview.heading('#0', command=lambda: self.sort_filepaths(0, True)))
+        self.after_idle(lambda: self.file_treeview.heading('stat', command=lambda: self.sort_stat(False)))
 
     @staticmethod
     def get_diff_info(file_path, comparator):
@@ -295,23 +303,11 @@ class FileListFrame(ttk.Frame):
                 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')
-
-    def update_progress_bar(self, value):
-        self.progress_var.set(value)
-
-    def hide_progress_bar(self):
-        self.progress_bar.grid_forget()
-
     def set_file_properties(self, file_path, category, diff_info):
         try:
             self.file_treeview.set(file_path, 'stat', category)
             self.file_treeview.item(file_path, tags=(diff_info,))
-            if self.progress_bar.grid_info():
-                self.num_files_loaded += 1
-                self.update_progress_bar(100 * self.num_files_loaded // len(self.files))
+
         except tk.TclError as e:
             log.debug(f'exception caught while setting file properties: {e}')
 
@@ -320,12 +316,19 @@ class FileListFrame(ttk.Frame):
         for item in self.file_properties_queue:
             file_path, category, diff_info = item
             self.set_file_properties(file_path, category, diff_info)
-        self.hide_progress_bar()
+        def _remove_status_label(self=self):
+            if hasattr(self, 'status_label'):
+                self.status_label.destroy()
+        self.after(0, _remove_status_label)
 
     def load_files(self):
         self.clear_file_list()
-        self.num_files_loaded = 0
-        self.show_progress_bar(0)
+        # Minimal status indicator
+        if not hasattr(self, 'status_var'):
+            self.status_var = tk.StringVar(value='')
+            self.status_label = ttk.Label(self.treeview_frame, textvariable=self.status_var, anchor='w')
+            self.status_label.grid(column=0, row=2, columnspan=2, sticky='sew')
+        self.status_var.set('Loading...')
         self.file_queue.status = IterableQueue.Status.Filling
         self.text_file_queue.status = IterableQueue.Status.Filling
         self.queue_files()

imdiff-0.4.1/imdiff/list_files.py

@@ -0,0 +1,64 @@
+import os
+import pathlib
+
+from PIL import Image
+
+from .image_comparator import ImageComparator
+
+
+# Get list of image file extensions from PIL
+IMAGE_EXTENTIONS = {ex.lower() for ex, f in Image.registered_extensions().items() if f in Image.OPEN}
+IMAGE_EXTENTIONS |= {'.bmp', '.png', '.jpg', '.ps', '.eps', '.cps', '.tif', '.tiff'}
+
+
+def is_image(file_path):
+    return file_path.is_file() and file_path.suffix.lower() in IMAGE_EXTENTIONS
+
+
+def list_files(left_topdir, right_topdir, subdir=pathlib.Path('.')):
+    if not (left_topdir.is_dir() and right_topdir.is_dir()):
+        return
+    def _scan_dir(p):
+        dirs, files = set(), set()
+        try:
+            with os.scandir(p) as it:
+                for entry in it:
+                    name = entry.name
+                    if name.startswith('.'):
+                        # skip hidden files
+                        continue
+                    try:
+                        if entry.is_dir(follow_symlinks=False):
+                            dirs.add(name)
+                        elif entry.is_file(follow_symlinks=False):
+                            files.add(name)
+                    except OSError:
+                        # Ignore entries that cannot be accessed
+                        continue
+        except FileNotFoundError:
+            pass
+        return dirs, files
+
+    stack = [pathlib.Path(subdir)]
+    while stack:
+        rel = stack.pop()
+        leftdir = left_topdir / rel
+        rightdir = right_topdir / rel
+
+        left_dirs, left_files = _scan_dir(leftdir) if leftdir.is_dir() else (set(), set())
+        right_dirs, right_files = _scan_dir(rightdir) if rightdir.is_dir() else (set(), set())
+
+        files = left_files | right_files
+        for fname in sorted(files):
+            yield str(rel / fname), leftdir / fname, rightdir / fname
+
+        subdirs = left_dirs | right_dirs
+        # Push in reverse-sorted order to process in ascending order (depth-first)
+        for dname in sorted(subdirs, reverse=True):
+            stack.append(rel / dname)
+
+
+def list_image_files(left_topdir, right_topdir, subdir=pathlib.Path('.')):
+    for subpath, left, right in list_files(left_topdir, right_topdir, subdir):
+        if is_image(left) or is_image(right):
+            yield subpath, ImageComparator(left, right)

{imdiff-0.3.1 → imdiff-0.4.1}/imdiff/version.py

@@ -1,2 +1,2 @@
-__version__ = '0.3.1'
+__version__ = '0.4.1'
 version_info = __version__.split('.')

{imdiff-0.3.1 → imdiff-0.4.1}/imdiff.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: imdiff
-Version: 0.3.1
+Version: 0.4.1
 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.3.1 → imdiff-0.4.1}/imdiff.egg-info/SOURCES.txt

@@ -3,6 +3,7 @@ README.md
 pyproject.toml
 imdiff/__init__.py
 imdiff/__main__.py
+imdiff/directory_comparator.py
 imdiff/image_comparator.py
 imdiff/list_files.py
 imdiff/util.py

imdiff-0.3.1/imdiff/__init__.py

@@ -1,2 +0,0 @@
-from .version import __version__, version_info
-from . import cli, gui

imdiff-0.3.1/imdiff/cli/__init__.py

@@ -1 +0,0 @@
-from .main import main

imdiff-0.3.1/imdiff/list_files.py

@@ -1,57 +0,0 @@
-import pathlib
-
-from PIL import Image
-
-from .image_comparator import ImageComparator
-
-
-# Get list of image file extensions from PIL
-IMAGE_EXTENTIONS = {ex.lower() for ex, f in Image.registered_extensions().items() if f in Image.OPEN}
-IMAGE_EXTENTIONS |= {'.bmp', '.png', '.jpg', '.ps', '.eps', '.cps', '.tif', '.tiff'}
-
-
-def is_image(file_path):
-    return file_path.is_file() and file_path.suffix.lower() in IMAGE_EXTENTIONS
-
-
-def list_files(left_topdir, right_topdir, subdir=pathlib.Path('.')):
-    if left_topdir.is_dir():
-        leftdir = left_topdir / subdir
-        if right_topdir.is_dir():
-            rightdir = right_topdir / subdir
-
-            dirs = set()
-            files = set()
-
-            if leftdir.is_dir():
-                leftdir_paths = list(leftdir.glob('[!.]*'))
-                dirs |= set(
-                    map(
-                        lambda p: p.relative_to(left_topdir),
-                        filter(pathlib.Path.is_dir, leftdir_paths),
-                    )
-                )
-                files |= set(map(lambda p: p.name, filter(pathlib.Path.is_file, leftdir_paths)))
-
-            if rightdir.is_dir():
-                rightdir_paths = list(rightdir.glob('[!.]*'))
-                dirs |= set(
-                    map(
-                        lambda p: p.relative_to(right_topdir),
-                        filter(pathlib.Path.is_dir, rightdir_paths),
-                    )
-                )
-                files |= set(map(lambda p: p.name, filter(pathlib.Path.is_file, rightdir_paths)))
-
-            for file in sorted(files):
-                yield str(subdir / file), leftdir / file, rightdir / file
-
-            for d in sorted(dirs):
-                for item in list_files(left_topdir, right_topdir, d):
-                    yield item
-
-
-def list_image_files(left_topdir, right_topdir, subdir=pathlib.Path('.')):
-    for subpath, left, right in list_files(left_topdir, right_topdir, subdir):
-        if is_image(left) or is_image(right):
-            yield subpath, ImageComparator(left, right)