summaryrefslogtreecommitdiff
path: root/cmd/btrfs-rec/main.go
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@lukeshu.com>2022-12-26 22:02:13 -0700
committerLuke Shumaker <lukeshu@lukeshu.com>2022-12-26 23:55:42 -0700
commitd5737a0e71b17a97b82ae68e49acc41a08fcc0ad (patch)
tree7378523c12afd0636b78c08a1bfbd5d26bc97087 /cmd/btrfs-rec/main.go
parent0bbcd2cadf8a6e1a277a68653ac2f7f95c63ba01 (diff)
cmd/btrfs-rec: Add a utility function for reading JSON files with progress
Diffstat (limited to 'cmd/btrfs-rec/main.go')
-rw-r--r--cmd/btrfs-rec/main.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/cmd/btrfs-rec/main.go b/cmd/btrfs-rec/main.go
index 3a00544..87e8696 100644
--- a/cmd/btrfs-rec/main.go
+++ b/cmd/btrfs-rec/main.go
@@ -6,7 +6,6 @@ package main
import (
"context"
- "encoding/json"
"os"
"github.com/datawire/dlib/dgroup"
@@ -122,14 +121,10 @@ func main() {
}()
if mappingsFlag != "" {
- bs, err := os.ReadFile(mappingsFlag)
+ mappingsJSON, err := readJSONFile[[]btrfsvol.Mapping](ctx, mappingsFlag)
if err != nil {
return err
}
- var mappingsJSON []btrfsvol.Mapping
- if err := json.Unmarshal(bs, &mappingsJSON); err != nil {
- return err
- }
for _, mapping := range mappingsJSON {
if err := fs.LV.AddMapping(mapping); err != nil {
return err