feat: add force flag to umount command

Author: jon4hz

main.go

@@ -80,6 +80,14 @@ var mountCmd = &cobra.Command{
 	Run:               mount,
 }
 
+var umountCmdFlags struct {
+	Force bool
+}
+
+func init() {
+	umountCmd.Flags().BoolVarP(&umountCmdFlags.Force, "force", "f", false, "Force unmount the drive(s)")
+}
+
 var umountCmd = &cobra.Command{
 	Use:   "umount",
 	Short: "Unmount a drive",

mount.go

@@ -6,6 +6,7 @@ import (
 	"fmt"
 	"log"
 	"os"
+	"os/exec"
 
 	"github.com/charmbracelet/lipgloss"
 	"github.com/charmbracelet/lipgloss/table"
@@ -83,9 +84,21 @@ func umount(cmd *cobra.Command, args []string) {
 			continue
 		}
 		log.Println("Umounted Drive:", arg)
+
+		if umountCmdFlags.Force {
+			forceUmount(cmd.Context(), arg)
+		}
 	}
 }
 
+// forceUmount calls fusermount -u to force unmount the drive in addition to stopping the systemd service.
+// This doesnt always work, but it is a good last resort.
+// Errors are always ignored, as fusermount -u will return an error if the drive is not mounted.
+func forceUmount(ctx context.Context, driveName string) {
+	drivePath := getDriveDataPath(driveName)
+	exec.CommandContext(ctx, "/bin/fusermount", "-u", drivePath).Run() //nolint:errcheck
+}
+
 func list(cmd *cobra.Command, _ []string) {
 	conn, err := dbus.NewUserConnectionContext(cmd.Context())
 	if err != nil {