diff: More work on images

kittens/diff/images.py

@@ -2,9 +2,10 @@
 # vim:fileencoding=utf-8
 # License: GPL v3 Copyright: 2018, Kovid Goyal <kovid at kovidgoyal.net>
 
-import shutil
 import warnings
 
+from ..tui.images import can_display_images
+
 
 class ImageSupportWarning(Warning):
     pass
@@ -13,8 +14,7 @@ class ImageSupportWarning(Warning):
 def images_supported():
     ans = getattr(images_supported, 'ans', None)
     if ans is None:
-        ans = shutil.which('convert') is not None
-        images_supported.ans = ans
+        images_supported.ans = ans = can_display_images()
         if not ans:
             warnings.warn('ImageMagick not found images cannot be displayed', ImageSupportWarning)
     return ans

kittens/diff/main.py

@@ -15,6 +15,7 @@ from kitty.key_encoding import (
 )
 
 from ..tui.handler import Handler
+from ..tui.images import ImageManager
 from ..tui.loop import Loop
 from .collect import create_collection, data_for_path, set_highlight_data
 from .config import init_config
@@ -45,6 +46,8 @@ def generate_diff(collection, context):
 
 class DiffHandler(Handler):
 
+    image_manager_class = ImageManager
+
     def __init__(self, args, opts, left, right):
         self.state = INITIALIZING
         self.opts = opts