From 00046e965729e963af5260019c6d52f031daeb53 Mon Sep 17 00:00:00 2001 From: nokyan Date: Sun, 15 Oct 2023 18:01:11 +0200 Subject: [PATCH] Release 1.1.0 --- Cargo.lock | 4 +-- Cargo.toml | 2 +- data/net.nokyan.Resources.metainfo.xml.in.in | 9 ++++++ lib/process_data/Cargo.toml | 2 +- lib/process_data/src/lib.rs | 22 ++++++------- meson.build | 2 +- po/de.po | 34 +++++++++++++++++--- po/fr.po | 26 ++++++++++++--- po/it.po | 26 ++++++++++++--- po/pl.po | 26 ++++++++++++--- po/resources.pot | 28 +++++++++++++--- po/ru.po | 26 ++++++++++++--- po/zh_TW.po | 26 ++++++++++++--- 13 files changed, 187 insertions(+), 46 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 834014fe..e8148098 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1495,7 +1495,7 @@ dependencies = [ [[package]] name = "process-data" -version = "1.0.3" +version = "1.1.0" dependencies = [ "anyhow", "async-std", @@ -1596,7 +1596,7 @@ checksum = "e5ea92a5b6195c6ef2a0295ea818b312502c6fc94dde986c5553242e18fd4ce2" [[package]] name = "resources" -version = "1.0.3" +version = "1.1.0" dependencies = [ "anyhow", "async-process", diff --git a/Cargo.toml b/Cargo.toml index 66852c0e..deefb988 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "resources" -version = "1.0.3" +version = "1.1.0" authors = ["nokyan "] edition = "2021" diff --git a/data/net.nokyan.Resources.metainfo.xml.in.in b/data/net.nokyan.Resources.metainfo.xml.in.in index d8edd06d..30506fe8 100644 --- a/data/net.nokyan.Resources.metainfo.xml.in.in +++ b/data/net.nokyan.Resources.metainfo.xml.in.in @@ -47,6 +47,15 @@ + + +
    +
  • Fixed: Resources didn’t work if libadwaita was not installed natively on the host
    • +
  • Improvement: The process scanning routine is now parallelized making it faster
    • +
  • Languages: Added support for Italian, Polish, Russian and Chinese (Traditional)
    • +
+ + diff --git a/lib/process_data/Cargo.toml b/lib/process_data/Cargo.toml index 6810b230..5792f27d 100644 --- a/lib/process_data/Cargo.toml +++ b/lib/process_data/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "process-data" -version = "1.0.3" +version = "1.1.0" authors = ["nokyan "] edition = "2021" diff --git a/lib/process_data/src/lib.rs b/lib/process_data/src/lib.rs index cbf73f76..1d4e6040 100644 --- a/lib/process_data/src/lib.rs +++ b/lib/process_data/src/lib.rs @@ -1,9 +1,9 @@ -use std::{path::PathBuf, time::SystemTime}; -use async_std::sync::Arc; use anyhow::{anyhow, Context, Result}; +use async_std::sync::Arc; use once_cell::sync::Lazy; use regex::Regex; use serde::{Deserialize, Serialize}; +use std::{path::PathBuf, time::SystemTime}; static PAGESIZE: Lazy = Lazy::new(sysconf::pagesize); @@ -116,13 +116,13 @@ impl ProcessData { let comm = comm.await?; let commandline = commandline.await?; let cgroup = cgroup.await?; - + let pid = proc_path - .file_name() - .ok_or_else(|| anyhow!(""))? - .to_str() - .ok_or_else(|| anyhow!(""))? - .parse()?; + .file_name() + .ok_or_else(|| anyhow!(""))? + .to_str() + .ok_or_else(|| anyhow!(""))? + .parse()?; let uid = Self::get_uid(&proc_path).await?; @@ -140,9 +140,9 @@ impl ProcessData { let cpu_time = stat[13].parse::()? + stat[14].parse::()?; - let cpu_time_timestamp = SystemTime::now() - .duration_since(SystemTime::UNIX_EPOCH)? - .as_millis() as u64; + let cpu_time_timestamp = SystemTime::now() + .duration_since(SystemTime::UNIX_EPOCH)? + .as_millis() as u64; let memory_usage = (statm[1].parse::()? - statm[2].parse::()?) * *PAGESIZE; diff --git a/meson.build b/meson.build index a3486b10..87198dd0 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'resources', 'rust', - version: '1.0.3', + version: '1.1.0', meson_version: '>= 0.59', ) diff --git a/po/de.po b/po/de.po index fc901946..766519bb 100644 --- a/po/de.po +++ b/po/de.po @@ -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-10-11 21:42+0200\n" +"PO-Revision-Date: 2023-10-15 17:52+0200\n" "Last-Translator: nokyan \n" "Language-Team: German \n" "Language: de\n" @@ -100,6 +100,30 @@ msgstr "Netzwerkschnittstellen" msgid "Storage Devices" msgstr "Speichergeräte" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" +"Fehlerbehebung: Ressourcen funktionierte nicht wenn libadwaita nicht nativ " +"auf dem System installiert war" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" +"Verbesserung: Die Routine für das Scannen von Prozessen ist nun " +"parallelisiert, was sie schneller macht" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" +"Sprachen: Unterstützung für Italienisch, Polnisch, Russisch und Chinesisch " +"(Traditionell) hinzugefügt" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "Das Nalux-Team" @@ -112,16 +136,16 @@ msgstr "Probleme melden" msgid "Icon by" msgstr "Icon von" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "Nein" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "Ja (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -401,7 +425,7 @@ msgstr "Es gab ein Problem beim Abwürgen von {}" msgid "There was a problem continuing {}" msgstr "Es gab ein Problem beim Fortsetzen von {}" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "Systemprozesse" diff --git a/po/fr.po b/po/fr.po index b21e7b1f..82c47bd7 100644 --- a/po/fr.po +++ b/po/fr.po @@ -99,6 +99,24 @@ msgstr "Interfaces réseau" msgid "Storage Devices" msgstr "Disques" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "Le groupe Nalux" @@ -111,16 +129,16 @@ msgstr "Rapporter des problèmes" msgid "Icon by" msgstr "Icône par" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "Non" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "Oui (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -400,7 +418,7 @@ msgstr "Il y a eu un problème pour tuer {}" msgid "There was a problem continuing {}" msgstr "Il y a eu un problème pour continuer {}" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "Processus du système" diff --git a/po/it.po b/po/it.po index f3bc8ac4..d1ca33ce 100644 --- a/po/it.po +++ b/po/it.po @@ -101,6 +101,24 @@ msgstr "Interfacce di rete" msgid "Storage Devices" msgstr "Dispositivi di archiviazione" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "Team di Nalux" @@ -113,16 +131,16 @@ msgstr "Segnala probelmi" msgid "Icon by" msgstr "Icona da" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "No" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "Sì (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -402,7 +420,7 @@ msgstr "C'è stato un problema nell'uccidere {}" msgid "There was a problem continuing {}" msgstr "C'è stato un problema nel riprendere {}" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "Processi di sistema" diff --git a/po/pl.po b/po/pl.po index 94bdbb4f..746295ab 100644 --- a/po/pl.po +++ b/po/pl.po @@ -101,6 +101,24 @@ msgstr "Interfejsy sieciowe" msgid "Storage Devices" msgstr "Urządzenia do przechowywania danych" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "Zespół Nalux" @@ -113,16 +131,16 @@ msgstr "Zgłoś problemy" msgid "Icon by" msgstr "Ikona stworzona przez" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "Nie" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "Tak (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -406,7 +424,7 @@ msgstr "Wystąpił problem podczas zabijania {}" msgid "There was a problem continuing {}" msgstr "Wystąpił problem podczas wznawiania {}" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "Procesy systemowe" diff --git a/po/resources.pot b/po/resources.pot index cbb24c60..0bf4c085 100644 --- a/po/resources.pot +++ b/po/resources.pot @@ -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: 2022-08-11 21:37+0200\n" +"PO-Revision-Date: 2022-08-15 17:47+0200\n" "Last-Translator: nokyan \n" "Language-Team: German \n" "Language: \n" @@ -93,6 +93,24 @@ msgstr "" msgid "Storage Devices" msgstr "" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "" @@ -105,16 +123,16 @@ msgstr "" msgid "Icon by" msgstr "" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -390,7 +408,7 @@ msgstr "" msgid "There was a problem continuing {}" msgstr "" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "" diff --git a/po/ru.po b/po/ru.po index 73c38fb7..e8177bce 100644 --- a/po/ru.po +++ b/po/ru.po @@ -101,6 +101,24 @@ msgstr "Сетевые интерфейсы" msgid "Storage Devices" msgstr "Устройства хранения" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "The Nalux Team" @@ -113,16 +131,16 @@ msgstr "Сообщить о проблемах" msgid "Icon by" msgstr "Иконка от" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "Нет" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "Да (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -406,7 +424,7 @@ msgstr "Не удалось убить {}" msgid "There was a problem continuing {}" msgstr "Не удалось продолжить {}" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "Системные процессы" diff --git a/po/zh_TW.po b/po/zh_TW.po index 42102f5f..2753d0d2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -94,6 +94,24 @@ msgstr "網路介面" msgid "Storage Devices" msgstr "儲存裝置" +#: data/net.nokyan.Resources.metainfo.xml.in.in:53 +msgid "" +"Fixed: Resources didn’t work if libadwaita was not installed natively on the " +"host" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:54 +msgid "" +"Improvement: The process scanning routine is now parallelized making it " +"faster" +msgstr "" + +#: data/net.nokyan.Resources.metainfo.xml.in.in:55 +msgid "" +"Languages: Added support for Italian, Polish, Russian and Chinese " +"(Traditional)" +msgstr "" + #: src/application.rs:147 msgid "The Nalux Team" msgstr "Nalux 團隊" @@ -106,16 +124,16 @@ msgstr "回報問題" msgid "Icon by" msgstr "圖示由" -#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:107 +#: src/ui/dialogs/app_dialog.rs:112 src/ui/dialogs/process_dialog.rs:108 #: src/ui/pages/drive.rs:214 src/ui/pages/drive.rs:220 msgid "No" msgstr "否" -#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:108 +#: src/ui/dialogs/app_dialog.rs:113 src/ui/dialogs/process_dialog.rs:109 msgid "Yes (Flatpak)" msgstr "是 (Flatpak)" -#: src/ui/dialogs/process_dialog.rs:102 src/ui/dialogs/process_dialog.rs:104 +#: src/ui/dialogs/process_dialog.rs:103 src/ui/dialogs/process_dialog.rs:105 #: src/ui/pages/cpu.rs:189 src/ui/pages/cpu.rs:201 src/ui/pages/cpu.rs:216 #: src/ui/pages/cpu.rs:222 src/ui/pages/cpu.rs:228 src/ui/pages/cpu.rs:234 #: src/ui/pages/cpu.rs:238 src/ui/pages/cpu.rs:241 src/ui/pages/cpu.rs:301 @@ -393,7 +411,7 @@ msgstr "終止 {} 時出現問題" msgid "There was a problem continuing {}" msgstr "繼續 {} 時出現問題" -#: src/utils/app.rs:359 +#: src/utils/app.rs:380 msgid "System Processes" msgstr "系統處理程序"