vfs: factor flags into vfsflags and remove global variables

vfs/vfsflags/vfsflags.go

@@ -0,0 +1,38 @@
+// Package vfsflags implements command line flags to set up a vfs
+package vfsflags
+
+import (
+	"os"
+	"time"
+
+	"github.com/ncw/rclone/vfs"
+	"github.com/spf13/pflag"
+)
+
+// Options set by command line flags
+var (
+	Opt = vfs.Options{
+		NoModTime:    false,
+		NoChecksum:   false,
+		NoSeek:       false,
+		DirCacheTime: 5 * 60 * time.Second,
+		PollInterval: time.Minute,
+		ReadOnly:     false,
+		Umask:        0,
+		UID:          ^uint32(0), // these values instruct WinFSP-FUSE to use the current user
+		GID:          ^uint32(0), // overriden for non windows in mount_unix.go
+		DirPerms:     os.FileMode(0777),
+		FilePerms:    os.FileMode(0666),
+	}
+)
+
+// AddFlags adds the non filing system specific flags to the command
+func AddFlags(flags *pflag.FlagSet) {
+	flags.BoolVarP(&Opt.NoModTime, "no-modtime", "", Opt.NoModTime, "Don't read/write the modification time (can speed things up).")
+	flags.BoolVarP(&Opt.NoChecksum, "no-checksum", "", Opt.NoChecksum, "Don't compare checksums on up/download.")
+	flags.BoolVarP(&Opt.NoSeek, "no-seek", "", Opt.NoSeek, "Don't allow seeking in files.")
+	flags.DurationVarP(&Opt.DirCacheTime, "dir-cache-time", "", Opt.DirCacheTime, "Time to cache directory entries for.")
+	flags.DurationVarP(&Opt.PollInterval, "poll-interval", "", Opt.PollInterval, "Time to wait between polling for changes. Must be smaller than dir-cache-time. Only on supported remotes. Set to 0 to disable.")
+	flags.BoolVarP(&Opt.ReadOnly, "read-only", "", Opt.ReadOnly, "Mount read-only.")
+	platformFlags(flags)
+}

vfs/vfsflags/vfsflags_non_unix.go

@@ -0,0 +1,11 @@
+// +build !linux,!darwin,!freebsd
+
+package vfsflags
+
+import (
+	"github.com/spf13/pflag"
+)
+
+// add any extra platform specific flags
+func platformFlags(flags *pflag.FlagSet) {
+}

vfs/vfsflags/vfsflags_unix.go

@@ -0,0 +1,19 @@
+// +build linux darwin freebsd
+
+package vfsflags
+
+import (
+	"github.com/spf13/pflag"
+	"golang.org/x/sys/unix"
+)
+
+// add any extra platform specific flags
+func platformFlags(flags *pflag.FlagSet) {
+	flags.IntVarP(&Opt.Umask, "umask", "", Opt.Umask, "Override the permission bits set by the filesystem.")
+	Opt.Umask = unix.Umask(0) // read the umask
+	unix.Umask(Opt.Umask)     // set it back to what it was
+	Opt.UID = uint32(unix.Geteuid())
+	Opt.GID = uint32(unix.Getegid())
+	flags.Uint32VarP(&Opt.UID, "uid", "", Opt.UID, "Override the uid field set by the filesystem.")
+	flags.Uint32VarP(&Opt.GID, "gid", "", Opt.GID, "Override the gid field set by the filesystem.")
+}