serialize opts

Author: phanen

lua/fzf-lua/libuv.lua

@@ -86,6 +86,11 @@ end
 ---@field process1? boolean
 ---@field profiler? boolean
 
+local gen_uuid = function()
+  -- return uv.random(10)
+  return uv.hrtime()
+end
+
 ---@param opts fzf-lua.SpawnOpts
 ---@param fn_transform function?
 ---@param fn_done function?
@@ -200,10 +205,11 @@ M.spawn = function(opts, fn_transform, fn_done)
     end)
   end
 
-  local abc = require("fzf-lua.libuv").serialize(opts, false)
+  local uuid = gen_uuid() -- distinguish two call when use worker pool
+  local optstr = require("fzf-lua.libuv").serialize({ t = fn_transform, opts = opts.opts }, false)
   ---@param data string data stream
   ---@return string, string? line array, partial last line (no EOL)
-  local function split_lines(data, o)
+  local function split_lines(data, o, id)
     -- io.stderr:write("[DEBUG] worker init")
     if not _G.fzf_lua_worker_init then
       -- TODO: we can pass serialize opts to first queue...
@@ -214,18 +220,25 @@ M.spawn = function(opts, fn_transform, fn_done)
       require("fzf-lua.make_entry")
       _G.fzf_lua_worker_init = true
     end
-    local trans = require("fzf-lua.make_entry").file
-    local opts = _G._opts
+    if id ~= _G.uuid then -- refresh opts
+      local d = require("fzf-lua.libuv").deserialize(o, false)
+      _G.trans = d.t
+      _G.opts = d.opts
+      _G.uuid = id
+    end
+    -- local trans = require("fzf-lua.make_entry").file
+    -- local worker_opts = assert(_G.fzf_lua_worker_opts, "no opts")
+    local trans = _G.trans
+    local opts = _G.opts
     local ret = {}
     local start_idx = 1
     repeat
       local nl_idx = data:find(EOL_data or "\n", start_idx, true)
       if nl_idx then
         local cr = data:byte(nl_idx - 1, nl_idx - 1) == 13 -- \r
         local line = data:sub(start_idx, nl_idx - (cr and 2 or 1))
-        if trans then
-          line = trans(line, opts)
-        end
+        -- line = trans(line, worker_opts)
+        if trans then line = trans(line, opts) end
         if line then ret[#ret + 1] = line end
         start_idx = nl_idx + 1
       end
@@ -245,7 +258,7 @@ M.spawn = function(opts, fn_transform, fn_done)
         if len == 0 then return end
         if ref[len - 1] ~= EOL_byte then strbuf:put(EOL_byte) end -- make split_lines happy
         write_cb_count = write_cb_count + 1
-        return work_ctx:queue(strbuf:get())
+        return work_ctx:queue(strbuf:get(), optstr, uuid)
       end
       local eol = len
       for i = len - 1, stop, -1 do
@@ -261,7 +274,7 @@ M.spawn = function(opts, fn_transform, fn_done)
         local data = strbuf:get(eol + 1)
         stop = #strbuf
         write_cb_count = write_cb_count + 1
-        work_ctx:queue(data)
+        work_ctx:queue(data, optstr, uuid)
       end
     end
     if can_finish() then finish(0, 0, "[EOF]", pid) end
@@ -329,7 +342,7 @@ M.deserialize = function(str, b64)
   res = b64 ~= false and base64.decode(res) or res
   -- safe=false enable call function
   local _, obj = serpent.load(res, { safe = false })
-  assert(type(obj) == "table")
+  assert(type(obj) == "table", vim.inspect(obj))
   return obj
 end
 
@@ -572,10 +585,12 @@ M.spawn_stdio = function(opts)
       process1 = opts.process1,
       profiler = opts.profiler,
       EOL = EOL,
+      opts = opts,
     },
-    fn_transform and function(x)
-      return fn_transform(x, opts)
-    end)
+    fn_transform)
+  -- fn_transform and function(x)
+  --   return fn_transform(x, opts)
+  -- end)
 end
 
 

lua/fzf-lua/make_entry.lua

@@ -76,7 +76,7 @@ local opts2 = setmetatable({}, {
   end
 })
 
-if _G._fzf_lua_is_headless then
+if _G._fzf_lua_is_headless or vim.is_thread() then
   local _config = load_config() or {} ---@module 'fzf-lua.config'
   ---@diagnostic disable-next-line: missing-fields
   _config.globals = { git = {}, files = {}, grep = {} }
@@ -567,6 +567,11 @@ M.file = function(x, opts)
   local ret = {}
   local icon, hl
   local colon_start_idx = 1
+
+  local path = FzfLua.path
+  local utils = FzfLua.utils
+  local devicons = FzfLua.devicons
+  -- print(vim.inspect(opts))
   if utils.__IS_WINDOWS then
     if string.byte(x, #x) == 13 then
       -- strip ^M added by the "dir /s/b" command

lua/fzf-lua/shell.lua

@@ -410,16 +410,18 @@ M.stringify = function(contents, opts, fzf_field_index)
         cmd = contents,
         env = env,
         cb_finish = on_finish,
-        cb_write_lines = on_write,
+        -- cb_write_lines = on_write,
+        cb_write = on_write,
         cb_pid = function(pid) if opts.PidObject then opts.PidObject:set(pid) end end,
         process1 = opts.process1,
         profiler = opts.profiler,
         use_queue = opts.use_queue,
         EOL = EOL,
+        opts = opts,
         -- Must send value, 'coroutinify' adds callback as last argument
         -- which will conflict with the 'fn_transform' argument
         -- send true to force line processing without transformation
-      }, true)
+      }, fn_transform)
     else
       -- callback with newline
       local on_write_nl = function(data, cb)