Sync functionality with latest angular-filemanager

.gitignore

@@ -24,7 +24,8 @@ _testmain.go
 *.prof
 
 .project
-gofe
+gofe*
+main
 static/
 tmp/
 

README.md

@@ -1,6 +1,24 @@
 ## gofe - Go File Explorer
 A golang backend for angular-filemanager - https://github.com/joni2back/angular-filemanager
 
+### Todo
+##### [API](https://github.com/joni2back/angular-filemanager/blob/master/API.md)
+- [x] [Listing](https://github.com/joni2back/angular-filemanager/blob/master/API.md#listing-url-filemanagerconfiglisturl-method-post) 
+- [x] [Rename](https://github.com/joni2back/angular-filemanager/blob/master/API.md#rename-url-filemanagerconfigrenameurl-method-post)
+- [x] [Move](https://github.com/joni2back/angular-filemanager/blob/master/API.md#move-url-filemanagerconfigmoveurl-method-post)
+- [x] [Copy](https://github.com/joni2back/angular-filemanager/blob/master/API.md#copy-url-filemanagerconfigcopyurl-method-post)
+- [x] [Remove/Delete](https://github.com/joni2back/angular-filemanager/blob/master/API.md#remove-url-filemanagerconfigremoveurl-method-post)
+- [ ] [Edit](https://github.com/joni2back/angular-filemanager/blob/master/API.md#edit-file-url-filemanagerconfigediturl-method-post)
+- [ ] [getContent](https://github.com/joni2back/angular-filemanager/blob/master/API.md#get-content-of-a-file-url-filemanagerconfiggetcontenturl-method-post)
+- [x] [createFolder](https://github.com/joni2back/angular-filemanager/blob/master/API.md#create-folder-url-filemanagerconfigcreatefolderurl-method-post)
+- [x] [changePermissions](https://github.com/joni2back/angular-filemanager/blob/master/API.md#set-permissions-url-filemanagerconfigpermissionsurl-method-post)
+- [ ] [compress](https://github.com/joni2back/angular-filemanager/blob/master/API.md#compress-file-url-filemanagerconfigcompressurl-method-post)
+- [ ] [extract](https://github.com/joni2back/angular-filemanager/blob/master/API.md#extract-file-url-filemanagerconfigextracturl-method-post)
+- [x] [Upload](https://github.com/joni2back/angular-filemanager/blob/master/API.md#upload-file-url-filemanagerconfiguploadurl-method-post-content-type-multipartform-data)
+- [x] [Download](https://github.com/joni2back/angular-filemanager/blob/master/API.md#download--preview-file-url-filemanagerconfigdownloadmultipleurl-method-get)
+- [ ] [Download Many as Zip](https://github.com/joni2back/angular-filemanager/blob/master/API.md#download-multiples-files-in-ziptar-url-filemanagerconfigdownloadfileurl-method-get)
+
+
 ### Screenshots
 ![](https://raw.githubusercontent.com/kernel164/gofe/master/screenshot1.png)
 ![](https://raw.githubusercontent.com/kernel164/gofe/master/screenshot2.png)
@@ -20,4 +38,4 @@ STATICS = angular-filemanager/bower_components,angular-filemanager/dist,angular-
 
 [backend.ssh]
 HOST = localhost:22
-```
+```

fe/fileexplorer.go

@@ -1,16 +1,20 @@
 package fe
 
 import (
-	models "../models"
+	"mime/multipart"
+
+	"github.com/md2k/gofe/models"
 )
 
 type FileExplorer interface {
 	Init() error
 	ListDir(path string) ([]models.ListDirEntry, error)
-	Move(path string, newPath string) error
-	Copy(path string, newPath string) error
-	Delete(path string) error
-	Chmod(path string, code string) error
-	Mkdir(path string, name string) error
+	Rename(path string, newPath string) error
+	Move(path []string, newPath string) (err error)
+	Copy(path []string, newPath string, singleFilename string) (err error)
+	Delete(path []string) (err error)
+	Chmod(path []string, code string, recursive bool) (err error)
+	Mkdir(path string) error
+	UploadFile(destination string, part *multipart.Part) (err error)
 	Close() error
 }

fe/ssh_fileexplorer.go

@@ -1,12 +1,20 @@
+// TODO:  Better handling of errors from SSH Back-end executions.
+// ExecOnly() / Exec()
+// 'Process exited with status 1' Not very informative :)
+
 package fe
 
 import (
-	models "../models"
-	"golang.org/x/crypto/ssh"
+	"fmt"
+	"io"
 	"log"
+	"mime/multipart"
 	"net"
 	"strings"
 	"time"
+
+	"github.com/md2k/gofe/models"
+	"golang.org/x/crypto/ssh"
 )
 
 const DefaultTimeout = 30 * time.Second
@@ -53,32 +61,97 @@ func normalizePath(path string) string {
 	return path
 }
 
-func (fe *SSHFileExplorer) Mkdir(path string, name string) error {
-	return fe.ExecOnly("mkdir " + normalizePath(path) + "/" + name)
+func (fe *SSHFileExplorer) Mkdir(path string) error {
+	return fe.ExecOnly(fmt.Sprintf("mkdir -p \"%s\"", normalizePath(path)))
 }
 
 func (fe *SSHFileExplorer) ListDir(path string) ([]models.ListDirEntry, error) {
-	ls, err := fe.Exec("ls --time-style=long-iso -l " + normalizePath(path))
+	// Most ugliest Fix, but nothing other can be done here to able parse LS in correct way and support files with spaces in names :)
+	// Have another idea, but this is for later TODO
+	ls, err := fe.Exec("ls --time-style=long-iso -1 -q -l --hide-control-chars " + normalizePath(path) + " | awk '{n=split($0,array,\" \")} { for (i = 1; i <= 7; i++) {printf \"%s|\",array[i]}} { for (i = 8; i <= n; i++) {printf \"%s \",array[i]};print \"\"}'")
+	// ls, err := fe.Exec(fmt.Sprintf("ls --time-style=long-iso -l %s", normalizePath(path)))
 	if err != nil {
 		return nil, err
 	}
 	return parseLsOutput(string(ls)), nil
 }
 
-func (fe *SSHFileExplorer) Move(path string, newPath string) error {
-	return fe.ExecOnly("mv " + normalizePath(path) + " " + normalizePath(newPath))
+func (fe *SSHFileExplorer) Rename(path string, newPath string) error {
+	return fe.ExecOnly(fmt.Sprintf("mv \"%s\" \"%s\"", normalizePath(path), normalizePath(newPath)))
 }
 
-func (fe *SSHFileExplorer) Copy(path string, newPath string) error {
-	return fe.ExecOnly("cp -r " + normalizePath(path) + " " + normalizePath(newPath))
+func (fe *SSHFileExplorer) Move(path []string, newPath string) (err error) {
+	for _, target := range path {
+		err = fe.ExecOnly(fmt.Sprintf("mv \"%s\" \"%s\"", normalizePath(target), normalizePath(newPath)))
+	}
+	return err
 }
 
-func (fe *SSHFileExplorer) Delete(path string) error {
-	return fe.ExecOnly("rm -r " + normalizePath(path))
+func (fe *SSHFileExplorer) Copy(path []string, newPath string, singleFilename string) (err error) {
+	for _, target := range path {
+		err = fe.ExecOnly(fmt.Sprintf("cp -r \"%s\" \"%s/%s\"", normalizePath(target), normalizePath(newPath), singleFilename))
+	}
+	return err
 }
 
-func (fe *SSHFileExplorer) Chmod(path string, code string) error {
-	return fe.ExecOnly("chmod " + code + " " + normalizePath(path))
+func (fe *SSHFileExplorer) Delete(path []string) (err error) {
+	for _, target := range path {
+		err = fe.ExecOnly(fmt.Sprintf("rm --interactive=never -r \"%s\"", normalizePath(target)))
+	}
+	return err
+}
+
+func (fe *SSHFileExplorer) Chmod(path []string, code string, recursive bool) (err error) {
+	for _, target := range path {
+		recurs := ""
+		if recursive {
+			recurs = "-R"
+		}
+		err = fe.ExecOnly(fmt.Sprintf("chmod %s %s \"%s\"", recurs, code, normalizePath(target)))
+	}
+	return err
+}
+
+func (fe *SSHFileExplorer) UploadFile(destination string, part *multipart.Part) (err error) {
+	// Write directly to Disk
+	// dst, err := os.Create(fmt.Sprintf("%s/%s", destination, part.FileName()))
+	// defer dst.Close()
+	// if err != nil {
+	// 	return err
+	// }
+
+	// if _, err := io.Copy(dst, part); err != nil {
+	// 	return err
+	// }
+	// err = fe.ExecOnly(fmt.Sprintf("chmod 664 \"%s/%s\"", , destination, normalizePath(target)))
+	// return nil
+
+	// Write over SSH StdIn Pipe
+	session, err := fe.client.NewSession()
+	if err != nil {
+		return err
+	}
+	// defer session.Close()
+
+	input, err := session.StdinPipe()
+	if err != nil {
+		return err
+	}
+
+	// Open cat stdin input remotely
+	err = session.Start(fmt.Sprintf("cat - > \"%s/%s\"", destination, part.FileName()))
+	if err != nil {
+		return err
+	}
+
+	// Write to Session's Stdin
+	if _, err := io.Copy(input, part); err != nil {
+		return err
+	}
+	// Close on finish (Guess it is better to send signal , so for TODO)
+	session.Close()
+
+	return err
 }
 
 func (fe *SSHFileExplorer) Close() error {
@@ -105,7 +178,7 @@ func (fe *SSHFileExplorer) ExecOnly(cmd string) error {
 	defer session.Close()
 	_, err1 := session.CombinedOutput(cmd)
 	if err1 != nil {
-		return err // + " - " + string(out)
+		return err1 // + " - " + string(out)
 	}
 	return nil
 }
@@ -114,9 +187,16 @@ func parseLsOutput(lsout string) []models.ListDirEntry {
 	lines := strings.Split(lsout, "\n")
 	results := []models.ListDirEntry{}
 	for _, line := range lines {
-		//fmt.Println(idx, line)
+		// fmt.Println(idx, line)
 		if len(line) != 0 && !strings.HasPrefix(line, "total") {
-			tokens := strings.Fields(line)
+			// our Dirty LS Fix with AWK return line as follow:
+			// drwxr-xr-x|2|root|root|4096|2016-07-13|17:47|bin
+			tmp_tokens := strings.SplitN(line, "|", 8)
+			var tokens []string
+			for _, token := range tmp_tokens {
+				tokens = append(tokens, strings.TrimSpace(token))
+			}
+			// fmt.Println(tokens)
 			if len(tokens) >= 8 {
 				ftype := "file"
 				if strings.HasPrefix(tokens[0], "d") {

gofe.ini

@@ -1,9 +1,17 @@
 BACKEND = ssh
-SERVER = http
+SERVER = https
 
 [server.http]
-BIND = localhost:4000
+BIND = :4000
 STATICS = angular-filemanager/bower_components,angular-filemanager/dist,angular-filemanager/src
+CORSORIGINS = 
+
+[server.https]
+BIND = :9044
+STATICS = angular-filemanager/bower_components,angular-filemanager/dist,angular-filemanager/src
+SSLKEY = 
+SSLCERT = 
+CORSORIGINS = 
 
 [backend.ssh]
 HOST = localhost:22