diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index d760727fd..2f81a2551 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -39,7 +39,7 @@ jobs: # Initializes the CodeQL tools for scanning. - name: Initialize CodeQL - uses: github/codeql-action/init@v2 + uses: github/codeql-action/init@v3 with: languages: ${{ matrix.language }} # If you wish to specify custom queries, you can do so here or in a config file. @@ -50,7 +50,7 @@ jobs: # Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # If this step fails, then you should remove it and run the build manually (see below) - name: Autobuild - uses: github/codeql-action/autobuild@v2 + uses: github/codeql-action/autobuild@v3 # ℹī¸ Command-line programs to run using the OS shell. # 📚 https://git.io/JvXDl @@ -64,4 +64,4 @@ jobs: # make release - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@v2 + uses: github/codeql-action/analyze@v3 diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index c1a91b536..ae85065c5 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -12,13 +12,13 @@ jobs: runs-on: ubuntu-latest steps: - name: Install Go - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.18.x - name: Checkout code uses: actions/checkout@v4 - name: Run linters - uses: golangci/golangci-lint-action@v3 + uses: golangci/golangci-lint-action@v4 with: version: v1.45 @@ -31,7 +31,7 @@ jobs: steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: ${{ matrix.go-version }} - name: Checkout code @@ -44,7 +44,7 @@ jobs: steps: - name: Install Go if: success() - uses: actions/setup-go@v4 + uses: actions/setup-go@v5 with: go-version: 1.18.x - name: Checkout code diff --git a/gdu.spec b/gdu.spec index 2bdd1333c..a856b5e70 100644 --- a/gdu.spec +++ b/gdu.spec @@ -1,12 +1,12 @@ Name: gdu -Version: 5.25.0 -Release: 3%{?dist} +Version: 5.27.0 +Release: 1 Summary: Pretty fast disk usage analyzer written in Go License: MIT URL: https://github.com/dundee/gdu -Source0: %{name}-%{version}.tar.gz +Source0: https://github.com/dundee/gdu/archive/refs/tags/%{version}.tar.gz BuildRequires: golang BuildRequires: systemd-rpm-macros @@ -20,8 +20,7 @@ Pretty fast disk usage analyzer written in Go. %global debug_package %{nil} %prep -%autosetup - +%autosetup -n %{name} %build GO111MODULE=on CGO_ENABLED=0 go build \ @@ -33,14 +32,14 @@ GO111MODULE=on CGO_ENABLED=0 go build \ %if 0%{?fedora} || 0%{?amzn} "-linkmode=external \ -s -w \ --X 'github.com/dundee/gdu/v5/build.Version=v%{version}' \ +-X 'github.com/dundee/gdu/v5/build.Version=$(git describe)' \ -X 'github.com/dundee/gdu/v5/build.User=$(id -u -n)' \ -X 'github.com/dundee/gdu/v5/build.Time=$(LC_ALL=en_US.UTF-8 date)'" \ -o %{name} github.com/dundee/gdu/v5/cmd/gdu %endif %if 0%{?rhel} "-s -w \ --X 'github.com/dundee/gdu/v5/build.Version=v%{version}' \ +-X 'github.com/dundee/gdu/v5/build.Version=$(git describe)' \ -X 'github.com/dundee/gdu/v5/build.User=$(id -u -n)' \ -X 'github.com/dundee/gdu/v5/build.Time=$(LC_ALL=en_US.UTF-8 date)'" \ -o %{name} github.com/dundee/gdu/v5/cmd/gdu @@ -63,7 +62,19 @@ install -Dpm 0755 %{name}.1 $RPM_BUILD_ROOT%{_mandir}/man1/gdu.1 %{_mandir}/man1/gdu.1.gz %changelog -* Fri Dec 1 2023 Danie de Jager - 5.25.0-3 +* Sun Feb 18 2024 Danie de Jager - 5.27.0-1 +- feat: export in interactive mode by @kadogo in #298 +- feat: handle vim-style navigation in confirmation by @samihda in #283 +- fix: panic with Interface Conversion Nil Error by @ShivamB25 in #274 +- fix: Enter key properly working when reading analysis from file by @dundee in #312 +- fix: check if type matches for selected device by @dundee in #318 +- ci: package gdu in docker container by @rare-magma in #313 +- ci: add values for building gdu with tito by @daniejstriata in #288 +- ci: change Winget Releaser job to ubuntu-latest by @sitiom in #271 +* Tue Feb 13 2024 Danie de Jager - 5.26.0-1 +- feat: use key-value store for analysis data in #297 +- feat: use profile-guided optimization in #286 +* Fri Dec 1 2023 Danie de Jager - 5.25.0-2 - Improved SPEC to build on AL2023. * Tue Jun 6 2023 Danie de Jager - 5.25.0-1 - feat: use unicode block elements in size bar in #255 diff --git a/go.mod b/go.mod index d5cc3279a..1a5b0f8e5 100644 --- a/go.mod +++ b/go.mod @@ -4,15 +4,15 @@ go 1.20 require ( github.com/dgraph-io/badger/v3 v3.2103.5 - github.com/fatih/color v1.15.0 + github.com/fatih/color v1.16.0 github.com/gdamore/tcell/v2 v2.7.1 github.com/maruel/natural v1.1.0 - github.com/mattn/go-isatty v0.0.19 + github.com/mattn/go-isatty v0.0.20 github.com/pbnjay/memory v0.0.0-20210728143218-7b4eea64cf58 github.com/pkg/errors v0.9.1 github.com/rivo/tview v0.0.0-20240204151237-861aa94d61c8 github.com/sirupsen/logrus v1.9.3 - github.com/spf13/cobra v1.7.0 + github.com/spf13/cobra v1.8.0 github.com/stretchr/testify v1.8.4 golang.org/x/exp v0.0.0-20240205201215-2c58cdc269a3 golang.org/x/sys v0.17.0 diff --git a/go.sum b/go.sum index dd6e02d3f..d8e590233 100644 --- a/go.sum +++ b/go.sum @@ -12,7 +12,7 @@ github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk= github.com/cpuguy83/go-md2man v1.0.10/go.mod h1:SmD6nW6nTyfqj6ABTjUi3V3JVMnlJmwcJI5acqYI6dE= -github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= +github.com/cpuguy83/go-md2man/v2 v2.0.3/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o= github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= @@ -25,8 +25,8 @@ github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2 h1:tdlZCpZ/P9DhczC github.com/dgryski/go-farm v0.0.0-20190423205320-6a90982ecee2/go.mod h1:SqUrOPUnsFjfmXRMNPybcSiG0BgUW2AuFH8PAnS2iTw= github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= -github.com/fatih/color v1.15.0 h1:kOqh6YHBtK8aywxGerMG2Eq3H6Qgoqeo13Bk2Mv/nBs= -github.com/fatih/color v1.15.0/go.mod h1:0h5ZqXfHYED7Bhv2ZJamyIOUej9KtShiJESRwBDUSsw= +github.com/fatih/color v1.16.0 h1:zmkK9Ngbjj+K0yRhTVONQh1p/HknKYSlNT+vZCzyokM= +github.com/fatih/color v1.16.0/go.mod h1:fL2Sau1YI5c0pdGEVCbKQbLXB6edEj1ZgiY4NijnWvE= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/gdamore/encoding v1.0.0 h1:+7OoQ1Bc6eTm5niUzBa0Ctsh6JbMW6Ra+YNuAtDBdko= github.com/gdamore/encoding v1.0.0/go.mod h1:alR0ol34c49FCSBLjhosxzcPHQbf2trDkoo5dl+VrEg= @@ -71,8 +71,8 @@ github.com/maruel/natural v1.1.0/go.mod h1:eFVhYCcUOfZFxXoDZam8Ktya72wa79fNC3lc/ github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA= github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg= github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM= -github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA= -github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= github.com/mattn/go-runewidth v0.0.15 h1:UNAjwbU9l54TA3KzvqLGxwWjHmMgBUVhBiTjelZgg3U= github.com/mattn/go-runewidth v0.0.15/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= github.com/mitchellh/go-homedir v1.1.0/go.mod h1:SfyaCUpYCn1Vlf4IUYiD9fPX4A5wJrkLzIz1N1q0pr0= @@ -102,8 +102,8 @@ github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ= github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE= github.com/spf13/cobra v0.0.5/go.mod h1:3K3wKZymM7VvHMDS9+Akkh4K60UwM26emMESw8tLCHU= -github.com/spf13/cobra v1.7.0 h1:hyqWnYt1ZQShIddO5kBpj3vu05/++x6tJ6dg8EC572I= -github.com/spf13/cobra v1.7.0/go.mod h1:uLxZILRyS/50WlhOIKD7W6V5bgeIt+4sICxh6uRMrb0= +github.com/spf13/cobra v1.8.0 h1:7aJaZx1B85qltLMc546zn58BxxfZdR/W22ej9CFoEf0= +github.com/spf13/cobra v1.8.0/go.mod h1:WXLWApfZ71AjXPya3WOlMsY9yMs7YeiHhFVlvLyhcho= github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo= github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4= github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA= diff --git a/tui/format.go b/tui/format.go index efc683de9..c0913e556 100644 --- a/tui/format.go +++ b/tui/format.go @@ -83,7 +83,7 @@ func (ui *UI) formatSize(size int64, reverseColor bool, transparentBg bool) stri var color string if reverseColor { if ui.UseColors { - color = "[black:#2479d0:-]" + color = "[#000000:#2479d0:-]" } else { color = "[black:white:-]" } diff --git a/tui/show.go b/tui/show.go index 0038bd674..bff6d5050 100644 --- a/tui/show.go +++ b/tui/show.go @@ -128,7 +128,7 @@ func (ui *UI) showDir() { var footerNumberColor, footerTextColor string if ui.UseColors { footerNumberColor = "[#ffffff:#2479d0:b]" - footerTextColor = "[black:#2479d0:-]" + footerTextColor = "[#000000:#2479d0:-]" } else { footerNumberColor = "[black:white:b]" footerTextColor = "[black:white:-]" @@ -141,7 +141,7 @@ func (ui *UI) showDir() { } ui.footerLabel.SetText( - selected + + selected + footerTextColor + " Total disk usage: " + footerNumberColor + ui.formatSize(totalUsage, true, false) + @@ -195,7 +195,7 @@ func (ui *UI) showDevices() { var footerNumberColor, footerTextColor string if ui.UseColors { footerNumberColor = "[#ffffff:#2479d0:b]" - footerTextColor = "[black:#2479d0:-]" + footerTextColor = "[#000000:#2479d0:-]" } else { footerNumberColor = "[black:white:b]" footerTextColor = "[black:white:-]"