Add deletion option, bump to version 1.3.0, refactor

Author: Nicolai Søborg

filetree.lua

@@ -1,4 +1,4 @@
-VERSION = "1.2.7"
+VERSION = "1.3.0"
 
 treeView = nil
 cwd = DirectoryName(".")
@@ -13,7 +13,8 @@ function OpenTree()
     SetLocalOption("ruler", "false", treeView)
     SetLocalOption("softwrap", "true", treeView)
     SetLocalOption("autosave", "false", treeView)
-    SetLocalOption("statusline", "false", treeView)    
+    SetLocalOption("statusline", "false", treeView)
+    --SetLocalOption("readonly", "true", treeView)
     tabs[curTab+1]:Resize()
     RefreshTree()
 end
@@ -23,10 +24,15 @@ function RefreshTree()
     treeView.Buf:Insert(Loc(0,0), table.concat(scandir(cwd), "\n "))
 end
 
+-- returns currently selected line in treeView
+function getSelection()
+    return (treeView.Buf:Line(treeView.Cursor.Loc.Y)):sub(2)
+end
+
 -- When user press enter
 function preInsertNewline(view)
     if view == treeView then
-        local selected = (view.Buf:Line(view.Cursor.Loc.Y)):sub(2)
+        local selected = getSelection()
         if view.Cursor.Loc.Y == 0 then
             return false -- topmost line is cwd, so disallowing selecting it
         elseif isDir(selected) then
@@ -44,34 +50,49 @@ function preInsertNewline(view)
     return true
 end
 
--- don't use build-in view.Cursor:SelectLine() as it will copy to clipboard
-function SelectLine(v)
-    local y = v.Cursor.Loc.Y
-    v.Cursor.CurSelection[1] = Loc(0, y)
-    v.Cursor.CurSelection[2] = Loc(v.Width, y)
-end
-
 -- disallow selecting topmost line in treeview:
 function preCursorUp(view) 
     if view == treeView then
         if view.Cursor.Loc.Y == 1 then
             return false
 end end end
 
--- 'beautiful' file selection:
-function onCursorDown(view) if view == treeView then SelectLine(view) end end
-function onCursorUp(view)   if view == treeView then SelectLine(view) end end
+-- don't use build-in view.Cursor:SelectLine() as it will copy to clipboard (in old versions of Micro)
+function SelectLineInTree(v)
+    if v == treeView then
+        local y = v.Cursor.Loc.Y
+        v.Cursor.CurSelection[1] = Loc(0, y)
+        v.Cursor.CurSelection[2] = Loc(v.Width, y)
+    end
+end
 
+-- 'beautiful' file selection:
+function onCursorDown(view) SelectLineInTree(view) end
+function onCursorUp(view)   SelectLineInTree(view) end
 
---[[ allows for deleting files
+-- allows for deleting files
 function preDelete(view)
     if view == treeView then
-        messenger:YesNoPrompt("Do you want to delete ...?")
+        local selected = getSelection()
+        if selected == ".." then return false end
+        local question, command
+        if isDir(selected) then
+            question = "Do you want to delete dir '"..selected.."' ?"
+            command = isWin and "del /S /Q" or "rm -r"
+        else
+            question = "Do you want to delete file '"..selected.."' ?"
+            command = isWin and "del" or "rm -I"
+        end
+        command = command .. " " .. (isWin and driveLetter or "") .. JoinPaths(cwd, selected)
+        local yes, cancel = messenger:YesNoPrompt(question)
+        if not cancel and yes then
+            io.popen(command .. " " .. selected):close()
+            RefreshTree()
+        end
         return false
     end
     return true
 end
-]]--
 
 -- don't prompt to save tree view
 function preQuit(view)
@@ -82,36 +103,34 @@ function preQuit(view)
 end
 
 function scandir(directory)
-    local i, t, popen = 3, {}, io.popen
-    local pfile
+    local i, t, proc = 3, {}, nil
     t[1] = (isWin and driveLetter or "") .. cwd
     t[2] = ".."
     if isWin then
-        pfile = popen('dir /a /b "'..directory..'"')
+        proc = io.popen('dir /a /b "'..directory..'"')
     else
-        pfile = popen('ls -Ap "'..directory..'"')
+        proc = io.popen('ls -Ap "'..directory..'"')
     end
-    for filename in pfile:lines() do
+    for filename in proc:lines() do
         t[i] = filename
         i = i + 1
     end
-    pfile:close()
+    proc:close()
     return t
 end
 
 function isDir(path)
-    local status = false
-    local pfile
+    local dir, proc = false, nil
     if isWin then
-        pfile = io.popen('IF EXIST ' .. driveLetter .. JoinPaths(cwd, path) .. '/* (ECHO d) ELSE (ECHO -)')
+        proc = io.popen('IF EXIST ' .. driveLetter .. JoinPaths(cwd, path) .. '/* (ECHO d) ELSE (ECHO -)')
     else
-        pfile = io.popen('ls -adl "' .. JoinPaths(cwd, path) .. '"')
+        proc = io.popen('ls -adl "' .. JoinPaths(cwd, path) .. '"')
     end
-    if pfile:read(1) == "d" then
-        status = true
+    if proc:read(1) == "d" then
+        dir = true
     end
-    pfile:close()
-    return status
+    proc:close()
+    return dir
 end
 
 MakeCommand("tree", "filetree.OpenTree", 0)