Improvements to UX for mounting directories (both CLI and KopiaUI) (#573

)

* cli: simplified mount command

See https://youtu.be/1Nt_HIl-NWQ

It will always use WebDAV on Windows and FUSE on Unix. Removed
confusing options.

New usage:

$ kopia mount [--browse]
    Mounts all snapshots in a temporary filesystem directory
    (both Unix and Windows).

$ kopia mount <object> [--browse]
    Mounts given object in a temporary filesystem directory
    (both Unix and Windows).

$ kopia mount <object> z: [--browse]
    Mounts given object as a given drive letter in Windows (using
    temporary WebDAV mount).

$ kopia mount <object> * [--browse]
    Mounts given object as a random drive letter in Windows.

$ kopia mount <object> /mount/path [--browse]
    Mounts given object in given path in Unix.

<object> can be the ID of a directory 'k<hash>' or 'all'

Optional --browse automatically opens OS-native file browser.

* htmlui: added UI for mounting directories

See https://youtu.be/T-9SshVa1d8 for a quick demo.

Also replaced some UI text with icons.

* lint: windows-specific fix

cli/command_mount.go

@@ -4,20 +4,23 @@ import (
 	"context"
 
 	"github.com/pkg/errors"
+	"github.com/skratchdot/open-golang/open"
 
 	"github.com/kopia/kopia/fs"
 	"github.com/kopia/kopia/fs/cachefs"
 	"github.com/kopia/kopia/fs/loggingfs"
+	"github.com/kopia/kopia/internal/mount"
 	"github.com/kopia/kopia/repo"
 	"github.com/kopia/kopia/snapshot/snapshotfs"
 )
 
 var (
 	mountCommand = app.Command("mount", "Mount repository object as a local filesystem.")
 
-	mountObjectID = mountCommand.Arg("path", "Identifier of the directory to mount.").Required().String()
-	mountPoint    = mountCommand.Arg("mountPoint", "Mount point").Required().String()
-	mountTraceFS  = mountCommand.Flag("trace-fs", "Trace filesystem operations").Bool()
+	mountObjectID    = mountCommand.Arg("path", "Identifier of the directory to mount.").Default("all").String()
+	mountPoint       = mountCommand.Arg("mountPoint", "Mount point").Default("*").String()
+	mountPointBrowse = mountCommand.Flag("browse", "Open file browser").Bool()
+	mountTraceFS     = mountCommand.Flag("trace-fs", "Trace filesystem operations").Bool()
 )
 
 func runMountCommand(ctx context.Context, rep repo.Repository) error {
@@ -39,13 +42,40 @@ func runMountCommand(ctx context.Context, rep repo.Repository) error {
 
 	entry = cachefs.Wrap(entry, newFSCache()).(fs.Directory)
 
-	switch *mountMode {
-	case "FUSE":
-		return mountDirectoryFUSE(ctx, entry, *mountPoint)
-	case "WEBDAV":
-		return mountDirectoryWebDAV(ctx, entry, *mountPoint)
-	default:
-		return errors.Errorf("unsupported mode: %q", *mountMode)
+	ctrl, mountErr := mount.Directory(ctx, entry, *mountPoint)
+
+	if mountErr != nil {
+		return errors.Wrap(mountErr, "mount error")
+	}
+
+	printStderr("Mounted '%v' on %v\n", *mountObjectID, ctrl.MountPath())
+
+	if *mountPoint == "*" && !*mountPointBrowse {
+		printStderr("HINT: Pass --browse to automatically open file browser.\n")
+	}
+
+	printStderr("Press Ctrl-C to unmount.\n")
+
+	if *mountPointBrowse {
+		if err := open.Start(ctrl.MountPath()); err != nil {
+			log(ctx).Warningf("unable to browse %v", err)
+		}
+	}
+
+	// Wait until ctrl-c pressed or until the directory is unmounted.
+	ctrlCPressed := make(chan bool)
+
+	onCtrlC(func() {
+		close(ctrlCPressed)
+	})
+	select {
+	case <-ctrlCPressed:
+		printStderr("Unmounting...\n")
+		return ctrl.Unmount(ctx)
+
+	case <-ctrl.Done():
+		printStderr("Unmounted.\n")
+		return nil
 	}
 }
 

cli/config.go

@@ -46,19 +46,6 @@ func onCtrlC(f func()) {
 	}()
 }
 
-func waitForCtrlC() {
-	// Wait until ctrl-c pressed
-	done := make(chan bool)
-
-	onCtrlC(func() {
-		if done != nil {
-			close(done)
-			done = nil
-		}
-	})
-	<-done
-}
-
 func openRepository(ctx context.Context, opts *repo.Options, required bool) (repo.Repository, error) {
 	if _, err := os.Stat(repositoryConfigFileName()); os.IsNotExist(err) && !required {
 		return nil, nil

htmlui/env.sh

@@ -1 +1 @@
-PATH=$(pwd)/../tools/.tools/node-12.16.1/node/bin:$PATH
+PATH=$(pwd)/../tools/.tools/node-12.18.3/node/bin:$PATH

htmlui/package.json

@@ -3,6 +3,10 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@fortawesome/fontawesome-svg-core": "^1.2.30",
+    "@fortawesome/free-regular-svg-icons": "^5.14.0",
+    "@fortawesome/free-solid-svg-icons": "^5.14.0",
+    "@fortawesome/react-fontawesome": "^0.1.11",
     "@testing-library/jest-dom": "^5.1.1",
     "@testing-library/react": "^9.5.0",
     "axios": "^0.19.2",

htmlui/src/App.css

@@ -59,4 +59,13 @@ div.tab-body {
   padding-left: 10px;
   color: #aaa;
   font-size: 80%;
-}
+}
+
+#mountedPath {
+  color: #444;
+  width: 30em;
+  background-color: #ccc;
+  font-size: 12pt;
+  padding: 4px;
+  border: 1px solid #aaa;
+}