-
-
Notifications
You must be signed in to change notification settings - Fork 1.9k
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.
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
Independent filetree buffer + partial tree rendering #18
Conversation
@@ -133,7 +133,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree) { | |||
var trees []*filetree.FileTree = make([]*filetree.FileTree, 0) | |||
|
|||
// save this image to disk temporarily to get the content info | |||
// fmt.Println("Fetching image...") | |||
fmt.Println("Fetching image...") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Did you mean to uncomment this print statement?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
actually, I never meant to comment it out to begin with :)
// keep the child nodes to visit later | ||
paramsToVisit = append(childParams, paramsToVisit...) | ||
|
||
// never process the root node |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I don't understand why you never process the root. Does this mean that the line /
in the file system never shoes up in the output?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Indeed, this is so the root dir never shows up in the filetree and we also don't have any information on it. The tar you get from the docker save command has the contents of what in the images root dir, but no info on /
itself. I couldn't see a reason to include it in the tree other than to hide all files... so I left it out.
However, from a data structure point of view keeping a single root node simplifies how you traverse the tree (instead of having multiple root nodes you have one, and the children are the "real" start to the tree).
Downside is preventing weird one-off bugs :/
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I like this solution. I just had a couple questions. Approved.
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
* chore: configure Renovate (#1) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update github artifact actions to v4 (#20) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update docker/login-action action to v3 (#19) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/setup-go action to v5 (#18) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/checkout action to v4 (#17) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update actions/cache action to v4 (#16) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * build: use Go 1.23.x to build project * chore(deps): update build tools - golangci-lint v1.16.0: https://github.com/golangci/golangci-lint/releases/tag/v1.61.0 - GoReleaser v1.61.0: https://github.com/goreleaser/goreleaser/releases/tag/v1.26.2 - Chronicle v0.8.0: https://github.com/anchore/chronicle/releases/tag/v0.8.0 - Glow v1.5.1: https://github.com/charmbracelet/glow/releases/tag/v1.5.1 * chore: temporarily lower coverage threshold to 30% Old coverage: ``` go test -race -coverprofile ./.tmp/unit-coverage-details.txt ./... ? github.com/wagoodman/dive [no test files] ? github.com/wagoodman/dive/cmd [no test files] ? github.com/wagoodman/dive/dive [no test files] ? github.com/wagoodman/dive/dive/image [no test files] ok github.com/wagoodman/dive/dive/filetree 0.032s coverage: 58.0% of statements ? github.com/wagoodman/dive/dive/image/podman [no test files] ok github.com/wagoodman/dive/dive/image/docker 0.076s coverage: 43.6% of statements ? github.com/wagoodman/dive/runtime/ui [no test files] ? github.com/wagoodman/dive/runtime/ui/format [no test files] ? github.com/wagoodman/dive/runtime/ui/key [no test files] ok github.com/wagoodman/dive/runtime 0.531s coverage: 53.3% of statements ok github.com/wagoodman/dive/runtime/ci 0.087s coverage: 62.1% of statements ok github.com/wagoodman/dive/runtime/export 0.096s coverage: 100.0% of statements ? github.com/wagoodman/dive/runtime/ui/layout/compound [no test files] ? github.com/wagoodman/dive/runtime/ui/view [no test files] ok github.com/wagoodman/dive/runtime/ui/layout 0.021s coverage: 82.6% of statements ? github.com/wagoodman/dive/utils [no test files] ok github.com/wagoodman/dive/runtime/ui/viewmodel 1.202s coverage: 55.3% of statements Coverage: 57.5% ``` New coverage: ``` go test -race -coverprofile ./.tmp/unit-coverage-details.txt ./... github.com/wagoodman/dive/dive coverage: 0.0% of statements github.com/wagoodman/dive/cmd coverage: 0.0% of statements github.com/wagoodman/dive coverage: 0.0% of statements github.com/wagoodman/dive/dive/image coverage: 0.0% of statements github.com/wagoodman/dive/dive/image/podman coverage: 0.0% of statements ok github.com/wagoodman/dive/dive/filetree 1.027s coverage: 58.0% of statements ok github.com/wagoodman/dive/dive/image/docker 1.064s coverage: 43.6% of statements github.com/wagoodman/dive/runtime/ui coverage: 0.0% of statements github.com/wagoodman/dive/runtime/ui/format coverage: 0.0% of statements github.com/wagoodman/dive/runtime/ui/key coverage: 0.0% of statements github.com/wagoodman/dive/runtime/ui/layout/compound coverage: 0.0% of statements github.com/wagoodman/dive/runtime/ui/view coverage: 0.0% of statements ok github.com/wagoodman/dive/runtime 1.382s coverage: 53.3% of statements ok github.com/wagoodman/dive/runtime/ci 1.055s coverage: 62.1% of statements github.com/wagoodman/dive/utils coverage: 0.0% of statements ok github.com/wagoodman/dive/runtime/export 1.048s coverage: 100.0% of statements ok github.com/wagoodman/dive/runtime/ui/layout 1.012s coverage: 82.6% of statements ok github.com/wagoodman/dive/runtime/ui/viewmodel 2.202s coverage: 55.3% of statements Coverage: 31.8% Coverage below threshold of 55.0% ``` * chore(deps): update fountainhead/action-wait-for-check action to v1.2.0 (#25) https://github.com/fountainhead/action-wait-for-check/releases/tag/v1.2.0 * ci: validate Renovate configuration file on build * ci: add gomodTidy and gomodUpdateImportPaths post update options to Renovate * fix(deps): update module github.com/dustin/go-humanize to v1.0.1 (#5) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update alpine docker tag to v3.20 (#7) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update github.com/awesome-gocui/keybinding digest to 8602903 (#2) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/cobra to v0.0.7 (#6) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/fatih/color to v1.18.0 (#9) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/google/uuid to v1.6.0 (#10) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/sergi/go-diff to v1.3.1 (#11) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/cespare/xxhash to v2 (#21) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v24.0.9+incompatible (#3) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/viper to v1.19.0 (#14) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/sirupsen/logrus to v1.9.3 (#12) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.30.0 (#15) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/cobra to v1 (#23) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v27 (#22) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/cli to v27.3.1+incompatible (#27) * ci: run Linux acceptance tests in parallel (#28) * chore(deps): update module logrusorgru/aurora to v4 (major) (#29) github.com/logrusorgru/aurora changed the license from the WTFPL to the Unlicense due to pkg.go.dev restrictions. Refs logrusorgru/aurora@304bc2c * build: squash Docker image layers (#30) Refs #535 * chore(deps): update Docker CLI version to 27.3.1 (#31) * ci: update GoReleaser configuration (#33) * chore(deps): update GoReleaser to v2.4.4 (major) (#32) * revert: run Linux acceptance tests in parallel This reverts commit 1971472. * ci: fix image name, actions/checkout@v4, docker/login-action name * fix: create `~/.docker` directory in Docker images (#34) Error: ``` ❯ docker run -ti --rm -v /var/run/docker.sock:/var/run/docker.sock joschi/dive:0.13.0-alpha.1 busybox:latest Image Source: docker://busybox:latest Extracting image from docker-engine... (this can take a while for large images) > could not determine docker host: stat /root/.docker: no such file or directory cannot fetch image unable to parse docker host `` ``` * build: added ppc64le support (#551) Co-authored-by: Pooja Shah <53046887+pooja0805@users.noreply.github.com> * fix: fix OCI format, GZIP file can be <1024 bytes (#511) Fixes #507 Fixes #510 Fixes #526 Fixes #534 Co-authored-by: Maddog2050 <17902029+Maddog2050@users.noreply.github.com> * docs: fix typos (#531) Found via `codespell -L ot,te` and `typos --hidden --format brief` Closes #464 Co-authored-by: Kian-Meng Ang <kianmeng@cpan.org> * docs: add more Windows installation options to the README (#470) Fixes #346 Co-authored-by: Nikolas Grottendieck <git@nikolasgrottendieck.com> * docs: Update README.md (#506) Made copy and paste easy for zsh users - auto escape character issue Co-authored-by: YóUnǎi <c0d3r.nodiru.gaji@gmail.com> * docs: update the install command to the latest Go version (#509) `go get` no longer works with recent versions of `go`. Co-authored-by: Trevor Gross <tmgross@umich.edu> * chore: remove repetitive words (#515) Co-authored-by: thirdkeyword <fliterdashen@gmail.com> Signed-off-by: thirdkeyword <fliterdashen@gmail.com> * fix: close tmp files (#517) Co-authored-by: guoguangwu <guoguangwug@gmail.com> Signed-off-by: guoguangwu <guoguangwug@gmail.com> * chore: fix phony ci-release target (#530) Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud> * docs: warning message for Snap approach on Ubuntu/Debian (#552) #546 demonstrates the trouble it may cause. Co-authored-by: Zhang Yuanfeng <71358306+YuanfengZhang@users.noreply.github.com> * docs: update curl commands in README (#533) Co-authored-by: Ali Afsharzadeh <afsharzadeh8@gmail.com> * feat: improve "Fetching" message (#482) The Fetching... message was confusing. This replaces it with a clearer messages to avoid confusion. Additional fix: show original error unless image is not found Only try doing a pull if the image isn't found. Everything else should just generate the error so the user can fix it. Fixes #360 Co-authored-by: Christian Höltje <docwhat@gerf.org> * fix: line wrap toggle now updates status bar indicator (#497) Fixes #496 Co-authored-by: Scott Moore <scott.moore@viavisolutions.com> * feat: show setuid, setgid and sticky attributes (#524) See https://en.wikipedia.org/wiki/File-system_permissions#Notation_of_traditional_Unix_permissions Co-authored-by: Alexander Yastrebov <alexander.yastrebov@zalando.de> * feat(docker): Honor the host specified in current docker context (#490) This patch adds support for detecting the "docker host" to connect to which is set in the current docker context. One can have multiple such contexts and one of them can be activated via `docker context use <context-name>`. Fixes #397 Fixes #408 Fixes #412 Fixes #463 Fixes #495 Co-authored-by: Rajiv Kushwaha <raj25by10@gmail.com> * fix: can't inspect ubuntu:24.04 with Podman (#476) The problem was caused by `net/url.Parse()`: ``` panic: parse "podman://ubuntu:24.04": invalid port ":24.04" after host ``` Failure: ``` $ ./dive podman://ubuntu:24.04 Image Source: docker://podman://ubuntu:24.04 Fetching image... (this can take a while for large images) Handler not available locally. Trying to pull 'podman://ubuntu:24.04'... cannot fetch image cannot find docker client executable ``` Success: ``` $ ./dive podman://ubuntu:24.04 Image Source: podman://ubuntu:24.04 ... $ ./dive ubuntu:24.04 --source podman Image Source: podman://ubuntu:24.04 ... $ ./dive podman://ubuntu:24.04 --source docker Image Source: podman://ubuntu:24.04 ... ``` Fixes #475 Co-authored-by: Anatoli Babenia <anatoli@rainforce.org> * fix: enable layer scrolling (#521) Fixes #469 Fixes #494 Fixes #540 Refs #473 Refs #478 Refs #520 Co-authored-by: st-gr <38470677+st-gr@users.noreply.github.com> * feat: add layer-wise filesystem information to the analysis json file (#458) Add layer-wise filesystem information to the analysis which is written to a JSON file when running dive with `-j` or `--json` flag. Co-authored-by: Akash Nayak <akash19nayak@gmail.com> * feat: add size to Layer Details view (#522) Refs #469 (comment) Co-authored-by: st-gr <38470677+st-gr@users.noreply.github.com> * feat: add CTRL+e for extracting current focused file Refs #224 Co-authored-by: kaedwen <kaedwen@heinrich.blue> * feat: vim-like arrow, scroll, and close filtering motions (#501) * Adding configurable keybindings for up/down arrows (`k` and `j` vim motions can be used as alternative to up/down arrows). Thanks to @gwendolyngoetz for implementing this feature [Adding configurable keybindings for up/down arrows #499](#499) * Add configurable keybindings for left/right arrows (`h` and `l` vim motions can be used as alternative to left/right arrows) * Add `u` and `d` keys for page up/down alternatives (I didn't want to replace default `ctrl+u` toggle-unmodified-files keybinding so I used`u` and `d` like `Vimium` extension ) * Add `esc` key to close filtering (Implemented a new method by utilizing the existing toggle filter method, without touching its current behavior) Refs #129 Refs #415 Refs #499 Co-authored-by: Gwendolyn Goetz <gwendolyngoetz@users.noreply.github.com> Co-authored-by: Mehmet Ümit Özden <ozdenmehmetumit@gmail.com> * fix: gracefully check for Docker configuration (#37) Refs jesseduffield/lazydocker#489 * refactor!: migrate Go module from wagoodman/dive to joschi/dive (#36) * refactor!: migrate Go module from wagoodman/dive to joschi/dive * fix: bring back :latest Docker image * feat: create multi-arch container images with AMD64 and ARM64 (#38) * feat: create multi-arch container images with AMD64 and ARM64 * fix: use joschi/dive:latest-amd64 in CI * ci: use correct container registry in `ci-test-docker-image` (#39) * docs: fix Homebrew instructions in README * fix(deps): update module golang.org/x/net to v0.31.0 (#40) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update suzuki-shunsuke/github-action-renovate-config-validator action to v1.1.1 (#43) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.32.0 (#44) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * chore(deps): update alpine docker tag to v3.21 (#45) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/cli to v27.4.1+incompatible (#46) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.33.0 (#48) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v27.4.1+incompatible (#47) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.34.0 (#49) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/afero to v1.12.0 (#50) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/cli to v27.5.0+incompatible (#51) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v27.5.0+incompatible (#52) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/cli to v27.5.1+incompatible (#54) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v27.5.1+incompatible (#55) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * feat: support oci zstd compression (#53) Co-authored-by: Jochen Schalanda <jochen@schalanda.name> * fix(deps): update module github.com/klauspost/compress to v1.17.11 (#57) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.35.0 (#59) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/cobra to v1.9.0 (#60) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/cobra to v1.9.1 (#62) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/klauspost/compress to v1.18.0 (#63) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/cli to v28 (#64) * fix(deps): update module github.com/docker/cli to v28 * Replace deprecated function in engineResolver.fetchArchive() --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Jochen Schalanda <jochen@schalanda.name> * build: bump Go toolchain from 1.23.x to 1.24.x (#61) * build: bump Go toolchain from 1.23.x to 1.24.x * chore(deps): bump golangci-lint from v1.61.0 to v1.64.5 * fix: non-constant format string in call to (*testing.common).Errorf * test: add layer_set_state_test * fix(deps): update module github.com/docker/cli to v28.0.1+incompatible (#66) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/docker/docker to v28.0.1+incompatible (#65) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.36.0 (#73) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module golang.org/x/net to v0.37.0 (#74) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/viper to v1.20.0 (#76) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * fix(deps): update module github.com/spf13/afero to v1.14.0 (#75) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> * refactor!: revert module name back to github.com/wagoodman/dive Partially reverts e46f931 * chore: remove Renovate configuration Reverts aa75fbf * Revert "ci: validate Renovate configuration file on build" This reverts commit 8d93877. --------- Signed-off-by: thirdkeyword <fliterdashen@gmail.com> Signed-off-by: guoguangwu <guoguangwug@gmail.com> Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Pooja Shah <53046887+pooja0805@users.noreply.github.com> Co-authored-by: Maddog2050 <17902029+Maddog2050@users.noreply.github.com> Co-authored-by: Kian-Meng Ang <kianmeng@cpan.org> Co-authored-by: Nikolas Grottendieck <git@nikolasgrottendieck.com> Co-authored-by: YóUnǎi <c0d3r.nodiru.gaji@gmail.com> Co-authored-by: Trevor Gross <tmgross@umich.edu> Co-authored-by: thirdkeyword <fliterdashen@gmail.com> Co-authored-by: guoguangwu <guoguangwug@gmail.com> Co-authored-by: Richard Steinmetz <richard@steinmetz.cloud> Co-authored-by: Zhang Yuanfeng <71358306+YuanfengZhang@users.noreply.github.com> Co-authored-by: Ali Afsharzadeh <afsharzadeh8@gmail.com> Co-authored-by: Christian Höltje <docwhat@gerf.org> Co-authored-by: Scott Moore <scott.moore@viavisolutions.com> Co-authored-by: Alexander Yastrebov <alexander.yastrebov@zalando.de> Co-authored-by: Rajiv Kushwaha <raj25by10@gmail.com> Co-authored-by: Anatoli Babenia <anatoli@rainforce.org> Co-authored-by: st-gr <38470677+st-gr@users.noreply.github.com> Co-authored-by: Akash Nayak <akash19nayak@gmail.com> Co-authored-by: kaedwen <kaedwen@heinrich.blue> Co-authored-by: Gwendolyn Goetz <gwendolyngoetz@users.noreply.github.com> Co-authored-by: Mehmet Ümit Özden <ozdenmehmetumit@gmail.com> Co-authored-by: steven-halaka <steven.halaka@twosixtech.com>
This was a dozy. Essentially
pprof
was indicating that too much time was spend writing large strings to the gocui view buffer. This makes sense: when any event occurs (e.g. cursor up, down, collapse, etc) we render a filetree string and write the entire tree to the buffer.One considered fix was to cache all written lines so when a simple action occurs (such as a cursor move) we are only updating that those two lines (instead of writing the entire tree). Unfortunately, gocui doesn't have a buffer seek or line update methods to use, so that approach was ditched.
Instead
filetree.String
was adapted intofiletree.StringBetween
to only generate a string of nodes between two DFS-ordered indexes in this tree. This implied that a non-recursive approach to generating a tree, which makes the code more verbose but easier to reason about what will happen next.A side effect of this was that the gocui buffer would not be utilized. That is, if I write a string to the buffer that is larger than the screen dimensions, then a scrolling mechanism is provided for a user to view more of the string buffer. However, now that we are essentially only rendering a strings large enough to fit on the screen (instead of the whole tree) it no longer made sense to use gocui's scrolling capabilities (i.e.
SetOrigin
).So... this PR implements a new filetree buffer that:
What does this buy us? Now when viewing a very large tree the view is much more performant (before this, it was quite laggy)