From ac1aa1afc6d39f952944d9dd7a6d62c56e4f27b6 Mon Sep 17 00:00:00 2001
From: Max Zheltikov <maxcruer@gmail.com>
Date: Mon, 13 Nov 2023 11:48:48 +0300
Subject: [PATCH 1/2] blocks/apt: Added config option `ignore_updates_regex` to
filter out undesired packages from the list of outdated packages.
---
src/blocks/apt.rs | 25 +++++++++++++++++++++++--
1 file changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/blocks/apt.rs b/src/blocks/apt.rs
index 0928d2190f..4b742c52c7 100644
--- a/src/blocks/apt.rs
+++ b/src/blocks/apt.rs
@@ -14,6 +14,7 @@
//! `format_up_to_date` | Same as `format`, but for when no updates are available. | `" $icon $count.eng(w:1) "`
//! `warning_updates_regex` | Display block as warning if updates matching regex are available. | `None`
//! `critical_updates_regex` | Display block as critical if updates matching regex are available. | `None`
+//! `ignore_updates_regex` | Doesn't include updates matching regex in the count. | `None`
//! `ignore_phased_updates` | Doesn't include potentially held back phased updates in the count. | `false`
//!
//! Placeholder | Value | Type | Unit
@@ -67,6 +68,7 @@ pub struct Config {
pub format_up_to_date: FormatConfig,
pub warning_updates_regex: Option<String>,
pub critical_updates_regex: Option<String>,
+ pub ignore_updates_regex: Option<String>,
pub ignore_phased_updates: bool,
}
@@ -91,6 +93,12 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
.map(Regex::new)
.transpose()
.error("invalid critical updates regex")?;
+ let ignore_updates_regex = config
+ .ignore_updates_regex
+ .as_deref()
+ .map(Regex::new)
+ .transpose()
+ .error("invalid ignore updates regex")?;
let mut cache_dir = env::temp_dir();
cache_dir.push("i3rs-apt");
@@ -124,7 +132,13 @@ pub async fn run(config: &Config, api: &CommonApi) -> Result<()> {
loop {
let mut widget = Widget::new();
let updates = get_updates_list(config_file).await?;
- let count = get_update_count(config_file, config.ignore_phased_updates, &updates).await?;
+ let count = get_update_count(
+ config_file,
+ config.ignore_phased_updates,
+ ignore_updates_regex.as_ref(),
+ &updates,
+ )
+ .await?;
widget.set_format(match count {
0 => format_up_to_date.clone(),
@@ -189,11 +203,18 @@ async fn get_updates_list(config_path: &str) -> Result<String> {
async fn get_update_count(
config_path: &str,
ignore_phased_updates: bool,
+ ignore_updates_regex: Option<&Regex>,
updates: &str,
) -> Result<usize> {
let mut cnt = 0;
- for update_line in updates.lines().filter(|line| line.contains("[upgradable")) {
+ for update_line in updates
+ .lines()
+ .filter(|line| line.contains("[upgradable"))
+ .filter(|line| {
+ ignore_updates_regex.is_none() || !ignore_updates_regex.unwrap().is_match(line)
+ })
+ {
if !ignore_phased_updates || !is_phased_update(config_path, update_line).await? {
cnt += 1;
}
From 102c6d7d987c5e3af406421820c0dd4bd76e0962 Mon Sep 17 00:00:00 2001
From: Max Zheltikov <maxcruer@gmail.com>
Date: Tue, 14 Nov 2023 09:39:31 +0300
Subject: [PATCH 2/2] blocks/apt: Review changes
---
src/blocks/apt.rs | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/blocks/apt.rs b/src/blocks/apt.rs
index 4b742c52c7..53cc460fc3 100644
--- a/src/blocks/apt.rs
+++ b/src/blocks/apt.rs
@@ -211,9 +211,7 @@ async fn get_update_count(
for update_line in updates
.lines()
.filter(|line| line.contains("[upgradable"))
- .filter(|line| {
- ignore_updates_regex.is_none() || !ignore_updates_regex.unwrap().is_match(line)
- })
+ .filter(|line| ignore_updates_regex.map_or(true, |re| !re.is_match(line)))
{
if !ignore_phased_updates || !is_phased_update(config_path, update_line).await? {
cnt += 1;