Get it to compile with the renamed files

    #!/bin/bash
    set -e

    git ls-files :*.go :!tools/| while read -r file; do
    	pkgname=${file%/*.go}
    	pkgname=${pkgname##*/}
    	if [[ "$pkgname" == btrfs-rec ]]; then
    		pkgname=main
    	fi
    	sed -i "s/^package [^_]*/package ${pkgname}/" "$file"
    done

    # btrfsutil ####################################################################

    gofmt -w -r 'rebuildnodes -> rebuildtrees' cmd lib
    gofmt -w -r 'btrees       -> btrfsutil'    cmd lib
    gofmt -w -r 'keyio        -> btrfsutil'    cmd lib

    sed -i 's/func New/func NewGraph/' lib/btrfsutil/graph.go
    gofmt -w -r 'graph.New   -> btrfsutil.NewGraph' cmd lib
    gofmt -w -r 'graph.Graph -> btrfsutil.Graph'    cmd lib
    sed -i -e '/\/graph"/d' -e 's/pkggraph\.//' lib/btrfsutil/rebuilt_forrest.go

    gofmt -w -r 'btrfsutil.BrokenForrest -> BrokenForrest ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Handle        -> Handle        ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Graph         -> Graph         ' lib/btrfsutil
    gofmt -w -r 'btrfsutil.ItemPtr       -> ItemPtr       ' lib/btrfsutil

    gofmt -w -r 'Handle -> KeyIO' lib/btrfsutil
    gofmt -w -r 'btrfsutil.Handle -> btrfsutil.KeyIO' cmd/btrfs-rec/inspect/rebuildtrees/
    gofmt -w -r 'NewHandle -> NewKeyIO' cmd lib

    # rebuildmappings ##############################################################

    gofmt -w -r 'btrfsinspect.DumpTrees         -> dumptrees.DumpTrees'               cmd lib
    gofmt -w -r 'btrfsinspect.MountRO           -> mount.MountRO'                     cmd lib
    gofmt -w -r 'btrfsinspect.ScanDevices       -> rebuildmappings.ScanDevices'       cmd lib
    gofmt -w -r 'btrfsinspect.ScanDevicesResult -> rebuildmappings.ScanDevicesResult' cmd lib
    gofmt -w -r 'btrfsinspect.SysExtentCSum     -> rebuildmappings.SysExtentCSum'     cmd lib

    gofmt -w -r 'rebuildmappings.IndexAll          -> IndexAll          ' cmd/btrfs-rec/inspect/rebuildmappings
    gofmt -w -r 'rebuildmappings.ScanDevicesResult -> ScanDevicesResult ' cmd/btrfs-rec/inspect/rebuildmappings
    gofmt -w -r 'rebuildmappings.SysExtentCSum     -> SysExtentCSum     ' cmd/btrfs-rec/inspect/rebuildmappings

    # btrfscheck ###################################################################

    sed -i -e 's/func handle/func Handle/' lib/btrfscheck/graph.go
    sed -i 's/handle/btrfscheck.Handle/g' cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
    gofmt -w -r 'fsErr        -> FSErr        ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'want         -> Want         ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantOff      -> WantOff      ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantDirIndex -> WantDirIndex ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantCSum     -> WantCSum     ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees
    gofmt -w -r 'wantFileExt  -> WantFileExt  ' lib/btrfscheck cmd/btrfs-rec/inspect/rebuildtrees

    # generic imports ##############################################################

    replace() {
    	git grep -l "$1"|xargs -r sed -i "s,$1,$2,g"
    }

    replace 'lib/btrfsprogs/btrfsinspect/rebuildmappings"' 'cmd/btrfs-rec/inspect/rebuildmappings"'
    replace 'lib/btrfsprogs/btrfsinspect/rebuildnodes"'    'cmd/btrfs-rec/inspect/rebuildtrees"'
    replace 'lib/btrfsprogs/btrfsutil"'                    'lib/btrfsutil"'
    goimports -w cmd lib
    ./tools/bin/golangci-lint run --fix ./...

And then touch-up copyright statements by hand.

1 files changed, 11 insertions, 12 deletions

diff --git a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
index cf334a0..6492d9c 100644
--- a/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
+++ b/cmd/btrfs-rec/inspect/rebuildtrees/rebuild.go
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: GPL-2.0-or-later
 
-package rebuildnodes
+package rebuildtrees
 
 import (
 	"context"
@@ -14,15 +14,14 @@ import (
 	"github.com/datawire/dlib/dgroup"
 	"github.com/datawire/dlib/dlog"
 
+	"git.lukeshu.com/btrfs-progs-ng/cmd/btrfs-rec/inspect/rebuildmappings"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsitem"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsprim"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfstree"
 	"git.lukeshu.com/btrfs-progs-ng/lib/btrfs/btrfsvol"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/btrees"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/graph"
-	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsprogs/btrfsinspect/rebuildnodes/keyio"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfscheck"
+	"git.lukeshu.com/btrfs-progs-ng/lib/btrfsutil"
 	"git.lukeshu.com/btrfs-progs-ng/lib/containers"
 	"git.lukeshu.com/btrfs-progs-ng/lib/maps"
 	"git.lukeshu.com/btrfs-progs-ng/lib/textui"
@@ -46,10 +45,10 @@ func (o keyAndTree) String() string {
 
 type rebuilder struct {
 	sb    btrfstree.Superblock
-	graph graph.Graph
-	keyIO *keyio.Handle
+	graph btrfsutil.Graph
+	keyIO *btrfsutil.KeyIO
 
-	rebuilt *btrees.RebuiltForrest
+	rebuilt *btrfsutil.RebuiltForrest
 
 	curKey struct {
 		TreeID btrfsprim.ObjID
@@ -75,7 +74,7 @@ type Rebuilder interface {
 	ListRoots(context.Context) map[btrfsprim.ObjID]containers.Set[btrfsvol.LogicalAddr]
 }
 
-func NewRebuilder(ctx context.Context, fs *btrfs.FS, nodeScanResults btrfsinspect.ScanDevicesResult) (Rebuilder, error) {
+func NewRebuilder(ctx context.Context, fs *btrfs.FS, nodeScanResults rebuildmappings.ScanDevicesResult) (Rebuilder, error) {
 	ctx = dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.step", "read-fs-data")
 	sb, nodeGraph, keyIO, err := ScanDevices(ctx, fs, nodeScanResults) // ScanDevices does its own logging
 	if err != nil {
@@ -87,7 +86,7 @@ func NewRebuilder(ctx context.Context, fs *btrfs.FS, nodeScanResults btrfsinspec
 		graph: nodeGraph,
 		keyIO: keyIO,
 	}
-	o.rebuilt = btrees.NewRebuiltForrest(sb, nodeGraph, keyIO, o)
+	o.rebuilt = btrfsutil.NewRebuiltForrest(sb, nodeGraph, keyIO, o)
 	return o, nil
 }
 
@@ -214,7 +213,7 @@ func (o *rebuilder) processAddedItemQueue(ctx context.Context) error {
 			progress.NumAugments = o.numAugments
 			progress.NumAugmentTrees = len(o.augmentQueue)
 			progressWriter.Set(progress)
-		} else if !handleWouldBeNoOp(key.ItemType) {
+		} else if !btrfscheck.HandleWouldBeNoOp(key.ItemType) {
 			o.settledItemQueue.Insert(key)
 		}
 	}
@@ -284,7 +283,7 @@ func (o *rebuilder) processSettledItemQueue(ctx context.Context) error {
 			ctx := dlog.WithField(ctx, "btrfsinspect.rebuild-nodes.rebuild.process.item", item.keyAndTree)
 			o.curKey.TreeID = item.TreeID
 			o.curKey.Key.Val = item.Key
-			handleItem(o, ctx, item.TreeID, btrfstree.Item{
+			btrfscheck.HandleItem(o, ctx, item.TreeID, btrfstree.Item{
 				Key:  item.Key,
 				Body: item.Body,
 			})