Skip to content

Commit

Permalink
Fix ordering of image converters
Browse files Browse the repository at this point in the history
Lua tables (maps) are not order-preserving unless they have
numeric keys, which means that arbitrarily, either imagemagick
or drawio could be used to convert a '.drawio.svg' file.

This change removes the table-based converterFor logic and replaces it
with a simpler if-statement based routine.
  • Loading branch information
chrisfenner committed Apr 9, 2024
1 parent d99306b commit 546e93f
Showing 1 changed file with 9 additions and 14 deletions.
23 changes: 9 additions & 14 deletions filter/convert-images.lua
Original file line number Diff line number Diff line change
Expand Up @@ -42,38 +42,33 @@ end
-- Wrap calls to drawio in xvfb-run. Note that --no-sandbox has to be the last argument.
-- https://github.com/jgraph/drawio-desktop/issues/249
function drawio(source, dest)
print(string.format('converting %s using drawio...', source))
if not runCommandSuppressOutput(string.format("xvfb-run -a drawio -x -f pdf -o %s %s --no-sandbox 2>&1", dest, source)) then
print(string.format('failed to convert %s to %s using drawio, falling back to letting latex try to pick it up', img.src, new_filename))
print(string.format('failed to convert %s to %s using drawio, falling back to letting latex try to pick it up', source, dest))
return false
end
return true
end

function imagemagick(source, dest)
print(string.format('converting %s using imagemagick...', source))
if not runCommandSuppressOutput(string.format("convert -density 300 %s %s 2>&1", source, dest)) then
print(string.format('failed to convert %s to %s using imagemagick, falling back to letting latex try to pick it up', img.src, new_filename))
print(string.format('failed to convert %s to %s using imagemagick, falling back to letting latex try to pick it up', source, dest))
return false
end
return true
end

local converters = {
['.drawio'] = drawio,
['.drawio.svg'] = drawio,
['.jpg'] = imagemagick,
['.png'] = imagemagick,
['.svg'] = imagemagick
}

function string:hassuffix(suffix)
return self:sub(-#suffix) == suffix
end

function converterFor(filename)
for suffix, handler in pairs(converters) do
if filename:hassuffix(suffix) then
return handler
end
if filename:hassuffix('.drawio') or filename:hassuffix('.drawio.svg') then
return drawio
end
if filename:hassuffix('.jpg') or filename:hassuffix('.png') or filename:hassuffix('.svg') then
return imagemagick
end
return nil
end
Expand Down

0 comments on commit 546e93f

Please sign in to comment.