feat(files): add cp/mv commands that take text input, closes #145

Author: cseickel

README.md

@@ -124,6 +124,7 @@ use {
               ["c"] = "copy_to_clipboard",
               ["x"] = "cut_to_clipboard",
               ["p"] = "paste_from_clipboard",
+              ["m"] = "move", -- takes text input for destination
               ["q"] = "close_window",
             }
           }

lua/neo-tree/defaults.lua

@@ -118,6 +118,9 @@ local config = {
         ["c"] = "copy_to_clipboard",
         ["x"] = "cut_to_clipboard",
         ["p"] = "paste_from_clipboard",
+        ["y"] = "copy", -- takes text input for destination
+        ["m"] = "move", -- takes text input for destination
+        ["q"] = "close_window",
       },
     },
     --find_command = "fd",

lua/neo-tree/sources/common/commands.lua

@@ -142,6 +142,22 @@ M.paste_from_clipboard = function(state, callback)
   end
 end
 
+---Copies a node to a new location, using typed input.
+---@param state table The state of the source
+---@param callback function The callback to call when the command is done. Called with the parent node as the argument.
+M.copy = function(state, callback)
+  local node = state.tree:get_node()
+  fs_actions.copy_node(node.path, nil, callback)
+end
+
+---Moves a node to a new location, using typed input.
+---@param state table The state of the source
+---@param callback function The callback to call when the command is done. Called with the parent node as the argument.
+M.move = function(state, callback)
+  local node = state.tree:get_node()
+  fs_actions.move_node(node.path, nil, callback)
+end
+
 M.delete = function(state, callback)
   local tree = state.tree
   local node = tree:get_node()

lua/neo-tree/sources/filesystem/commands.lua

@@ -22,6 +22,10 @@ M.close_all_nodes = cc.close_all_nodes
 M.close_node = cc.close_node
 M.close_window = cc.close_window
 
+M.copy = function(state)
+  cc.copy(state, refresh)
+end
+
 ---Marks node as copied, so that it can be pasted somewhere else.
 M.copy_to_clipboard = function(state)
   cc.copy_to_clipboard(state, redraw)
@@ -32,6 +36,10 @@ M.cut_to_clipboard = function(state)
   cc.cut_to_clipboard(state, redraw)
 end
 
+M.move = function(state)
+  cc.move(state, refresh)
+end
+
 M.show_debug_info = cc.show_debug_info
 
 ---Pastes all items from the clipboard to the current directory.

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

@@ -17,6 +17,9 @@ local M = {}
 
 local function clear_buffer(path)
   local buf = utils.find_buffer_by_name(path)
+  if buf < 1 then
+    return
+  end
   local alt = vim.fn.bufnr("#")
   -- Check all windows to see if they are using the buffer
   for _, win in ipairs(vim.api.nvim_list_wins()) do
@@ -52,10 +55,11 @@ local function create_all_parents(path)
 end
 
 local get_unused_name
-function get_unused_name(destination, name_chosen_callback)
+function get_unused_name(destination, name_chosen_callback, first_message)
   if loop.fs_stat(destination) then
     local parent_path, name = utils.split_path(destination)
-    inputs.input(name .. " already exists. Please enter a new name: ", name, function(new_name)
+    local message = first_message or name .. " already exists. Please enter a new name: "
+    inputs.input(message, name, function(new_name)
       if new_name and string.len(new_name) > 0 then
         local new_path = parent_path .. utils.path_separator .. new_name
         get_unused_name(new_path, name_chosen_callback)
@@ -67,7 +71,9 @@ function get_unused_name(destination, name_chosen_callback)
 end
 -- Move Node
 M.move_node = function(source, destination, callback)
-  get_unused_name(destination, function(dest)
+  local parent_path, name = utils.split_path(source)
+  get_unused_name(destination or source, function(dest)
+    create_all_parents(dest)
     loop.fs_rename(source, dest, function(err)
       if err then
         log.error("Could not move the files")
@@ -83,18 +89,17 @@ M.move_node = function(source, destination, callback)
         end
       end)
     end)
-  end)
+  end, 'Move "' .. name .. '" to:')
 end
 
 -- Copy Node
 M.copy_node = function(source, _destination, callback)
-  get_unused_name(_destination, function(destination)
-    loop.fs_copyfile(source, destination)
-    local handle
-    handle = loop.spawn("cp", { args = { "-r", source, destination } }, function(code)
-      handle:close()
-      if code ~= 0 then
-        log.error("copy failed")
+  local parent_path, name = utils.split_path(source)
+  get_unused_name(_destination or source, function(destination)
+    create_all_parents(destination)
+    loop.fs_copyfile(source, destination, function(err)
+      if err then
+        log.error("Could not copy the files")
         return
       end
       vim.schedule(function()
@@ -104,7 +109,7 @@ M.copy_node = function(source, _destination, callback)
         end
       end)
     end)
-  end)
+  end, 'Copy "' .. name .. '" to:')
 end
 
 -- Create Node

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

@@ -35,12 +35,14 @@ local function do_scan(context, path_to_scan)
     on_exit = vim.schedule_wrap(function()
       if state.use_libuv_file_watcher then
         local root = context.folders[path_to_scan]
-        if root.is_link then
-          log.trace("Adding fs watcher for ", root.link_to)
-          fs_watch.watch_folder(root.link_to)
-        else
-          log.trace("Adding fs watcher for ", root.path)
-          fs_watch.watch_folder(root.path)
+        if root then
+          if root.is_link then
+            log.trace("Adding fs watcher for ", root.link_to)
+            fs_watch.watch_folder(root.link_to)
+          else
+            log.trace("Adding fs watcher for ", root.path)
+            fs_watch.watch_folder(root.path)
+          end
         end
       end
       local scanned_folder = folders[path_to_scan]