cmd/btrfs-rec: inspect rebuild-mappings list-nodes: Set up logging and stuff

2 files changed, 38 insertions, 25 deletions

diff --git a/cmd/btrfs-rec/inspect_rebuildmappings.go b/cmd/btrfs-rec/inspect_rebuildmappings.go
index b215e7a..43c45b1 100644
--- a/cmd/btrfs-rec/inspect_rebuildmappings.go
+++ b/cmd/btrfs-rec/inspect_rebuildmappings.go
@@ -129,7 +129,7 @@ func init() {
 			"advantage of using previously read data from " +
 			"`btrfs-rec inspect rebuild-nodes scan`.",
 		Args: cliutil.WrapPositionalArgs(cobra.ExactArgs(1)),
-		RunE: func(cmd *cobra.Command, args []string) error {
+		RunE: run(func(cmd *cobra.Command, args []string) error {
 			ctx := cmd.Context()
 
 			scanResults, err := readJSONFile[rebuildmappings.ScanDevicesResult](ctx, args[0])
@@ -159,7 +159,7 @@ func init() {
 			dlog.Info(ctx, "... done writing")
 
 			return nil
-		},
+		}),
 	})
 
 	inspectors.AddCommand(cmd)
diff --git a/cmd/btrfs-rec/main.go b/cmd/btrfs-rec/main.go
index 343a41f..15f1964 100644
--- a/cmd/btrfs-rec/main.go
+++ b/cmd/btrfs-rec/main.go
@@ -107,7 +107,7 @@ func main() {
 	}
 }
 
-func runWithRawFS(runE func(*btrfs.FS, *cobra.Command, []string) error) func(*cobra.Command, []string) error {
+func run(runE func(*cobra.Command, []string) error) func(*cobra.Command, []string) error {
 	return func(cmd *cobra.Command, args []string) error {
 		ctx := cmd.Context()
 		logger := textui.NewLogger(os.Stderr, globalFlags.logLevel.Level)
@@ -126,37 +126,50 @@ func runWithRawFS(runE func(*btrfs.FS, *cobra.Command, []string) error) func(*co
 					err = _err
 				}
 			}
+
 			defer func() {
 				maybeSetErr(globalFlags.stopProfiling())
 			}()
-			if len(globalFlags.pvs) == 0 {
-				// We do this here instead of calling argparser.MarkPersistentFlagRequired("pv") so that
-				// it doesn't interfere with the `help` sub-command.
-				return cliutil.FlagErrorFunc(cmd, fmt.Errorf("must specify 1 or more physical volumes with --pv"))
+			cmd.SetContext(ctx)
+			return runE(cmd, args)
+		})
+		return grp.Wait()
+	}
+}
+
+func runWithRawFS(runE func(*btrfs.FS, *cobra.Command, []string) error) func(*cobra.Command, []string) error {
+	return run(func(cmd *cobra.Command, args []string) (err error) {
+		maybeSetErr := func(_err error) {
+			if _err != nil && err == nil {
+				err = _err
 			}
-			fs, err := btrfsutil.Open(ctx, globalFlags.openFlag, globalFlags.pvs...)
+		}
+
+		if len(globalFlags.pvs) == 0 {
+			// We do this here instead of calling argparser.MarkPersistentFlagRequired("pv") so that
+			// it doesn't interfere with the `help` sub-command.
+			return cliutil.FlagErrorFunc(cmd, fmt.Errorf("must specify 1 or more physical volumes with --pv"))
+		}
+		fs, err := btrfsutil.Open(cmd.Context(), globalFlags.openFlag, globalFlags.pvs...)
+		if err != nil {
+			return err
+		}
+		defer func() {
+			maybeSetErr(fs.Close())
+		}()
+
+		if globalFlags.mappings != "" {
+			mappingsJSON, err := readJSONFile[[]btrfsvol.Mapping](cmd.Context(), globalFlags.mappings)
 			if err != nil {
 				return err
 			}
-			defer func() {
-				maybeSetErr(fs.Close())
-			}()
-
-			if globalFlags.mappings != "" {
-				mappingsJSON, err := readJSONFile[[]btrfsvol.Mapping](ctx, globalFlags.mappings)
-				if err != nil {
+			for _, mapping := range mappingsJSON {
+				if err := fs.LV.AddMapping(mapping); err != nil {
 					return err
 				}
-				for _, mapping := range mappingsJSON {
-					if err := fs.LV.AddMapping(mapping); err != nil {
-						return err
-					}
-				}
 			}
+		}
 
-			cmd.SetContext(ctx)
-			return runE(fs, cmd, args)
-		})
-		return grp.Wait()
-	}
+		return runE(fs, cmd, args)
+	})
 }