11-- https://specifications.freedesktop.org/trash/latest/
22local uv = vim .uv
3- local log = require (" neo-tree.log" ). new ( " trash-freedesktop " )
3+ local log = require (" neo-tree.log" )
44local utils = require (" neo-tree.utils" )
55local xdg = require (" neo-tree.utils.xdg" )
66
@@ -227,7 +227,7 @@ M.calculate_trash_paths = function()
227227end
228228
229229--- @type neotree.trash.RestoreFunctionGenerator
230- M .generate_restorer = function (trashed_filepaths )
230+ M .generate_restorer = function (paths )
231231 local trash_dir , trash_files_dir , trash_info_dir = M .calculate_trash_paths ()
232232 local setup = ensure_writable_dir (trash_dir )
233233 and ensure_writable_dir (trash_files_dir )
@@ -237,24 +237,26 @@ M.generate_restorer = function(trashed_filepaths)
237237 return nil
238238 end
239239 return function ()
240- local restored_filepaths = {}
241- for _ , filepath in ipairs (trashed_filepaths ) do
240+ local restored = {}
241+ for _ , filepath in ipairs (paths ) do
242242 local restored_filepath , err = restore (filepath , trash_info_dir )
243243 if restored_filepath then
244- restored_filepaths [ # restored_filepaths + 1 ] = restored_filepath
244+ restored [ # restored + 1 ] = restored_filepath
245245 elseif err then
246246 log .warn (err )
247247 end
248248 end
249- if restored_filepaths == # trashed_filepaths then
250- if # trashed_filepaths == 1 then
251- log .at .info .format (" Restored %s from trash" , trashed_filepaths )
249+
250+ if # restored == # paths then
251+ if # restored == 1 then
252+ log .at .info .format (" Restored %s from trash" , restored [1 ])
253+ else
254+ log .at .info .format (" Restored %s files from trash" , # paths )
252255 end
253- log .at .info .format (" Restored %s files from trash" , # trashed_filepaths )
254- elseif restored_filepaths < # trashed_filepaths then
255- log .at .info .format (" Restored %s/%s files from trash" , restored_filepaths , # trashed_filepaths )
256+ elseif # restored < # paths then
257+ log .at .info .format (" Restored %s/%s files from trash" , # restored , # paths )
256258 end
257- return restored_filepaths == # trashed_filepaths
259+ return # restored == # paths
258260 end
259261end
260262
0 commit comments