implement listing files

improve groups
add retrieve fileIDs

Author: JojiiOfficial

dmfs/data.go

@@ -0,0 +1,37 @@
+package dmfs
+
+import (
+	"os"
+
+	"github.com/DataManager-Go/libdatamanager"
+	libdm "github.com/DataManager-Go/libdatamanager"
+	dmConfig "github.com/DataManager-Go/libdatamanager/config"
+)
+
+var data dataStruct
+
+// data provides the data for the fs
+type dataStruct struct {
+	mounter *Mounter
+	config  *dmConfig.Config
+	libdm   *libdatamanager.LibDM
+
+	userAttributes *libdm.UserAttributeDataResponse
+	gid, uid       uint32
+}
+
+func initData() {
+	data.gid = uint32(os.Getegid())
+	data.uid = uint32(os.Getuid())
+}
+
+// load user attributes (namespaces, groups)
+func (data *dataStruct) loadUserAttributes() error {
+	var err error
+	data.userAttributes, err = data.libdm.GetUserAttributeData()
+	if err != nil {
+		return err
+	}
+
+	return nil
+}

dmfs/dmfsRoot.go

@@ -7,17 +7,11 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/DataManager-Go/libdatamanager"
-	dmConfig "github.com/DataManager-Go/libdatamanager/config"
 	"github.com/hanwen/go-fuse/v2/fs"
 )
 
 type dmanagerRoot struct {
 	fs.Inode
-
-	mounter *Mounter
-	config  *dmConfig.Config
-	libdm   *libdatamanager.LibDM
 }
 
 // implement the interfaces
@@ -30,14 +24,14 @@ var _ = (fs.NodeRmdirer)((*dmanagerRoot)(nil))
 func (root *dmanagerRoot) OnAdd(ctx context.Context) {
 	root.debug("Init files")
 
-	userData, err := root.libdm.GetUserAttributeData()
+	err := data.loadUserAttributes()
 	if err != nil {
 		log.Fatal(err)
 		return
 	}
 
 	// Loop Namespaces and add childs in as folders
-	for _, namespace := range userData.Namespace {
+	for _, namespace := range data.userAttributes.Namespace {
 		nsName := removeNSName(namespace.Name)
 
 		// reuse child
@@ -61,7 +55,10 @@ func (root *dmanagerRoot) OnAdd(ctx context.Context) {
 		for _, group := range namespace.Groups {
 			gp := nsp.GetChild(group)
 			if gp == nil {
-				gp = nsp.NewInode(ctx, &fs.Inode{}, fs.StableAttr{
+				gp = nsp.NewInode(ctx, &groupInode{
+					group:     group,
+					namespace: namespace.Name,
+				}, fs.StableAttr{
 					Mode: syscall.S_IFDIR,
 				})
 
@@ -76,7 +73,7 @@ func (root *dmanagerRoot) OnAdd(ctx context.Context) {
 
 // Unlink if virtual file was unlinked
 func (root *dmanagerRoot) Rmdir(ctx context.Context, name string) syscall.Errno {
-	namespace := addNSName(name, root.libdm.Config)
+	namespace := addNSName(name, data.libdm.Config)
 
 	// wait 2 seconds to ensure, user didn't cancel
 	select {
@@ -86,7 +83,7 @@ func (root *dmanagerRoot) Rmdir(ctx context.Context, name string) syscall.Errno
 	}
 
 	// Do delete request
-	if _, err := root.libdm.DeleteNamespace(namespace); err != nil {
+	if _, err := data.libdm.DeleteNamespace(namespace); err != nil {
 		fmt.Println(err)
 		return syscall.EFAULT
 	}
@@ -103,12 +100,12 @@ func (root *dmanagerRoot) Rename(ctx context.Context, name string, newParent fs.
 	}
 
 	// Get real namespace names
-	oldNSName := addNSName(name, root.libdm.Config)
-	newNSName := addNSName(newName, root.libdm.Config)
+	oldNSName := addNSName(name, data.libdm.Config)
+	newNSName := addNSName(newName, data.libdm.Config)
 	root.debug("rename namespace", oldNSName, "->", newNSName)
 
 	// Make rename request
-	_, err := root.libdm.UpdateNamespace(oldNSName, newNSName)
+	_, err := data.libdm.UpdateNamespace(oldNSName, newNSName)
 	if err != nil {
 		fmt.Println(err)
 		return syscall.ENONET
@@ -119,7 +116,7 @@ func (root *dmanagerRoot) Rename(ctx context.Context, name string, newParent fs.
 }
 
 func (root *dmanagerRoot) debug(arg ...interface{}) {
-	if root.mounter.Debug {
+	if data.mounter.Debug {
 		fmt.Println(arg...)
 	}
 }

dmfs/fsFile.go

@@ -0,0 +1,30 @@
+package dmfs
+
+import (
+	"context"
+	"syscall"
+
+	libdm "github.com/DataManager-Go/libdatamanager"
+	"github.com/hanwen/go-fuse/v2/fs"
+	"github.com/hanwen/go-fuse/v2/fuse"
+)
+
+type fileInode struct {
+	fs.Inode
+
+	file *libdm.FileResponseItem
+}
+
+var _ = (fs.NodeGetattrer)((*fileInode)(nil))
+
+// Set attributes for files
+func (fnode *fileInode) Getattr(ctx context.Context, f fs.FileHandle, out *fuse.AttrOut) syscall.Errno {
+	out.Size = uint64(fnode.file.Size)
+	out.Ctime = uint64(fnode.file.CreationDate.Unix())
+	out.Mtime = out.Ctime
+	out.Mode = 0640
+	out.Gid = data.gid
+	out.Uid = data.uid
+
+	return 0
+}

dmfs/fsGroup.go

@@ -0,0 +1,47 @@
+package dmfs
+
+import (
+	"context"
+	"fmt"
+	"syscall"
+
+	"github.com/DataManager-Go/libdatamanager"
+	"github.com/hanwen/go-fuse/v2/fs"
+)
+
+type groupInode struct {
+	fs.Inode
+
+	namespace string
+	group     string
+}
+
+var _ = (fs.NodeOnAdder)((*groupInode)(nil))
+
+func (groupInode *groupInode) OnAdd(ctx context.Context) {
+	groupAdd := []string{groupInode.group}
+
+	if len(groupAdd) == 1 && groupAdd[0] == "no_group" {
+		groupAdd = []string{}
+	}
+
+	files, err := data.libdm.ListFiles("", 0, false, libdatamanager.FileAttributes{
+		Groups:    groupAdd,
+		Namespace: groupInode.namespace,
+	}, 0)
+
+	if err != nil {
+		fmt.Println(err)
+		return
+	}
+
+	for _, file := range files.Files {
+		fileNode := groupInode.NewInode(ctx, &fileInode{
+			file: &file,
+		}, fs.StableAttr{
+			Mode: syscall.S_IFREG,
+		})
+
+		groupInode.AddChild(file.Name, fileNode, true)
+	}
+}

dmfs/mount.go

@@ -45,13 +45,17 @@ func (mounter *Mounter) Mount() {
 	exitChan := make(chan bool, 1)
 	mounter.doneChan = make(chan bool, 1)
 
-	// Create the fs
-	root := &dmanagerRoot{
+	data = dataStruct{
 		mounter: mounter,
 		config:  mounter.Config,
 		libdm:   mounter.Libdm,
 	}
 
+	initData()
+
+	// Create the fs
+	root := &dmanagerRoot{}
+
 	var err error
 
 	// Mount fs