KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Ensure IM outputs multiple images in rgba format

Browse Source
This commit is contained in:
Kovid Goyal 2021-02-04 11:23:54 +05:30
parent b72dbc973d
commit e5ef9d9062
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
kittens/tui/images.py
View File

@ -142,13 +142,14 @@ def render_image(
only_first_frame: bool = False only_first_frame: bool = False
) -> RenderedImage: ) -> RenderedImage:
import tempfile import tempfile
has_multiple_frames = len(m) > 1
get_multiple_frames = has_multiple_frames and not only_first_frame
exe = find_exe('convert') exe = find_exe('convert')
if exe is None: if exe is None:
raise OSError('Failed to find the ImageMagick convert executable, make sure it is present in PATH') raise OSError('Failed to find the ImageMagick convert executable, make sure it is present in PATH')
cmd = [exe, '-background', 'none', '--', path] cmd = [exe, '-background', 'none', '--', path]
index_of_path_in_cmd = len(cmd) - 1 if only_first_frame and has_multiple_frames:
if only_first_frame and len(m) > 1: cmd[-1] += '[0]'
cmd[index_of_path_in_cmd] += '[0]'
scaled = False scaled = False
width, height = m.width, m.height width, height = m.width, m.height
if scale_up: if scale_up:
@ -159,7 +160,7 @@ def render_image(
if scaled or width > available_width or height > available_height: if scaled or width > available_width or height > available_height:
width, height = fit_image(width, height, available_width, available_height) width, height = fit_image(width, height, available_width, available_height)
resize_cmd = ['-resize', '{}x{}!'.format(width, height)] resize_cmd = ['-resize', '{}x{}!'.format(width, height)]
if not only_first_frame and len(m.frames) > 1: if get_multiple_frames:
# we have to coalesce, resize and de-coalesce all frames # we have to coalesce, resize and de-coalesce all frames
resize_cmd = ['-coalesce'] + resize_cmd + ['-deconstruct'] resize_cmd = ['-coalesce'] + resize_cmd + ['-deconstruct']
cmd += resize_cmd cmd += resize_cmd
@ -190,10 +191,14 @@ def render_image(
with tempfile.TemporaryDirectory(dir=os.path.dirname(output_prefix)) as tdir: with tempfile.TemporaryDirectory(dir=os.path.dirname(output_prefix)) as tdir:
output_template = os.path.join(tdir, f'im-%[filename:f]-%d.{m.mode}') output_template = os.path.join(tdir, f'im-%[filename:f]-%d.{m.mode}')
if get_multiple_frames:
cmd.append('+adjoin')
run_imagemagick(path, cmd + [output_template]) run_imagemagick(path, cmd + [output_template])
unseen = {x.index for x in m}
for x in os.listdir(tdir): for x in os.listdir(tdir):
parts = x.split('.', 1)[0].split('-') parts = x.split('.', 1)[0].split('-')
index = int(parts[-1]) index = int(parts[-1])
unseen.discard(index)
f = ans.frames[index] f = ans.frames[index]
f.width, f.height = map(positive_int, parts[1:3]) f.width, f.height = map(positive_int, parts[1:3])
sz, pos = parts[3].split('+', 1) sz, pos = parts[3].split('+', 1)
@ -202,6 +207,8 @@ def render_image(
f.path = output_prefix + f'-{index}.{m.mode}' f.path = output_prefix + f'-{index}.{m.mode}'
os.rename(os.path.join(tdir, x), f.path) os.rename(os.path.join(tdir, x), f.path)
check_resize(f) check_resize(f)
if unseen:
raise ConvertFailed(path, f'Failed to render {len(unseen)} out of {len(m)} frames of animation')
return ans return ans