wip

Author: pynappo

lua/neo-tree/sources/filesystem/lib/fs_actions.lua

@@ -736,15 +736,15 @@ M.delete_nodes = function(paths_to_delete, callback)
   end)
 end
 
-M.trash_node = function(path, callback, noconfirm)
+M.trash_node = function(path, callback)
   local _, name = utils.split_path(path)
 
   log.trace("Deleting node:", path)
   local _type = "unknown"
   local stat = uv.fs_lstat(path)
   local children_count = 0
   if not stat then
-    log.warn("Could not read file/dir:", path, stat, ", attempting to delete anyway...")
+    log.warn("Could not read file/dir:", path, stat, ", attempting to trash anyway...")
     -- Guess the type by whether it appears to have an extension
     if path:match("%.(.+)$") then
       _type = "file"
@@ -775,7 +775,7 @@ M.trash_node = function(path, callback, noconfirm)
     end
   end
 
-  local do_delete = function()
+  local do_trash = function()
     local complete = vim.schedule_wrap(function()
       events.fire_event(events.FILE_DELETED, path)
       if callback then
@@ -789,80 +789,47 @@ M.trash_node = function(path, callback, noconfirm)
       return
     end
 
-    if _type ~= "directory" then
-      local success = uv.fs_unlink(path)
-      if not success then
-        return log.error("Could not remove file: " .. path)
-      end
-      clear_buffer(path)
-    else
-      -- first try using native system commands, which are recursive
-      local success = false
-      if utils.is_windows then
-        local delete_ok, result =
-          utils.execute_command({ "cmd.exe", "/c", "rmdir", "/s", "/q", vim.fn.shellescape(path) })
-        if not delete_ok then
-          log.debug("Could not delete directory '", path, "' with rmdir: ", result)
-        else
-          log.info("Deleted directory ", path)
-          success = true
-        end
-      else
-        local delete_ok, result = utils.execute_command({ "rm", "-Rf", path })
-        if not delete_ok then
-          log.debug("Could not delete directory '", path, "' with rm: ", result)
-        else
-          log.info("Deleted directory ", path)
-          success = true
-        end
-      end
-
-      -- Fallback to using libuv if native commands fail
-      if not success then
-        success = delete_dir(path)
-        if not success then
-          return log.error("Could not remove directory: " .. path)
-        end
-      end
+    local success, err = trash.trash({ path })
+    if not success then
+      log.error("Could not trash " .. path, err)
+      return
     end
+
     complete()
   end
 
-  if noconfirm then
-    do_delete()
-  else
-    local msg = string.format("Are you sure you want to delete '%s'?", name)
-    if children_count > 0 then
-      msg = ("WARNING: Dir has %s %s! %s"):format(
-        children_count,
-        children_count == 1 and "child" or "children",
-        msg
-      )
-    end
-    inputs.confirm(msg, function(confirmed)
-      if confirmed then
-        do_delete()
-      end
-    end)
+  local msg = string.format("Are you sure you want to trash '%s'?", name)
+  if children_count > 0 then
+    msg = ("WARNING: Dir has %s %s! %s"):format(
+      children_count,
+      children_count == 1 and "child" or "children",
+      msg
+    )
   end
+  inputs.confirm(msg, function(confirmed)
+    if confirmed then
+      do_trash()
+    end
+  end)
 end
 
----@param paths_to_delete string[]
+---@param paths_to_trash string[]
 ---@param callback fun(path)?
-M.trash_nodes = function(paths_to_delete, callback)
-  local msg = "Are you sure you want to delete " .. #paths_to_delete .. " items?"
+M.trash_nodes = function(paths_to_trash, callback)
+  local msg = "Are you sure you want to delete " .. #paths_to_trash .. " items?"
   inputs.confirm(msg, function(confirmed)
     if not confirmed then
       return
     end
 
-    for _, path in ipairs(paths_to_delete) do
-      M.trash_node(path, nil, true)
+    local success, err = trash.trash(paths_to_trash)
+    if not success then
+      log.error(err)
     end
 
     if callback then
       vim.schedule(function()
-        callback(paths_to_delete[#paths_to_delete])
+        callback(paths_to_trash[#paths_to_trash])
       end)
     end
   end)

lua/neo-tree/sources/filesystem/lib/trash-freedesktop.lua

@@ -99,7 +99,8 @@ local function update_trash_size_cache(trash_dir, files_dir, info_dir)
     for line in f:lines() do
       local size, mtime, name = line:match("(%d+) (%d+) (.+)")
       if size and mtime and name then
-        hash[name] = {
+        hash[vim.uri_decode(name, "rfc2396")] = {
+
           size = tonumber(size),
           mtime = tonumber(mtime),
           seen = false,
@@ -151,24 +152,29 @@ local function update_trash_size_cache(trash_dir, files_dir, info_dir)
 
   -- 3. Write out hash back to temporary directorysizes file
   local out = io.open(tmp_cache_path, "w")
-  if out then
-    for name, data in pairs(hash) do
-      if data.seen then
-        out:write(string.format("%d %d %s\n", data.size, data.mtime, name))
-      end
+  if not out then
+    return nil, "Could not update directorysizes file"
+  end
+  for name, data in pairs(hash) do
+    if data.seen then
+      out:write(string.format("%d %d %s\n", data.size, data.mtime, name))
     end
-    out:close()
+  end
+  out:close()
 
-    -- 4. Atomic rename into place
-    local success, err = uv.fs_rename(tmp_cache_path, cache_file_path)
-    if not success then
-      return nil, "Failed to update cache file: " .. (err or "unknown error")
-    end
+  -- 4. Atomic rename into place
+  local success, err = uv.fs_rename(tmp_cache_path, cache_file_path)
+  if not success then
+    return nil, "Failed to update cache file: " .. (err or "unknown error")
   end
 
   return total_size
 end
 
+local function restorer(paths)
+  return function(paths) end
+end
+---@type neotree.trash.FunctionGenerator
 return function(paths)
   if utils.is_windows then
     log.warn("Freedesktop trash module does not support Windows.")
@@ -180,11 +186,17 @@ return function(paths)
   local setup = ensure_writable_dir(trash_dir)
     and ensure_writable_dir(trash_files_dir)
     and ensure_writable_dir(trash_info_dir)
+
   if not setup then
     return nil
   end
+
+  if vim.fn.has("nvim-0.10") == 0 then
+    -- Requires neovim 0.10 for vim.uri module
+    return nil
+  end
   -- Roughly check that all of these are on the same device.
-  -- This rough check should be fine because if one of the paths contains a mountpoint then the move will fail anyways.
+  -- This check should be fine because if one of the paths contains a mountpoint then the move will fail anyways.
   local trash_dir_dev = get_dev(trash_dir)
   if get_dev(trash_files_dir) ~= trash_dir_dev or get_dev(trash_info_dir) ~= trash_dir_dev then
     log.at.warn.format(
@@ -206,7 +218,6 @@ return function(paths)
       return nil
     end
   end
-
   return function()
     for i, path in ipairs(paths) do
       local _, filename = utils.split_path(path)
@@ -225,7 +236,7 @@ return function(paths)
 Path=%s
 DeletionDate=%s"
 ]],
-        path,
+        vim.uri_encode(path, "rfc2396"),
         os.date("%Y%m%dT%H:%M:%S")
       )
 
@@ -245,7 +256,7 @@ DeletionDate=%s"
         return false, "Failed to move file to trash: " .. (move_err or "unknown error")
       end
     end
-    update_trash_size_cache(trash_dir, trash_files_dir, trash_info_dir)
+    assert(update_trash_size_cache(trash_dir, trash_files_dir, trash_info_dir))
 
     return true
   end

lua/neo-tree/sources/filesystem/lib/trash.lua

@@ -188,4 +188,7 @@ M.trash = function(paths)
   return false, "No trash commands or functions worked."
 end
 
+---@param paths string The paths in the actual trash
+M.restore = function(paths) end
+
 return M