Skip to content

fix: extract file functionality #659

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aj0413 wants to merge 2 commits into
base: main
Choose a base branch
from
+15 −8
Open

fix: extract file functionality #659

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6a3aa91
fix: partially fix extract file functionality
aj0413 Nov 2, 2025
aff775d
fix: pass nil for filterRegex when extracting file
aj0413 Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions .data/Dockerfile.minimal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,7 @@
FROM scratch
COPY README.md /README.md
FROM busybox:latest AS minimal
COPY README.md /extract/README.md
RUN mkdir -p /root/minimal/really/nested

FROM alpine:latest AS final
COPY --from=minimal /extract/README.md /tmp/README.md
RUN mkdir -p /root/minimal
7 changes: 4 additions & 3 deletions cmd/dive/cli/internal/ui/v1/app/controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,12 @@ package app

import (
"fmt"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1"
"regexp"

v1 "github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1/view"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1/viewmodel"
"golang.org/x/net/context"
"regexp"

"github.com/awesome-gocui/gocui"
)
Expand Down Expand Up @@ -60,7 +61,7 @@ func newController(ctx context.Context, g *gocui.Gui, cfg v1.Config) (*controlle
}

func (c *controller) onFileTreeViewExtract(p string) error {
return c.config.Content.Extract(c.ctx, c.config.Analysis.Image, c.views.LayerDetails.CurrentLayer.Id, p)
return c.config.Content.Extract(c.ctx, c.config.Analysis.Image, c.views.LayerDetails.CurrentLayer.Tree.Name, p)
}

func (c *controller) onFileTreeViewOptionChange() error {
Expand Down
7 changes: 4 additions & 3 deletions cmd/dive/cli/internal/ui/v1/view/filetree.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@ package view

import (
"fmt"
"regexp"

"github.com/anchore/go-logger"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1"
v1 "github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1/format"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1/key"
"github.com/wagoodman/dive/cmd/dive/cli/internal/ui/v1/viewmodel"
"github.com/wagoodman/dive/internal/log"
"github.com/wagoodman/dive/internal/utils"
"regexp"

"github.com/awesome-gocui/gocui"
"github.com/wagoodman/dive/dive/filetree"
Expand Down Expand Up @@ -321,7 +322,7 @@ func (v *FileTree) toggleSortOrder() error {
}

func (v *FileTree) extractFile() error {
node := v.vm.CurrentNode(v.filterRegex)
node := v.vm.CurrentNode(nil)
for _, listener := range v.extractListeners {
err := listener(node.Path())
if err != nil {
Expand Down