From 6d038f5cdfc8528b4e2a02bd4b4d5fe4c1c8d7b9 Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Wed, 9 May 2018 20:12:39 +0530 Subject: [PATCH] Pass the image manager to the render code --- kittens/diff/main.py | 2 +- kittens/diff/render.py | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/kittens/diff/main.py b/kittens/diff/main.py index 34cb53084..98a223d67 100644 --- a/kittens/diff/main.py +++ b/kittens/diff/main.py @@ -68,7 +68,7 @@ class DiffHandler(Handler): self.start_job('diff', generate_diff, self.collection, self.current_context_count) def render_diff(self): - self.diff_lines = tuple(render_diff(self.collection, self.diff_map, self.args, self.screen_size.cols)) + self.diff_lines = tuple(render_diff(self.collection, self.diff_map, self.args, self.screen_size.cols, self.image_manager)) self.ref_path_map = defaultdict(list) for i, l in enumerate(self.diff_lines): self.ref_path_map[l.ref.path].append((i, l.ref)) diff --git a/kittens/diff/render.py b/kittens/diff/render.py index 99606d760..fc49c4ef9 100644 --- a/kittens/diff/render.py +++ b/kittens/diff/render.py @@ -353,12 +353,12 @@ def rename_lines(path, other_path, args, columns, margin_size): yield m + line -def image_lines(left_path, right_path, columns, margin_size): +def image_lines(left_path, right_path, columns, margin_size, image_manager): if False: yield 0 -def render_diff(collection, diff_map, args, columns): +def render_diff(collection, diff_map, args, columns, image_manager): largest_line_number = 0 for path, item_type, other_path in collection: if item_type == 'diff': @@ -377,7 +377,7 @@ def render_diff(collection, diff_map, args, columns): if item_type == 'diff': if is_binary: if is_img: - ans = image_lines(path, other_path, columns, margin_size) + ans = image_lines(path, other_path, columns, margin_size, image_manager) else: ans = yield_lines_from(binary_lines(path, other_path, columns, margin_size), item_ref) else: @@ -385,7 +385,7 @@ def render_diff(collection, diff_map, args, columns): elif item_type == 'add': if is_binary: if is_img: - ans = image_lines(None, path, columns, margin_size) + ans = image_lines(None, path, columns, margin_size, image_manager) else: ans = yield_lines_from(binary_lines(None, path, columns, margin_size), item_ref) else: @@ -393,7 +393,7 @@ def render_diff(collection, diff_map, args, columns): elif item_type == 'removal': if is_binary: if is_img: - ans = image_lines(path, None, columns, margin_size) + ans = image_lines(path, None, columns, margin_size, image_manager) else: ans = yield_lines_from(binary_lines(path, None, columns, margin_size), item_ref) else: