Skip to content

Commit

Permalink
Merge pull request #133 from nokyan/v1.3.0
Browse files Browse the repository at this point in the history
Release v1.3.0
  • Loading branch information
nokyan authored Dec 24, 2023
2 parents e9a32d8 + 5eb3439 commit 45da0f9
Show file tree
Hide file tree
Showing 9 changed files with 76 additions and 13 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "resources"
version = "1.2.1"
version = "1.3.0"
authors = ["nokyan <[email protected]>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion build-aux/net.nokyan.Resources.Devel.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"--env=RUST_BACKTRACE=full",
"--env=RUST_LOG=resources=debug",
"--env=XDG_DATA_DIRS=/app/share:/usr/share:/usr/share/runtime/share:/run/host/user-share:/run/host/usr/share:/run/host/share:/var/lib/flatpak/exports/share:~/.local/share/flatpak/exports/share:/var/lib/snapd/desktop",
"--filesystem=/var/lib/snapd/desktop:ro",
"--filesystem=/var/lib/snapd:ro",
"--filesystem=/var/lib/flatpak/app:ro",
"--filesystem=/var/lib/flatpak/exports/share:ro",
"--filesystem=xdg-data/flatpak/app:ro",
Expand Down
44 changes: 44 additions & 0 deletions data/net.nokyan.Resources.metainfo.xml.in.in
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,50 @@
</screenshot>
</screenshots>
<releases>
<release version="1.3.0" date="2023-12-24">
<description>
<p>
Resources 1.3 has been a long time in the making and brings a number of new and exciting features as well as many bug fixes. Enjoy!
</p>
<p>
🐛 Bug fixes
</p>
<ul>
<li>Snap applications were not properly detected and categorized as system processes, this fix requires an additional Flatpak permission (read-only access to /var/lib/snapd/)</li>
<li>CPU usage of processes and applications was not calculated correctly</li>
<li>Newer AMD GPUs were not properly detected</li>
<li>The counting for multiple GPUs started at 0</li>
<li>bash was recognized as an application if there was a detected .desktop file using bash to start the app</li>
<li>“simple-framebuffers” were recognized as GPU</li>
<li>Displayed stock speed instead of overclocked speed for RAM using AMD EXPO or Intel XMP</li>
</ul>
<p>
✨ New features
</p>
<ul>
<li>GPU usage (including video encoder, video decoder and VRAM usage) is now tracked per-process</li>
<li>The amount of datapoints in graphs is now configurable</li>
<li>A grid can now be displayed for graphs</li>
<li>The counting for multiple GPUs started at 0</li>
<li>More statistics for Intel GPUs</li>
<li>The info window for applications and processes now shows the launch date</li>
</ul>
<p>
📈 Improvements
</p>
<ul>
<li>Vastly improved memory usage over time</li>
<li>Non-Wireguard VPNs are now recognized as such</li>
<li>Memory properties can now be accessed without root privileges</li>
<li>Resources needs less time to load after launch</li>
<li>Resources’ companion process “resources-processes” is now launched once to run for as long as Resources itself is running, rather than being launched on every refresh</li>
<li>Better recognition of Chromium-based applications and their many processes</li>
<li>AMD GPUs have a more precise name in the titlebar</li>
<li>Processes and applications refresh now as fast as the rest of the UI does</li>
<li>The scrollbar doesn’t jump around anymore when scrolling the processes or applications list during a refresh</li>
</ul>
</description>
</release>
<release version="1.2.1" date="2023-11-02"/>
<release version="1.2.0" date="2023-10-31"/>
<release version="1.1.0" date="2023-10-15"/>
Expand Down
2 changes: 1 addition & 1 deletion lib/process_data/Cargo.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[package]
name = "process-data"
version = "1.2.1"
version = "1.3.0"
authors = ["nokyan <[email protected]>"]
edition = "2021"

Expand Down
2 changes: 1 addition & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
project(
'resources',
'rust',
version: '1.2.1',
version: '1.3.0',
meson_version: '>= 0.59',
)

Expand Down
21 changes: 18 additions & 3 deletions po/resources.pot
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: resources\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2022-12-25 15:51+0100\n"
"PO-Revision-Date: 2023-12-22 21:09+0200\n"
"PO-Revision-Date: 2023-12-24 14:30+0200\n"
"Last-Translator: nokyan <[email protected]>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"Language: \n"
Expand Down Expand Up @@ -239,15 +239,18 @@ msgstr ""
msgid "Icon by"
msgstr ""

#: src/ui/dialogs/app_dialog.rs:163 src/ui/dialogs/process_dialog.rs:188
#: src/ui/dialogs/app_dialog.rs:163 src/ui/dialogs/process_dialog.rs:188
#: src/ui/pages/drive.rs:227 src/ui/pages/drive.rs:233
msgid "No"
msgstr ""

#: src/ui/dialogs/app_dialog.rs:164 src/ui/dialogs/process_dialog.rs:189
#: src/ui/dialogs/app_dialog.rs:164 src/ui/dialogs/process_dialog.rs:189
msgid "Yes (Flatpak)"
msgstr ""

#: src/ui/dialogs/app_dialog.rs:165 src/ui/dialogs/process_dialog.rs:190
#: src/ui/dialogs/app_dialog.rs:165 src/ui/dialogs/process_dialog.rs:190
msgid "Yes (Snap)"
msgstr ""
Expand All @@ -259,7 +262,7 @@ msgstr ""
#: src/ui/pages/applications/mod.rs:817 src/ui/pages/cpu.rs:200
#: src/ui/pages/cpu.rs:211 src/ui/pages/cpu.rs:225 src/ui/pages/cpu.rs:231
#: src/ui/pages/cpu.rs:237 src/ui/pages/cpu.rs:243 src/ui/pages/cpu.rs:247
#: src/ui/pages/cpu.rs:250 src/ui/pages/cpu.rs:323 src/ui/pages/gpu.rs:214
#: src/ui/pages/cpu.rs:250 src/ui/pages/cpu.rs:327 src/ui/pages/gpu.rs:214
#: src/ui/pages/gpu.rs:255 src/ui/pages/gpu.rs:278 src/ui/pages/gpu.rs:281
#: src/ui/pages/gpu.rs:292 src/ui/pages/gpu.rs:314 src/ui/pages/gpu.rs:324
#: src/ui/pages/gpu.rs:336 src/ui/pages/gpu.rs:339 src/ui/pages/gpu.rs:345
Expand All @@ -283,18 +286,23 @@ msgstr ""
msgid "Applications"
msgstr ""

#: src/ui/pages/applications/mod.rs:514
#: src/ui/pages/applications/mod.rs:514
msgid "Running Applications: {}"
msgstr ""

#: src/ui/pages/applications/mod.rs:543 src/ui/pages/processes/mod.rs:522
#: src/ui/pages/applications/mod.rs:543 src/ui/pages/processes/mod.rs:522
msgid "Cancel"
msgstr ""

#: src/ui/pages/applications/mod.rs:570
#: src/ui/pages/applications/mod.rs:570
msgid "Application"
msgstr ""

#: src/ui/pages/applications/mod.rs:660 src/ui/pages/cpu.rs:117
#: src/ui/pages/processes/mod.rs:741 src/ui/window.rs:279
#: src/ui/pages/applications/mod.rs:660 src/ui/pages/cpu.rs:117
#: src/ui/pages/processes/mod.rs:741 src/ui/window.rs:279
#: data/resources/ui/window.ui:124 data/resources/ui/window.ui:131
Expand All @@ -305,6 +313,7 @@ msgstr ""
msgid "Processor"
msgstr ""

#: src/ui/pages/applications/mod.rs:703 src/ui/pages/processes/mod.rs:784
#: src/ui/pages/applications/mod.rs:703 src/ui/pages/processes/mod.rs:784
#: data/resources/ui/dialogs/app_dialog.ui:92
#: data/resources/ui/dialogs/process_dialog.ui:75
Expand All @@ -313,6 +322,7 @@ msgstr ""
msgid "Drive Read"
msgstr ""

#: src/ui/pages/applications/mod.rs:753 src/ui/pages/processes/mod.rs:835
#: src/ui/pages/applications/mod.rs:753 src/ui/pages/processes/mod.rs:835
#: data/resources/ui/dialogs/app_dialog.ui:101
#: data/resources/ui/dialogs/process_dialog.ui:84
Expand All @@ -321,6 +331,7 @@ msgstr ""
msgid "Drive Read Total"
msgstr ""

#: src/ui/pages/applications/mod.rs:799 src/ui/pages/processes/mod.rs:886
#: src/ui/pages/applications/mod.rs:799 src/ui/pages/processes/mod.rs:886
#: data/resources/ui/dialogs/app_dialog.ui:110
#: data/resources/ui/dialogs/process_dialog.ui:93
Expand All @@ -329,6 +340,7 @@ msgstr ""
msgid "Drive Write"
msgstr ""

#: src/ui/pages/applications/mod.rs:850 src/ui/pages/processes/mod.rs:937
#: src/ui/pages/applications/mod.rs:850 src/ui/pages/processes/mod.rs:937
#: data/resources/ui/dialogs/app_dialog.ui:119
#: data/resources/ui/dialogs/process_dialog.ui:102
Expand All @@ -337,6 +349,7 @@ msgstr ""
msgid "Drive Write Total"
msgstr ""

#: src/ui/pages/applications/mod.rs:939 src/ui/pages/processes/mod.rs:1030
#: src/ui/pages/applications/mod.rs:939 src/ui/pages/processes/mod.rs:1030
#: data/resources/ui/dialogs/app_dialog.ui:150
#: data/resources/ui/dialogs/process_dialog.ui:133
Expand All @@ -345,6 +358,7 @@ msgstr ""
msgid "Video Encoder"
msgstr ""

#: src/ui/pages/applications/mod.rs:984 src/ui/pages/processes/mod.rs:1075
#: src/ui/pages/applications/mod.rs:984 src/ui/pages/processes/mod.rs:1075
#: data/resources/ui/dialogs/app_dialog.ui:159
#: data/resources/ui/dialogs/process_dialog.ui:142
Expand All @@ -353,6 +367,7 @@ msgstr ""
msgid "Video Decoder"
msgstr ""

#: src/ui/pages/applications/mod.rs:1028 src/ui/pages/processes/mod.rs:1120
#: src/ui/pages/applications/mod.rs:1028 src/ui/pages/processes/mod.rs:1120
#: data/resources/ui/dialogs/app_dialog.ui:141
#: data/resources/ui/dialogs/process_dialog.ui:124
Expand All @@ -361,7 +376,7 @@ msgstr ""
msgid "Video Memory"
msgstr ""

#: src/ui/pages/cpu.rs:210
#: src/ui/pages/cpu.rs:210 src/ui/pages/cpu.rs:317
msgid "CPU {}"
msgstr ""

Expand Down
6 changes: 5 additions & 1 deletion src/ui/pages/cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,11 @@ impl ResCPU {
curr_threadbox.graph().push_data_point(thread_fraction);
curr_threadbox.set_title_label(&format!("{} %", (thread_fraction * 100.0).round()));

curr_threadbox.set_subtitle(&convert_frequency(frequencies[i] as f64));
if let Some(frequency) = frequencies[i] {
curr_threadbox.set_subtitle(&convert_frequency(frequency as f64));
} else {
curr_threadbox.set_subtitle(&i18n_f("CPU {}", &[&(i + 1).to_string()]))
}
*old_thread_usage = new_thread_usage;
}
}
Expand Down
6 changes: 3 additions & 3 deletions src/utils/cpu.rs
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub struct CpuData {
pub new_total_usage: (u64, u64),
pub new_thread_usages: Vec<(u64, u64)>,
pub temperature: Result<f32, anyhow::Error>,
pub frequencies: Vec<u64>,
pub frequencies: Vec<Option<u64>>,
}

impl CpuData {
Expand All @@ -51,8 +51,8 @@ impl CpuData {
let smth = get_cpu_usage(Some(i)).unwrap_or((0, 0));
new_thread_usages.push(smth);

let freq = get_cpu_freq(i).unwrap_or(0);
frequencies.push(freq);
let freq = get_cpu_freq(i);
frequencies.push(freq.ok());
}

Self {
Expand Down

0 comments on commit 45da0f9

Please sign in to comment.