imdiff 0.2.0__tar.gz → 0.2.3__tar.gz

{imdiff-0.2.0 → imdiff-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: imdiff
-Version: 0.2.0
+Version: 0.2.3
 Summary: Compare image files in different directories
 Author-email: "John T. Goetz" <theodore.goetz@gmail.com>
 Project-URL: homepage, https://gitlab.com/johngoetz/imdiff
@@ -21,6 +21,9 @@ Classifier: Topic :: Utilities
 Requires-Python: >=3.8
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: ttkbootstrap
+Requires-Dist: numpy
+Requires-Dist: pillow
 
 # ImDiff: Compare Directories of Images
 

imdiff-0.2.3/imdiff/__main__.py

@@ -0,0 +1,7 @@
+import sys
+
+from .cli import main
+
+
+if __name__ == '__main__':
+    sys.exit(main())

imdiff-0.2.3/imdiff/cli/dir_diff.py

@@ -0,0 +1,45 @@
+import difflib
+
+from ..list_files import is_image, list_files
+from ..image_comparator import ImageComparator
+from ..gui import DirDiffMainWindow
+
+
+def app(leftdir=None, rightdir=None):
+    win = DirDiffMainWindow()
+    win.load(leftdir, rightdir)
+    win.mainloop()
+
+
+def print_diff(leftdir=None, rightdir=None):
+    ndiffs = 0
+    assert leftdir.is_dir() and rightdir.is_dir(), 'Items must both be directories'
+
+    rmse_threshold = 0.02
+
+    for subpath, left, right in list_files(leftdir, rightdir):
+        if not left.is_file():
+            ndiffs += 1
+            print(f'Only in {right.parent}: {subpath}')
+        elif not right.is_file():
+            ndiffs += 1
+            print(f'Only in {left.parent}: {subpath}')
+        elif is_image(left) and is_image(right):
+            icmp = ImageComparator(left, right)
+            if icmp.diff_info != 'identical':
+                ndiffs += 1
+                if isinstance(icmp.diff_info, str):
+                    print(f'{icmp.diff_info} (as image): {subpath}')
+                elif icmp.diff_info > rmse_threshold:
+                    print(f'image difference NRMSE {icmp.diff_info:.4f}: {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:
+                ndiffs += 1
+                print('\n'.join(diff_output))
+    return ndiffs

imdiff-0.2.3/imdiff/cli/image_diff.py

@@ -0,0 +1,42 @@
+import difflib
+
+from ..list_files import is_image
+from ..image_comparator import ImageComparator
+from ..gui import ImageDiffMainWindow
+
+
+def app(left=None, right=None):
+    win = ImageDiffMainWindow()
+    win.load(left, right)
+    win.mainloop()
+
+
+def print_diff(left, right):
+    ndiffs = 0
+    assert left.is_file() and right.is_file(), 'Items must both be files'
+
+    rmse_threshold = 0.02
+    if is_image(left) and is_image(right):
+        icmp = ImageComparator(left, right)
+        if icmp.diff_info != 'identical':
+            ndiffs += 1
+            if icmp.diff_info == 'missing':
+                print(f'Only in {left.parent}: {left.name}')
+            elif icmp.diff_info == 'new':
+                print(f'Only in {right.parent}: {right.name}')
+            elif isinstance(icmp.diff_info, str):
+                print(f'Images {left} and {right} differ ({icmp.diff_info})')
+            elif icmp.diff_info > rmse_threshold:
+                print(f'Images {left} and {right} differ NRMSE: {icmp.diff_info}')
+    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:
+            ndiffs += 1
+            print('\n'.join(diff_output))
+
+    return ndiffs

imdiff-0.2.3/imdiff/cli/main.py

@@ -0,0 +1,55 @@
+import argparse
+import logging
+import pathlib
+
+from . import dir_diff, image_diff
+
+
+def parse_args():
+    parser = argparse.ArgumentParser(
+        prog='imdiff',
+        description="""Compare images one by one or directory by directory""",
+    )
+    parser.add_argument(
+        '--summary',
+        action='store_true',
+        help="""Print diff result and exit. Disables the GUI. Exits with non-zero if
+                there are differences.""",
+    )
+    parser.add_argument(
+        'left',
+        default='.',
+        type=pathlib.Path,
+        help="""Image or directory of images to compare.""",
+    )
+    parser.add_argument(
+        'right',
+        default='.',
+        type=pathlib.Path,
+        help="""Image or directory of images to compare.""",
+    )
+    args = parser.parse_args()
+    return args
+
+
+def main():
+    #logging.basicConfig(level=logging.DEBUG)
+    args = parse_args()
+    if args.left.is_dir():
+        assert args.right.is_dir(), \
+            'Paths must be either both image files or both directories'
+        if args.summary:
+            ndiffs = dir_diff.print_diff(args.left, args.right)
+            return int(ndiffs > 0)
+        else:
+            dir_diff.app(args.left, args.right)
+    elif args.left.is_file():
+        assert args.right.is_file(), \
+            'Paths must be either both image files or both directories'
+        if args.summary:
+            ndiffs = image_diff.print_diff(args.left, args.right)
+            return int(ndiffs > 0)
+        else:
+            image_diff.app(args.left, args.right)
+    else:
+        raise OSError(f'{args.left} is not a file or directory')

imdiff-0.2.3/imdiff/gui/__init__.py

@@ -0,0 +1,2 @@
+from .dir_diff_main_window import DirDiffMainWindow
+from .image_diff_main_window import ImageDiffMainWindow

{imdiff-0.2.0 → imdiff-0.2.3}/imdiff/gui/dir_diff_main_window.py

@@ -4,7 +4,7 @@ import platform
 import sys
 
 import tkinter as tk
-from tkinter import ttk, font
+import ttkbootstrap as ttk
 
 from .file_list_frame import FileListFrame
 from .image_frame import ImageFrame
@@ -14,14 +14,16 @@ from .status_bar import StatusBar
 log = logging.getLogger(__name__)
 
 
-class DirDiffMainWindow(tk.Tk):
+class DirDiffMainWindow(ttk.Window):
     def __init__(self, left_label='left', right_label='right'):
-        super().__init__()
-        self.title('Image Comparator')
-        self.define_custom_style()
+        super().__init__(title='Image Comparator', themename='sandstone')
         self.pane_window = tk.PanedWindow(self, orient=tk.HORIZONTAL, sashwidth=8)
-        self.file_list_frame = FileListFrame(self.pane_window, on_select=self.on_select,
-                                             left_label=left_label, right_label=right_label)
+        self.file_list_frame = FileListFrame(
+            self.pane_window,
+            on_select=self.on_select,
+            left_label=left_label,
+            right_label=right_label,
+        )
         self.image_frame = ImageFrame(self.pane_window, update_item=self.update_item)
         self.image_frame.add_operate_buttons(
             ttk.Button(self.image_frame, text='Delete', command=self.delete),
@@ -32,20 +34,6 @@ class DirDiffMainWindow(tk.Tk):
         self.layout()
         self.bind_events()
 
-    def define_custom_style(self):
-        self.option_add('*tearOff', False)
-        self.style = ttk.Style(self)
-        if platform.system() == 'Linux':
-            self.style.theme_use('clam')
-
-        if platform.system() == 'Linux':
-            height = font.Font().metrics('linespace')
-            self.style.configure("Treeview", rowheight=height)
-
-        self.style.configure('Raised.TButton', relief='raised')
-        self.style.configure('Sunken.TButton', relief='sunken')
-        self.style.configure('White.TFrame', background='white')
-
     def layout(self):
         self.pane_window.add(self.file_list_frame)
         self.pane_window.add(self.image_frame)
@@ -54,12 +42,12 @@ class DirDiffMainWindow(tk.Tk):
         self.columnconfigure(0, weight=1)
         self.rowconfigure(0, weight=1)
 
-        self.wait_visibility()
-
         file_list_frame_minsize = self.file_list_frame.minsize()
         image_frame_minsize = self.image_frame.minsize()
 
-        self.pane_window.paneconfigure(self.file_list_frame, minsize=file_list_frame_minsize.width)
+        self.pane_window.paneconfigure(
+            self.file_list_frame, minsize=file_list_frame_minsize.width
+        )
 
         w = file_list_frame_minsize.width + image_frame_minsize.width
         h = max(file_list_frame_minsize.height, image_frame_minsize.height)
@@ -68,10 +56,17 @@ class DirDiffMainWindow(tk.Tk):
     def bind_events(self):
         self.bind_all('<Control-q>', self.destroy)
         self.bind_all('<Control-c>', self.destroy)
-        self.bind_all("<Down>", self.file_list_frame.on_down)
-        self.bind_all("<Shift-Down>", lambda evt: self.file_list_frame.on_down(evt, add=True))
-        self.bind_all("<Up>", self.file_list_frame.on_up)
-        self.bind_all("<Shift-Up>", lambda evt: self.file_list_frame.on_up(evt, add=True))
+        self.bind_all('<Down>', self.file_list_frame.on_down)
+        self.bind_all(
+            '<Shift-Down>', lambda evt: self.file_list_frame.on_down(evt, add=True)
+        )
+        self.bind_all('<Up>', self.file_list_frame.on_up)
+        self.bind_all(
+            '<Shift-Up>', lambda evt: self.file_list_frame.on_up(evt, add=True)
+        )
+        self.bind_all('<Delete>', self.delete)
+        self.bind_all('<Left>', self.copy_right_to_left)
+        self.bind_all('<Right>', self.copy_left_to_right)
 
     def destroy(self, *evt):
         self.file_list_frame.signal_shutdown()
@@ -96,11 +91,11 @@ class DirDiffMainWindow(tk.Tk):
         if leftdir and rightdir:
             self.file_list_frame.after_idle(self.file_list_frame.load_files)
 
-    def delete(self):
+    def delete(self, evt=None):
         for file_path in self.file_list_frame.file_treeview.selection():
             self.file_list_frame.delete(file_path)
 
-    def copy_left_to_right(self):
+    def copy_left_to_right(self, evt=None):
         for file_path in self.file_list_frame.file_treeview.selection():
             if comparator := self.file_list_frame.files.get(file_path, None):
                 if comparator is self.image_frame.comparator:
@@ -111,7 +106,7 @@ class DirDiffMainWindow(tk.Tk):
                     comparator.copy_left_to_right()
                     self.update_item(file_path, comparator)
 
-    def copy_right_to_left(self):
+    def copy_right_to_left(self, evt=None):
         for file_path in self.file_list_frame.file_treeview.selection():
             if comparator := self.file_list_frame.files.get(file_path, None):
                 if comparator is self.image_frame.comparator:

{imdiff-0.2.0 → imdiff-0.2.3}/imdiff/gui/file_list_frame.py

@@ -6,10 +6,12 @@ import pathlib
 import threading
 import time
 import queue
+import subprocess
 import sys
 
 import tkinter as tk
-from tkinter import filedialog, font, ttk
+from tkinter import filedialog
+import ttkbootstrap as ttk
 
 from ..list_files import list_image_files
 from ..util import Size, separate_thread
@@ -64,15 +66,26 @@ class FileListFrame(ttk.Frame):
         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)
-        self.button_choose_right_dir = ttk.Button(self, text=f'{self.right_label.capitalize()}...', command=self.askrightdir)
+        self.button_choose_left_dir = ttk.Button(
+            self, text=f'{self.left_label.capitalize()}...', command=self.askleftdir
+        )
+        self.button_choose_right_dir = ttk.Button(
+            self, text=f'{self.right_label.capitalize()}...', command=self.askrightdir
+        )
+        self.button_text_diff = ttk.Button(
+            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.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')
-        w = font.Font().measure(' Stat (▲) ')
-        self.file_treeview.column('stat', width=w, minwidth=w, stretch=False, anchor='center')
+        w = tk.font.Font().measure(' Stat (▲) ')
+        self.file_treeview.column(
+            'stat', width=w, minwidth=w, stretch=False, anchor='center'
+        )
 
         self.file_treeview.tag_configure('identical', foreground='black')
         self.file_treeview.tag_configure('missing', foreground='orange')
@@ -83,8 +96,12 @@ class FileListFrame(ttk.Frame):
         self.file_treeview.tag_configure('different', foreground='red')
         self.file_treeview.tag_configure('similar', foreground='black')
 
-        self.xscroll = ttk.Scrollbar(self.treeview_frame, orient=tk.HORIZONTAL, command=self.file_treeview.xview)
-        self.yscroll = ttk.Scrollbar(self.treeview_frame, orient=tk.VERTICAL, command=self.file_treeview.yview)
+        self.xscroll = ttk.Scrollbar(
+            self.treeview_frame, orient=tk.HORIZONTAL, command=self.file_treeview.xview
+        )
+        self.yscroll = ttk.Scrollbar(
+            self.treeview_frame, orient=tk.VERTICAL, command=self.file_treeview.yview
+        )
 
         self.file_treeview['xscrollcommand'] = self.xscroll.set
         self.file_treeview['yscrollcommand'] = self.yscroll.set
@@ -99,8 +116,9 @@ class FileListFrame(ttk.Frame):
         self.treeview_frame.columnconfigure(0, weight=1)
         self.treeview_frame.rowconfigure(0, weight=1)
 
-        self.button_choose_left_dir.grid(column=0, row=0, sticky='nw')
-        self.button_choose_right_dir.grid(column=1, row=0, sticky='nw')
+        self.button_choose_left_dir.grid(column=0, row=0, padx=5, pady=5, sticky='nw')
+        self.button_choose_right_dir.grid(column=1, row=0, padx=5, pady=5, sticky='nw')
+        self.button_text_diff.grid(column=2, row=0, padx=5, pady=5, sticky='ne')
         self.treeview_frame.grid(column=0, row=1, columnspan=3, sticky='nsew')
 
         self.columnconfigure(2, weight=1)
@@ -108,10 +126,9 @@ class FileListFrame(ttk.Frame):
 
     def bind_events(self):
         self.file_treeview.bind('<<TreeviewSelect>>', self.on_select)
-        self.file_treeview.bind("<Down>", self.on_down)
-        self.file_treeview.bind("<Shift-Down>", lambda evt: self.on_down(evt, add=True))
-        self.file_treeview.bind("<Up>", self.on_up)
-        self.file_treeview.bind("<Shift-Up>", lambda evt: self.on_up(evt, add=True))
+        self.file_treeview.unbind_class('Treeview', '<Down>')
+        self.file_treeview.unbind_class('Treeview', '<Up>')
+        self.file_treeview.unbind_class('Treeview', '<Right>')
 
     def on_down(self, evt, add=False):
         if sel := self.file_treeview.selection():
@@ -153,7 +170,7 @@ class FileListFrame(ttk.Frame):
             self.yscroll,
         )
         w = sum([w.winfo_width() for w in widgets])
-        return Size((w, 400))
+        return Size((w + 600, 400))
 
     def askleftdir(self):
         if topdir := filedialog.askdirectory(initialdir=self.leftdir):
@@ -165,6 +182,9 @@ class FileListFrame(ttk.Frame):
             self.rightdir = pathlib.Path(topdir)
             self.load_files()
 
+    def textdiff(self):
+        subprocess.Popen(('meld', self.leftdir, self.rightdir))
+
     def signal_shutdown(self):
         self.file_queue.status = IterableQueue.Status.Inactive
         self.file_processing_queue.status = IterableQueue.Status.Inactive
@@ -191,7 +211,7 @@ class FileListFrame(ttk.Frame):
         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 * font.Font().measure(file_path))
+        item_width = int(0.85 * tk.font.Font().measure(file_path))
         if item_width > col_width:
             self.file_treeview.column('#0', width=item_width)
 
@@ -235,7 +255,9 @@ class FileListFrame(ttk.Frame):
     @separate_thread
     def process_files(self):
         assert self.file_properties_queue.status == IterableQueue.Status.Filling
-        with concurrent.futures.ThreadPoolExecutor(max_workers=multiprocessing.cpu_count()) as executor:
+        with concurrent.futures.ThreadPoolExecutor(
+            max_workers=multiprocessing.cpu_count()
+        ) as executor:
             self.executor = executor
             try:
                 jobs = []
@@ -259,11 +281,14 @@ class FileListFrame(ttk.Frame):
         self.progress_bar.grid_forget()
 
     def set_file_properties(self, file_path, category, diff_info):
-        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))
+        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}')
 
     @separate_thread
     def update_properties(self):
@@ -284,26 +309,31 @@ class FileListFrame(ttk.Frame):
         self.process_files()
         self.update_properties()
 
+    def select_next(self):
+        select_next = None
+        if sel := self.file_treeview.selection():
+            curitem = sel[-1]
+            select_next = (
+                self.file_treeview.next(curitem)
+                or self.file_treeview.prev(curitem)
+            )
+        if select_next:
+            self.file_treeview.selection_add(select_next)
+            self.file_treeview.focus(select_next)
+            self.file_treeview.see(select_next)
+        else:
+            self.file_treeview.selection_set()
+        self.on_select()
+
     def delete_entry(self, file_path):
         del self.files[file_path]
         self.file_entries.remove(file_path)
         try:
-            select_next = None
             if sel := self.file_treeview.selection():
                 curitem = sel[-1]
                 if curitem == file_path:
-                    select_next = (
-                        self.file_treeview.next(curitem)
-                        or self.file_treeview.prev(curitem)
-                    )
+                    self.select_next()
             self.file_treeview.delete(file_path)
-            if select_next:
-                self.file_treeview.selection_add(select_next)
-                self.file_treeview.focus(select_next)
-                self.file_treeview.see(select_next)
-            else:
-                self.file_treeview.selection_set()
-            self.on_select()
         except tk.TclError:
             log.debug(f'ignoring attempt to delete nonexistant entry: {file_path}')
 
@@ -320,11 +350,14 @@ class FileListFrame(ttk.Frame):
             try:
                 file_path = str(pathlib.Path(file_path).relative_to(self.rightdir))
             except ValueError:
-                file_path = str(pathlib.Path(file_path).relative_to(self.leftdir))
+                try:
+                    file_path = str(pathlib.Path(file_path).relative_to(self.leftdir))
+                except ValueError:
+                    assert not file_path.is_absolute()
 
         if (
-                not (self.leftdir/file_path).exists()
-            and not (self.rightdir/file_path).exists()
+            not (self.leftdir / file_path).exists()
+            and not (self.rightdir / file_path).exists()
         ):
             self.delete(file_path)
             return
@@ -336,32 +369,47 @@ class FileListFrame(ttk.Frame):
         tv = self.file_treeview
         l = [(pathlib.Path(tv.item(k)['text']), k) for k in tv.get_children()]
         maxparts = max(len(p.parts) for p, _ in l)
+
         def transform_key(key, nparts=nparts):
             p = key[0].parts
             if -len(p) <= nparts < len(p):
                 return (str(pathlib.Path(*p[nparts:])), str(pathlib.Path(*p[:nparts])))
             else:
                 return (str(p),)
+
         l.sort(key=transform_key, reverse=reverse)
         for index, (val, k) in enumerate(l):
             tv.move(k, '', index)
+        tv.column('#0', anchor=(tk.E if nparts < 0 else tk.W))
         if reverse:
             next_args = (-maxparts if nparts == (maxparts - 1) else (nparts + 1), False)
         else:
             next_args = (nparts, True)
-        tv.heading('#0', text=f'File ({"▼" if reverse else "▲"}{nparts or ""})',
-                   command=lambda: self.sort_filepaths(*next_args))
+        tv.heading(
+            '#0',
+            text=f'File ({"▼" if reverse else "▲"}{nparts or ""})',
+            command=lambda: self.sort_filepaths(*next_args),
+        )
         tv.heading('stat', text='Stat')
 
     def sort_stat(self, reverse):
         tv = self.file_treeview
-        colindex = tv["columns"].index('stat')
-        l = [(tv.item(k)['values'][colindex], k) for k in tv.get_children()]
+        colindex = tv['columns'].index('stat')
+        try:
+            l = [(tv.item(k)['values'][colindex], k) for k in tv.get_children()]
+        except IndexError:
+            # do not sort if we are in the proccess of updating the diffs
+            return
+
         def transform_key(key):
             return ('F', 'L', 'D', 'S', '+', '~', '-', '=').index(key[0])
+
         l.sort(key=transform_key, reverse=reverse)
         for index, (val, k) in enumerate(l):
             tv.move(k, '', index)
         tv.heading('#0', text='File')
-        tv.heading('stat', text=f'Stat ({"▼" if reverse else "▲"})',
-                   command=lambda: self.sort_stat(not reverse))
+        tv.heading(
+            'stat',
+            text=f'Stat ({"▼" if reverse else "▲"})',
+            command=lambda: self.sort_stat(not reverse),
+        )

{imdiff-0.2.0 → imdiff-0.2.3}/imdiff/gui/image_canvas.py

@@ -73,11 +73,17 @@ class ImageCanvas(tk.Canvas):
             else:
                 image_size = Size((self.image.width, self.image.height))
                 canvas_size = Size((self.winfo_width(), self.winfo_height()))
-                if canvas_size.width > 0 and canvas_size.height > 0:
-                    border_size = Size((2 * self.border, 2 * self.border))
-                    scaled_size = self.scaling.scaled(image_size, canvas_size - border_size)
-                    if self.scaled_image is None or scaled_size != Size((self.scaled_image.width, self.scaled_image.height)):
-                        self.scaling_percent = int(100 * scaled_size.width / image_size.width)
+                border_size = Size((2 * self.border, 2 * self.border))
+                scaled_size = self.scaling.scaled(
+                    image_size, canvas_size - border_size
+                )
+                if scaled_size.width > 0 and scaled_size.height > 0:
+                    if self.scaled_image is None or scaled_size != Size(
+                        (self.scaled_image.width, self.scaled_image.height)
+                    ):
+                        self.scaling_percent = int(
+                            100 * scaled_size.width / image_size.width
+                        )
                         self.scaled_image = self.image.resize(scaled_size)
                         log.debug(f'[{self.label}] scale to {self.scaling_percent}%')
                         self.scaled_image_updated = True
@@ -88,7 +94,9 @@ class ImageCanvas(tk.Canvas):
             log.debug(f'[{self.label}] removed scaled image')
 
     def update_displayed_image(self):
-        log.debug(f'[{self.label}] update displayed image (scaled image: {self.scaled_image}')
+        log.debug(
+            f'[{self.label}] update displayed image (scaled image: {self.scaled_image}'
+        )
         if self.image:
             if self.scaled_image and self.scaled_image_updated:
                 self.tkimage = ImageTk.PhotoImage(self.scaled_image)
@@ -96,14 +104,18 @@ class ImageCanvas(tk.Canvas):
                     self.itemconfig(self.image_id, image=self.tkimage)
                     log.debug(f'[{self.label}] updated displayed image')
                 else:
-                    self.image_id = self.create_image(self.border, self.border, image=self.tkimage, anchor='nw')
+                    self.image_id = self.create_image(
+                        self.border, self.border, image=self.tkimage, anchor='nw'
+                    )
                     log.debug(f'[{self.label}] displaying new image')
         else:
             self.clear()
             log.debug(f'[{self.label}] removed scaled image')
 
     def update_layout(self):
-        log.debug(f'[{self.label}] update layout (image id: {self.image_id} scaled image: {self.scaled_image})')
+        log.debug(
+            f'[{self.label}] update layout (image id: {self.image_id} scaled image: {self.scaled_image})'
+        )
         if self.image_id and self.scaled_image:
             w = self.winfo_width()
             h = self.winfo_height()
@@ -112,8 +124,16 @@ class ImageCanvas(tk.Canvas):
             self.is_draggable = (w < iw) or (h < ih)
             if self.position is None:
                 self.position = Coordinates(self.coords(self.image_id))
-            self.position.x = min(max(self.position.x, w - iw - self.border), self.border) if (w < iw) else ((w - iw) // 2)
-            self.position.y = min(max(self.position.y, h - ih - self.border), self.border) if (h < ih) else ((h - ih) // 2)
+            self.position.x = (
+                min(max(self.position.x, w - iw - self.border), self.border)
+                if (w < iw)
+                else ((w - iw) // 2)
+            )
+            self.position.y = (
+                min(max(self.position.y, h - ih - self.border), self.border)
+                if (h < ih)
+                else ((h - ih) // 2)
+            )
             if self.position != Coordinates(self.coords(self.image_id)):
                 log.debug(f'[{self.label}] move to {self.position}')
                 self.moveto(self.image_id, self.position.x, self.position.y)

imdiff-0.2.3/imdiff/gui/image_diff_main_window.py

@@ -0,0 +1,54 @@
+import logging
+import os
+import platform
+import sys
+
+import tkinter as tk
+import ttkbootstrap as ttk
+
+from .image_frame import ImageFrame
+from .status_bar import StatusBar
+
+
+log = logging.getLogger(__name__)
+
+
+class ImageDiffMainWindow(tk.Tk):
+    def __init__(self, left_label='left', right_label='right'):
+        super().__init__()
+        self.title('Image Comparator')
+        self.image_frame = ImageFrame(self)
+        self.image_frame.add_standard_operate_buttons()
+        self.status_bar = StatusBar(self)
+        self.layout()
+        self.bind_events()
+
+    def layout(self):
+        self.image_frame.grid(column=0, row=0, sticky='nsew')
+        self.status_bar.grid(column=0, row=1,  sticky='sew')
+        self.columnconfigure(0, weight=1)
+        self.rowconfigure(0, weight=1)
+
+        self.wait_visibility()
+
+        image_frame_minsize = self.image_frame.minsize()
+        w = image_frame_minsize.width
+        h = image_frame_minsize.height
+        self.minsize(w, h)
+
+    def bind_events(self):
+        self.bind_all('<Control-q>', self.destroy)
+        self.bind_all('<Control-c>', self.destroy)
+        self.bind_all('<Escape>', self.destroy)
+        self.bind_all('<Delete>', self.image_frame.delete)
+        self.bind_all('<Left>', self.image_frame.copy_left_to_right)
+        self.bind_all('<Right>', self.image_frame.copy_right_to_left)
+
+    def destroy(self, *evt):
+        super().destroy()
+        sys.exit()
+
+    def load(self, left=None, right=None):
+        self.image_frame.load_images(left, right)
+        if comp := self.image_frame.comparator:
+            self.after_idle(self.status_bar.update_labels, comp)