Elara6331/itd
4
6
Fork 12
Code Issues 8 Pull Requests 1 Projects Releases 11 Wiki Activity

Added FUSE support #55

Merged
Elara6331 merged 65 commits from yannickulrich/itd:fuse into master 2023-03-25 22:23:52 +00:00
Conversation 4 Commits 65 Files Changed 8 +25 -18
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit ffe9d43cf8 - Show all commits

43
fuse.go
View File

@ -1,6 +1,7 @@
package main
import (
"go.arsenm.dev/infinitime"
"go.arsenm.dev/logger/log"
"os"
"context"
@ -10,28 +11,32 @@ import (
"strconv"
)
yannickulrich marked this conversation as resolved Outdated
Elara6331 commented 2023-03-01 17:27:23 +00:00
Outdated
Review
Copy Link

This function should be called startFUSE instead to adhere to Go naming conventions

This function should be called `startFUSE` instead to adhere to Go naming conventions
yannickulrich commented 2023-03-01 19:08:01 +00:00
Outdated
Review
Copy Link

Thanks, I'm relatively new to Go, sorry for these issues

Done in 673383f

Thanks, I'm relatively new to Go, sorry for these issues Done in 673383f
func (i *Device) HeartRateBytes() ([]byte, error) {
v, err := i.HeartRate()
type Device struct {
yannickulrich marked this conversation as resolved Outdated
Elara6331 commented 2023-03-08 23:44:18 +00:00
Outdated
Review
Copy Link

Use os.MkdirAll here instead so that it creates parent directories, and handle the error (just return it).

Use `os.MkdirAll` here instead so that it creates parent directories, and handle the error (just return it).
yannickulrich commented 2023-03-11 13:29:49 +00:00
Outdated
Review
Copy Link

This is actually a bit more complicated than that. If the mountpoint already exists, fuse will crash. We also can't delete the mountpoint beforehand (rm: cannot remove '/tmp/itd/mnt': Transport endpoint is not connected). The best way to solve this should be calling the unmount function. How would you suggest going about doing this?

This is actually a bit more complicated than that. If the mountpoint already exists, fuse will crash. We also can't delete the mountpoint beforehand (`rm: cannot remove '/tmp/itd/mnt': Transport endpoint is not connected`). The best way to solve this should be calling the [unmount function](https://pkg.go.dev/github.com/hanwen/go-fuse/v2@v2.2.0/fuse#Server.Unmount). How would you suggest going about doing this?
Elara6331 commented 2023-03-11 18:30:43 +00:00
Outdated
Review
Copy Link

Yeah, this one is going to be a bit more complicated. The FUSE library does have a different unmount function that you could call before trying to mount the fs, but it's not exported, so we'll need to do a small hack to get access to it anyway. In the fusefs package, add a file called unmount.go with the following contents:

unmount.go 
package fusefs

import (
    _ "unsafe"

    "github.com/hanwen/go-fuse/v2/fuse"
)

func Unmount(mountPoint string) error {
    return unmount(mountPoint, &fuse.MountOptions{DirectMount: false})
}

// Unfortunately, the FUSE library does not export its unmount function,
// so this is required until that changes
//go:linkname unmount github.com/hanwen/go-fuse/v2/fuse.unmount
func unmount(mountPoint string, opts *fuse.MountOptions) error

Then, you can simply call that function at the top of startFUSE like so:

// Ignore the error because nothing might be mounted on the mountpoint
_ = fusefs.Unmount(k.String("fuse.mountpoint"))

I'll file an issue with the fuse library to export that function once this is merged.

The best way to solve this should be calling the unmount function.

I agree that this should be done. However, this doesn't solve the problem completely because if ITD panics for whatever reason, it won't get run and then the user will get a confusing message. Let me see what the best way would be to call this function on shutdown.

Yeah, this one is going to be a bit more complicated. The FUSE library does have [a different unmount function](https://github.com/hanwen/go-fuse/blob/0f728ba15b38579efefc3dc47821882ca18ffea7/fuse/mount_linux.go#L133) that you could call before trying to mount the fs, but it's not exported, so we'll need to do a small hack to get access to it anyway. In the `fusefs` package, add a file called `unmount.go` with the following contents: <details> <summary><code>unmount.go</code></summary> ```go package fusefs import ( _ "unsafe" "github.com/hanwen/go-fuse/v2/fuse" ) func Unmount(mountPoint string) error { return unmount(mountPoint, &fuse.MountOptions{DirectMount: false}) } // Unfortunately, the FUSE library does not export its unmount function, // so this is required until that changes //go:linkname unmount github.com/hanwen/go-fuse/v2/fuse.unmount func unmount(mountPoint string, opts *fuse.MountOptions) error ``` </details> Then, you can simply call that function at the top of `startFUSE` like so: ```go // Ignore the error because nothing might be mounted on the mountpoint _ = fusefs.Unmount(k.String("fuse.mountpoint")) ``` I'll file an issue with the fuse library to export that function once this is merged. > The best way to solve this should be calling the unmount function. I agree that this should be done. However, this doesn't solve the problem completely because if ITD panics for whatever reason, it won't get run and then the user will get a confusing message. Let me see what the best way would be to call this function on shutdown.
yannickulrich commented 2023-03-12 12:34:39 +00:00
Outdated
Review
Copy Link

Cool, thank you! I have implemented this 🙂

Cool, thank you! I have implemented this 🙂
dev *infinitime.Device
}
func (i Device) HeartRateBytes() ([]byte, error) {
v, err := i.dev.HeartRate()
return []byte(strconv.Itoa(int(v)) + "\n"), err
}
yannickulrich marked this conversation as resolved Outdated
Elara6331 commented 2023-03-08 23:45:27 +00:00
Outdated
Review
Copy Link

err is returned twice here

`err` is returned twice here
yannickulrich commented 2023-03-11 14:09:33 +00:00
Outdated
Review
Copy Link

Oh, sorry, fixed now

Oh, sorry, fixed now
func (i *Device) BatteryLevelBytes() ([]byte, error) {
v, err := i.BatteryLevel()
func (i Device) BatteryLevelBytes() ([]byte, error) {
v, err := i.dev.BatteryLevel()
return []byte(strconv.Itoa(int(v)) + "\n"), err
}
func (i *Device) StepCountBytes() ([]byte, error) {
v, err := i.StepCount()
func (i Device) StepCountBytes() ([]byte, error) {
v, err := i.dev.StepCount()
return []byte(strconv.Itoa(int(v)) + "\n"), err
}
func (i *Device) MotionBytes() ([]byte, error) {
v, err := i.Motion()
func (i Device) MotionBytes() ([]byte, error) {
v, err := i.dev.Motion()
return []byte(strconv.Itoa(int(v.X)) + " " + strconv.Itoa(int(v.Y)) + " " + strconv.Itoa(int(v.Z)) + "\n"), err
}
func (i *Device) AddressBytes() ([]byte, error) {
v := i.Address()
func (i Device) AddressBytes() ([]byte, error) {
v := i.dev.Address()
return []byte(v + "\n"), nil
}
func (i *Device) VersionBytes() ([]byte, error) {
v, err := i.Version()
func (i Device) VersionBytes() ([]byte, error) {
v, err := i.dev.Version()
return []byte(v + "\n"), err
}
@ -507,12 +512,14 @@ func startFuse(ctx context.Context, dev *infinitime.Device) error {
Str("target", mntDir).
Send()
properties[0].f = dev.HeartRateBytes;
properties[1].f = dev.BatteryLevelBytes;
properties[2].f = dev.MotionBytes;
properties[3].f = dev.StepCountBytes;
properties[4].f = dev.VersionBytes;
properties[5].f = dev.AddressBytes;
mydev := Device{dev : dev};
properties[0].f = mydev.HeartRateBytes;
properties[1].f = mydev.BatteryLevelBytes;
properties[2].f = mydev.MotionBytes;
properties[3].f = mydev.StepCountBytes;
properties[4].f = mydev.VersionBytes;
properties[5].f = mydev.AddressBytes;
myfs = &FS{};
inodemap = make(map[string]uint64)