add delete files

Author: JojiiOfficial

dmfs/data.go

@@ -66,6 +66,7 @@ func (data *dataStruct) loadFiles(attributes libdatamanager.FileAttributes) ([]l
 
 	if time.Now().Unix()-5 > lastLoad {
 		fmt.Println("fresh file load")
+		data.lastFileload[attributes.Namespace] = time.Now().Unix()
 		resp, err := data.libdm.ListFiles("", 0, false, attributes, 0)
 		if err != nil {
 			return nil, err
@@ -81,9 +82,6 @@ func (data *dataStruct) loadFiles(attributes libdatamanager.FileAttributes) ([]l
 
 func (data *dataStruct) getLastFileLoad(namespace string) int64 {
 	v, h := data.lastFileload[namespace]
-	defer func() {
-		data.lastFileload[namespace] = time.Now().Unix()
-	}()
 
 	if !h {
 		return 0

dmfs/fsGroup.go

@@ -3,6 +3,7 @@ package dmfs
 import (
 	"context"
 	"fmt"
+	"sync"
 	"syscall"
 
 	"github.com/DataManager-Go/libdatamanager"
@@ -31,6 +32,8 @@ type groupNode struct {
 	isNoGroupPlaceholder bool
 
 	files []libdm.FileResponseItem
+
+	mx sync.Mutex
 }
 
 // Create a new group node
@@ -89,6 +92,9 @@ func (groupNode *groupNode) loadfiles() error {
 }
 
 func (groupNode *groupNode) Lookup(ctx context.Context, name string, out *fuse.EntryOut) (*fs.Inode, syscall.Errno) {
+	groupNode.mx.Lock()
+	defer groupNode.mx.Unlock()
+
 	file := groupNode.findFile(name)
 	if file == nil {
 		return nil, syscall.ENOENT
@@ -108,16 +114,6 @@ func (groupNode *groupNode) Lookup(ctx context.Context, name string, out *fuse.E
 	return child, 0
 }
 
-func (groupNode *groupNode) findFile(name string) *libdatamanager.FileResponseItem {
-	for i := range groupNode.files {
-		if groupNode.files[i].Name == name {
-			return &groupNode.files[i]
-		}
-	}
-
-	return nil
-}
-
 // Set file attributes for files
 func (groupNode *groupNode) setFileAttrs(file *libdatamanager.FileResponseItem, out *fuse.EntryOut) {
 	out.Size = uint64(file.Size)
@@ -139,11 +135,49 @@ func (groupNode *groupNode) setFileAttrs(file *libdatamanager.FileResponseItem,
 
 // Delete file
 func (groupNode *groupNode) Unlink(ctx context.Context, name string) syscall.Errno {
-	file := groupNode.findFile(name)
-	if file == nil {
+	f := groupNode.findFile(name)
+	if f == nil {
 		return syscall.ENOENT
 	}
+	file := *f
+
+	// Remove local
+	groupNode.removeFile(file)
+
+	// Make delete http request
+	_, err := data.libdm.DeleteFile("", file.ID, false, groupNode.getRequestAttributes())
+	if err != nil {
+		printResponseError(err, "deleting file")
+		return syscall.EIO
+	}
+
+	// FIXME delete correctly from slice
 
-	// TODO delete file remotely
 	return 0
 }
+
+// Find file by name
+func (groupNode *groupNode) findFile(name string) *libdatamanager.FileResponseItem {
+	for i := range groupNode.files {
+		if groupNode.files[i].Name == name {
+			return &groupNode.files[i]
+		}
+	}
+
+	return nil
+}
+
+// Remove file from list
+func (groupNode *groupNode) removeFile(file libdatamanager.FileResponseItem) bool {
+	groupNode.mx.Lock()
+	defer groupNode.mx.Unlock()
+
+	for i := range groupNode.files {
+		if groupNode.files[i].ID == file.ID {
+			groupNode.files = removeFileByIndex(groupNode.files, i)
+			return true
+		}
+	}
+
+	return false
+}

dmfs/utils.go

@@ -3,6 +3,7 @@ package dmfs
 import (
 	"fmt"
 
+	"github.com/DataManager-Go/libdatamanager"
 	libdm "github.com/DataManager-Go/libdatamanager"
 )
 
@@ -60,3 +61,8 @@ func removeFromStringSlice(s []string, sub string) []string {
 	s[len(s)-1], s[i] = s[i], s[len(s)-1]
 	return s[:len(s)-1]
 }
+
+func removeFileByIndex(s []libdatamanager.FileResponseItem, index int) []libdatamanager.FileResponseItem {
+	s[len(s)-1], s[index] = s[index], s[len(s)-1]
+	return s[:len(s)-1]
+}