Skip to content

Conversation

zebp
Copy link
Contributor

@zebp zebp commented Jun 21, 2024

Description

Adds an average_cpu_row option to move the average CPU usage to its own row when using basic mode.

image

Issue

I didn't make an issue for this, I did this for myself but thought I might as well try to upstream.

Testing

Tested by turning on and off the new layout via cli flag and config file entry and ensuring the layout was rendered accordingly.

  • Windows
  • macOS
  • Linux

Checklist

  • 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)

@zebp
Copy link
Contributor Author

zebp commented Jun 21, 2024

CI passes for the most part, the only failures are codecov ratelimiting

@ClementTsang ClementTsang self-assigned this Jun 28, 2024
@ClementTsang
Copy link
Owner

Sorry for the delay - I'll look at it by the weekend.

the only failures are codecov ratelimiting

Yep, that's fine.

@zebp zebp force-pushed the zeb/average-cpu-row branch from be2d466 to 7b5b06b Compare June 30, 2024 23:26
@zebp zebp force-pushed the zeb/average-cpu-row branch from 7b5b06b to afe4163 Compare July 21, 2024 02:49
@zebp
Copy link
Contributor Author

zebp commented Jul 21, 2024

Rebased to resolve merge conflicts

Copy link

codecov bot commented Jul 21, 2024

Codecov Report

Attention: Patch coverage is 13.75000% with 69 lines in your changes missing coverage. Please review.

Project coverage is 36.81%. Comparing base (9379c03) to head (9253aaa).

Files Patch % Lines
src/canvas/widgets/cpu_basic.rs 0.00% 69 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #1487      +/-   ##
==========================================
- Coverage   41.27%   36.81%   -4.46%     
==========================================
  Files         113       93      -20     
  Lines       17739    16087    -1652     
==========================================
- Hits         7321     5923    -1398     
+ Misses      10418    10164     -254     
Flag Coverage Δ
macos-12 ?
ubuntu-latest ?
windows-2019 36.81% <13.75%> (-0.08%) ⬇️

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.

Copy link
Owner

@ClementTsang ClementTsang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sorry that took so long - overall looks fine, left a few comments, and needs to be rebased.

Adds an `average_cpu_row` option to move the average CPU usage to its own row
when using basic mode.
@zebp zebp force-pushed the zeb/average-cpu-row branch from afe4163 to 9253aaa Compare August 2, 2024 23:15
@zebp
Copy link
Contributor Author

zebp commented Aug 2, 2024

Rebased and addressed feedback

Copy link
Owner

@ClementTsang ClementTsang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Thanks for the PR!

@ClementTsang ClementTsang merged commit d6c2ef3 into ClementTsang:main Aug 3, 2024
34 of 36 checks passed
@ClementTsang ClementTsang mentioned this pull request Aug 3, 2024
9 tasks
@zebp zebp deleted the zeb/average-cpu-row branch August 3, 2024 14:22
tmeijn pushed a commit to tmeijn/dotfiles that referenced this pull request Aug 10, 2024
This MR contains the following updates:

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

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.10.2`](https://github.com/ClementTsang/bottom/blob/HEAD/CHANGELOG.md#0102---2024-08-05)

[Compare Source](ClementTsang/bottom@0.10.1...0.10.2)

##### Features

-   [#&#8203;1487](ClementTsang/bottom#1487): Add option to move the AVG CPU bar to another row in basic mode.

##### Bug Fixes

-   [#&#8203;1541](ClementTsang/bottom#1541): Fix some process details not updating for macOS and Windows.
-   [#&#8203;1542](ClementTsang/bottom#1542): Fix confusing process run times being reported on macOS.
-   [#&#8203;1543](ClementTsang/bottom#1543): Fix the `--default_cpu_entry` argument not being checked.

</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:eyJjcmVhdGVkSW5WZXIiOiIzNy40NDAuNyIsInVwZGF0ZWRJblZlciI6IjM3LjQ0MC43IiwidGFyZ2V0QnJhbmNoIjoibWFpbiIsImxhYmVscyI6WyJSZW5vdmF0ZSBCb3QiXX0=-->
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