Skip to content

fix: use default disk.columns when only other disk.* configs exist #1776

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

Merged

Conversation

Frederick888
Copy link
Contributor

@Frederick888 Frederick888 commented Aug 8, 2025

Description

de5de558 fix: use default disk.columns when only other disk.* configs exist

I configured [disk.name_filter] and after upgrading to v0.11.0, the
disk widget became empty since disk.columns was parsed as an empty
vector unless I added disk.columns to my config as well.

Issue

N/A

Testing

If relevant, please state how this was tested. All changes must be tested to work:

Using a config like:

[disk]
# The columns shown by the process widget. The following columns are supported:
# Disk, Mount, Used, Free, Total, Used%, Free%, R/s, W/s
# columns = ["Disk", "Mount", "Used", "Free", "Total", "Used%", "R/s", "W/s"]
[disk.name_filter]
is_list_ignored = true
list = ["^tank.*@"]
regex = true
case_sensitive = true
whole_word = false

v0.11.0 renders an empty disk widget. This PR uses the default disk
widget columns.

If this is a code change, please also indicate which platforms were tested:

  • Windows
  • macOS
  • Linux

Checklist

If relevant, ensure the following have been met:

  • Areas your change affects have been linted using rustfmt (cargo fmt)
  • The change has been tested and doesn't appear to cause any unintended breakage
  • Documentation has been added/updated if needed (README.md, help menu, doc pages, etc.)
  • The pull request passes the provided CI pipeline
  • There are no merge conflicts
  • If relevant, new tests were added (don't worry too much about coverage)

@Frederick888 Frederick888 marked this pull request as ready for review August 8, 2025 02:33
I configured `[disk.name_filter]` and after upgrading to v0.11.0, the
disk widget became empty since `disk.columns` was parsed as an empty
vector unless I added `disk.columns` to my config as well.
@Frederick888 Frederick888 force-pushed the fix-disk-columns-default branch from f966d1e to de5de55 Compare August 8, 2025 02:37
@ClementTsang ClementTsang self-assigned this Aug 8, 2025
@ClementTsang ClementTsang enabled auto-merge (squash) August 8, 2025 14:53
@ClementTsang
Copy link
Owner

Thanks for fixing this! I'll add to the changelog in a bit and get it out in the next few days.

Copy link

codecov bot commented Aug 8, 2025

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 53.55%. Comparing base (c17110c) to head (de5de55).
⚠️ Report is 1 commits behind head on main.

Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1776      +/-   ##
==========================================
- Coverage   53.60%   53.55%   -0.06%     
==========================================
  Files         115      115              
  Lines       16030    16035       +5     
==========================================
- Hits         8593     8587       -6     
- Misses       7437     7448      +11     
Flag Coverage Δ
macos-14 37.42% <100.00%> (+0.02%) ⬆️
ubuntu-latest 55.72% <100.00%> (-0.06%) ⬇️
windows-2022 37.80% <100.00%> (+0.02%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@ClementTsang ClementTsang merged commit 9fe5581 into ClementTsang:main Aug 8, 2025
24 of 36 checks passed
@Frederick888 Frederick888 deleted the fix-disk-columns-default branch August 9, 2025 13:32
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 16, 2025
This MR contains the following updates:

| Package | Update | Change |
|---|---|---|
| [ClementTsang/bottom](https://github.com/ClementTsang/bottom) | patch | `0.11.0` -> `0.11.1` |

MR created with the help of [el-capitano/tools/renovate-bot](https://gitlab.com/el-capitano/tools/renovate-bot).

**Proposed changes to behavior should be submitted there as MRs.**

---

### Release Notes

<details>
<summary>ClementTsang/bottom (ClementTsang/bottom)</summary>

### [`v0.11.1`](https://github.com/ClementTsang/bottom/blob/HEAD/CHANGELOG.md#0111---2025-08-15)

[Compare Source](ClementTsang/bottom@0.11.0...0.11.1)

##### Bug Fixes

- [#&#8203;1776](ClementTsang/bottom#1776): Fix `disk.columns` being incorrectly interpreted as blank.
- [#&#8203;1787](ClementTsang/bottom#1787): Fix issue with battery widget time and small widths.

##### Other

- [#&#8203;1779](ClementTsang/bottom#1779), [#&#8203;1788](ClementTsang/bottom#1788): Speed up time between startup and displaying data.

</details>

---

### Configuration

📅 **Schedule**: Branch creation - At any time (no schedule defined), Automerge - At any time (no schedule defined).

🚦 **Automerge**: Disabled by config. Please merge this manually once you are satisfied.

♻ **Rebasing**: Whenever MR becomes conflicted, or you tick the rebase/retry checkbox.

🔕 **Ignore**: Close this MR and you won't be reminded about this update again.

---

 - [ ] <!-- rebase-check -->If you want to rebase/retry this MR, check this box

---

This MR has been generated by [Renovate Bot](https://github.com/renovatebot/renovate).
<!--renovate-debug:eyJjcmVhdGVkSW5WZXIiOiI0MS43MS4wIiwidXBkYXRlZEluVmVyIjoiNDEuNzEuMCIsInRhcmdldEJyYW5jaCI6Im1haW4iLCJsYWJlbHMiOlsiUmVub3ZhdGUgQm90Il19-->
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants