Merge pull request #247 from b0o/detection-perf-improvements

Format/size detection performance improvements

.github/workflows/ci.yml

@@ -0,0 +1,22 @@
+name: CI
+on:
+  workflow_dispatch: {}
+  push:
+    branches:
+      - master
+  pull_request:
+    branches:
+      - master
+
+jobs:
+  tests:
+    runs-on: ubuntu-latest
+    timeout-minutes: 5
+    steps:
+      - uses: actions/checkout@v4
+      - uses: rhysd/action-setup-vim@v1
+        with:
+          neovim: true
+          version: nightly
+      - name: Run Tests
+        run: make test

.gitignore

@@ -0,0 +1 @@
+.tests/

Makefile

@@ -0,0 +1,4 @@
+.PHONY: test
+
+test:
+	nvim -l ./tests/busted.lua tests/

lua/image/processors/magick_cli.lua

@@ -13,6 +13,9 @@ end
 local MagickCliProcessor = {}
 
 function MagickCliProcessor.get_format(path)
+  local result = utils.magic.detect_format(path)
+  if result then return result end
+  -- fallback to slower method:
   guard()
   local result = nil
   local stdout = vim.loop.new_pipe()
@@ -76,8 +79,10 @@ function MagickCliProcessor.convert_to_png(path, output_path)
 end
 
 function MagickCliProcessor.get_dimensions(path)
+  local result = utils.dimensions.get_dimensions(path)
+  if result then return result end
+  -- fallback to slower method:
   guard()
-  local result = nil
   local stdout = vim.loop.new_pipe()
   local stderr = vim.loop.new_pipe()
   local output = ""
@@ -281,4 +286,3 @@ function MagickCliProcessor.hue(path, hue, output_path)
 end
 
 return MagickCliProcessor
-

lua/image/processors/magick_rock.lua

@@ -1,3 +1,4 @@
+local utils = require("image/utils")
 local has_magick, magick = pcall(require, "magick")
 
 local function guard()
@@ -10,6 +11,9 @@ end
 local MagickRockProcessor = {}
 
 function MagickRockProcessor.get_format(path)
+  local result = utils.magic.detect_format(path)
+  if result then return result end
+  -- fallback to slower method:
   guard()
   local image = magick.load_image(path)
   local format = image:get_format()
@@ -28,6 +32,9 @@ function MagickRockProcessor.convert_to_png(path, output_path)
 end
 
 function MagickRockProcessor.get_dimensions(path)
+  local result = utils.dimensions.get_dimensions(path)
+  if result then return result end
+  -- fallback to slower method:
   guard()
   local image = magick.load_image(path)
   local width = image:get_width()
@@ -86,4 +93,4 @@ function MagickRockProcessor.hue(path, hue, output_path)
   return out_path
 end
 
-return MagickRockProcessor
+return MagickRockProcessor