From 8f57a0be8db20df77bb79c8fee3c4ce949c27b25 Mon Sep 17 00:00:00 2001 From: Yannick Ulrich Date: Sun, 26 Feb 2023 13:40:44 +0000 Subject: [PATCH] Added fuse to config --- config.go | 3 +++ fuse.go | 9 ++++----- main.go | 8 +++++--- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/config.go b/config.go index 49ce23d..a188658 100644 --- a/config.go +++ b/config.go @@ -106,5 +106,8 @@ func setCfgDefaults() { "notifs.ignore.body": []string{}, "music.vol.interval": 5, + + "fuse.enabled": false, + "fuse.mountpoint": "/tmp/itd/mnt", }, "."), nil) } diff --git a/fuse.go b/fuse.go index 97cec0e..1afc06f 100644 --- a/fuse.go +++ b/fuse.go @@ -520,10 +520,9 @@ func (f *ITNode) Rmdir(ctx context.Context, name string) syscall.Errno { func startFuse(ctx context.Context, dev *infinitime.Device) error { // This is where we'll mount the FS - mntDir := "/tmp/x" - os.Mkdir(mntDir, 0755) + os.Mkdir(k.String("fuse.mountpoint"), 0755) root := &ITNode{kind: 0} - server, err := fs.Mount(mntDir, root, &fs.Options{ + server, err := fs.Mount(k.String("fuse.mountpoint"), root, &fs.Options{ MountOptions: fuse.MountOptions{ // Set to true to see how the file system works. Debug: false, @@ -532,14 +531,14 @@ func startFuse(ctx context.Context, dev *infinitime.Device) error { }) if err != nil { log.Error("Mounting failed"). - Str("target", mntDir). + Str("target", k.String("fuse.mountpoint")). Err(err). Send() return err } log.Info("Mounted on target"). - Str("target", mntDir). + Str("target", k.String("fuse.mountpoint")). Send() mydev := Device{dev : dev}; diff --git a/main.go b/main.go index dc34c4c..e9ef50c 100644 --- a/main.go +++ b/main.go @@ -187,9 +187,11 @@ func main() { log.Error("Error starting socket").Err(err).Send() } // Start fuse socket - err = startFuse(ctx, dev) - if err != nil { - log.Error("Error starting socket").Err(err).Send() + if k.Bool("fuse.enabled") { + err = startFuse(ctx, dev) + if err != nil { + log.Error("Error starting fuse socket").Err(err).Send() + } } // Block forever select {}