implement fuse functions

improve mounter

Author: JojiiOfficial

dmfs/dmfs.go

@@ -1,9 +1,48 @@
 package dmfs
 
 import (
+	"context"
+	"fmt"
+	"syscall"
+
+	"github.com/DataManager-Go/libdatamanager"
+	dmConfig "github.com/DataManager-Go/libdatamanager/config"
 	"github.com/hanwen/go-fuse/v2/fs"
 )
 
 type dmanagerFilesystem struct {
 	fs.Inode
+
+	mounter *Mounter
+	config  *dmConfig.Config
+	libdm   *libdatamanager.LibDM
+}
+
+// Ensure that we implement NodeOnAdder
+var _ = (fs.NodeOnAdder)((*dmanagerFilesystem)(nil))
+var _ = (fs.NodeRenamer)((*dmanagerFilesystem)(nil))
+var _ = (fs.NodeUnlinker)((*dmanagerFilesystem)(nil))
+
+// OnAdd is called on mounting the file system. Use it to populate
+// the file system tree.
+func (root *dmanagerFilesystem) OnAdd(ctx context.Context) {
+	root.initFiles()
+}
+
+// Unlink if virtual file was unlinked
+func (root *dmanagerFilesystem) Unlink(ctx context.Context, name string) syscall.Errno {
+	fmt.Println("rm", name)
+	return 0
+}
+
+// Rename if virtual file was renamed
+func (root *dmanagerFilesystem) Rename(ctx context.Context, name string, newParent fs.InodeEmbedder, newName string, flags uint32) syscall.Errno {
+	fmt.Println("renome")
+	return 0
+}
+
+func (root *dmanagerFilesystem) debug(arg ...interface{}) {
+	if root.mounter.Debug {
+		fmt.Println(arg...)
+	}
 }

dmfs/initFiles.go

@@ -0,0 +1,5 @@
+package dmfs
+
+func (root *dmanagerFilesystem) initFiles() {
+	root.debug("Init files")
+}

dmfs/mount.go

@@ -13,18 +13,21 @@ import (
 	"github.com/hanwen/go-fuse/v2/fuse"
 )
 
-// MountOptions options to mount
-type MountOptions struct {
+// Mounter options to mount
+type Mounter struct {
 	MountPoint string
 	Config     *dmConfig.Config
 	Libdm      *libdatamanager.LibDM
 	Debug      bool
 	DebugFS    bool
+
+	server   *fuse.Server
+	doneChan chan bool
 }
 
 // Mount the fs
-func (mopt *MountOptions) Mount() {
-	mountDir := filepath.Clean(mopt.MountPoint)
+func (mounter *Mounter) Mount() {
+	mountDir := filepath.Clean(mounter.MountPoint)
 	fmt.Printf("Mounting on %s\n", mountDir)
 
 	// Create mount dir if not exists
@@ -33,52 +36,65 @@ func (mopt *MountOptions) Mount() {
 	}
 
 	// Test server availability
-	if !mopt.testServer() {
+	if !mounter.testServer() {
 		return
 	}
 
-	root := &dmanagerFilesystem{}
+	// Init exit channels
+	exitChan := make(chan bool, 1)
+	mounter.doneChan = make(chan bool, 1)
+
+	// Create the fs
+	root := &dmanagerFilesystem{
+		mounter: mounter,
+		config:  mounter.Config,
+		libdm:   mounter.Libdm,
+	}
+
+	var err error
 
 	// Mount fs
-	server, err := fs.Mount(mountDir, root, mopt.getMountOptions())
+	mounter.server, err = fs.Mount(mountDir, root, mounter.getMountOptions())
 	if err != nil {
 		log.Fatal(err)
 	}
 
 	// Umount fs on interrupt
-	exitChan := make(chan bool, 1)
-	doneChan := make(chan bool, 1)
 	sigChan := make(chan os.Signal, 1)
 	go (func() {
 		signal.Notify(sigChan, os.Interrupt, os.Kill)
+
 		// Await signal
 		sig := <-sigChan
 
 		// Debug & Umount
 		fmt.Println("\rReceived", sig) // Print \r to overwrite the ugly ^C
 
 		exitChan <- true
-
-		server.Unmount()
-
-		fmt.Println("Umounted")
-		doneChan <- true
+		mounter.umount()
 	})()
 
 	// Exit if mountpoint was
 	// unmounted or process was interrupted
-	server.Wait()
+	mounter.server.Wait()
 	select {
 	case <-exitChan:
-		<-doneChan
+		<-mounter.doneChan
 	default:
 		fmt.Println("umounted externally\nexiting")
 	}
 }
 
+// Umount fs
+func (mounter *Mounter) umount() {
+	mounter.server.Unmount()
+	fmt.Println("Umounted")
+	mounter.doneChan <- true
+}
+
 // tests if server can be accessed and user is authorized
-func (mopt *MountOptions) testServer() bool {
-	_, err := mopt.Libdm.GetNamespaces()
+func (mounter *Mounter) testServer() bool {
+	_, err := mounter.Libdm.GetNamespaces()
 	if err != nil {
 		fmt.Println("Can't mount:", err)
 		return false
@@ -88,10 +104,10 @@ func (mopt *MountOptions) testServer() bool {
 }
 
 // Get the mountoptions for the mount operation
-func (mopt *MountOptions) getMountOptions() *fs.Options {
+func (mounter *Mounter) getMountOptions() *fs.Options {
 	return &fs.Options{
 		MountOptions: fuse.MountOptions{
-			Debug:      mopt.DebugFS,
+			Debug:      mounter.DebugFS,
 			AllowOther: false,
 			FsName:     "Datamanager mount",
 			Name:       "dmanager",

main.go

@@ -59,7 +59,7 @@ func main() {
 	}
 
 	// Create mount options
-	options := dmfs.MountOptions{
+	options := dmfs.Mounter{
 		Libdm:      libdatamanager.NewLibDM(config.MustGetRequestConfig()),
 		MountPoint: *appMountpoint,
 		Config:     config,