chore(oma-pm)!: adapt new oma-apt (#581)

eatradish · web-flow · commit 04b5aa50cce5 · 2025-09-28T17:18:05.000+08:00
- Remove `apt.filter_pkgs` and `FilterMode` api
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -26,7 +26,6 @@ libc = "0.2.159"
 reqwest = { version = "0.12.8", default-features = false }
 tracing = "0.1.40"
 tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
-smallvec = "1.13.2"
 console-subscriber = { version = "0.4.0", optional = true }
 ratatui = "0.29.0"
 ansi-to-tui = "7.0.0"
diff --git a/oma-pm/Cargo.toml b/oma-pm/Cargo.toml
@@ -8,7 +8,7 @@ license = "GPL-3.0-or-later"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-oma-apt = "0.10"
+oma-apt = "0.11"
 thiserror = "2"
 chrono = { version = "0.4", features = ["unstable-locales"] }
 glob-match = "0.2"
diff --git a/oma-pm/src/apt.rs b/oma-pm/src/apt.rs
@@ -164,19 +164,6 @@ pub enum OmaAptError {
 
 pub type OmaAptResult<T> = Result<T, OmaAptError>;
 
-/// Modes of the result filter.
-#[derive(Debug)]
-pub enum FilterMode {
-    Default,
-    Installed,
-    Upgradable,
-    Automatic,
-    Manual,
-    Names,
-    AutoRemovable,
-    Hold,
-}
-
 pub struct DownloadConfig<'a> {
     /// The number of threads to be used for downloads.
     pub network_thread: Option<usize>,
@@ -1026,7 +1013,10 @@ impl OmaApt {
             }
         }
 
-        for pkg in self.filter_pkgs(&[FilterMode::AutoRemovable])? {
+        for pkg in self
+            .cache
+            .packages(&PackageSort::default().auto_removable())
+        {
             if !pkg.marked_delete() {
                 let ver = pkg.installed().unwrap_or_else(|| {
                     // 有可能存在操作之后立即是孤包的情况
@@ -1110,33 +1100,6 @@ impl OmaApt {
 
         Ok(())
     }
-
-    /// Filters pkgs
-    pub fn filter_pkgs(
-        &self,
-        query_mode: &[FilterMode],
-    ) -> OmaAptResult<impl Iterator<Item = Package<'_>>> {
-        let mut sort = PackageSort::default();
-
-        debug!("Filter Mode: {query_mode:?}");
-
-        for i in query_mode {
-            sort = match i {
-                FilterMode::Installed => sort.installed(),
-                FilterMode::Upgradable => sort.upgradable(),
-                FilterMode::Automatic => sort.auto_installed(),
-                FilterMode::Names => sort.names(),
-                FilterMode::Manual => sort.manually_installed(),
-                FilterMode::AutoRemovable => sort.auto_removable(),
-                FilterMode::Hold => sort.hold_installed(),
-                _ => sort,
-            };
-        }
-
-        let pkgs = self.cache.packages(&sort);
-
-        Ok(pkgs)
-    }
 }
 
 fn dpkg_exit_status(mut cmd: std::process::Child) -> Result<(), OmaAptError> {
@@ -1310,7 +1273,7 @@ fn get_package_checksums(
     new_pkg: &Package<'_>,
     cand: &Version<'_>,
 ) -> Result<PkgChecksums, OmaAptError> {
-    let not_local_source = cand.uris().all(|x| !x.starts_with("file:"));
+    let not_local_source = cand.uris().iter().all(|x| !x.starts_with("file:"));
 
     let sha256 = cand.get_record(RecordField::SHA256);
     let md5 = cand.get_record(RecordField::MD5sum);
diff --git a/oma-pm/src/matches.rs b/oma-pm/src/matches.rs
@@ -136,7 +136,7 @@ impl<'a> PackagesMatcher<'a> {
                 for ver in &versions {
                     let info = OmaPackage::new(ver, &pkg);
 
-                    let has = ver.uris().any(|x| url_no_escape(&x) == path);
+                    let has = ver.uris().iter().any(|x| url_no_escape(x) == path);
                     if has {
                         res.push(info);
                     }
diff --git a/oma-pm/src/search.rs b/oma-pm/src/search.rs
@@ -346,9 +346,8 @@ pub struct StrSimSearch<'a> {
 
 impl OmaSearch for StrSimSearch<'_> {
     fn search(&self, query: &str) -> Result<Vec<SearchResult>, OmaSearchError> {
-        let pkgs = self
-            .cache
-            .packages(&PackageSort::default().include_virtual());
+        let sort = PackageSort::default().include_virtual();
+        let pkgs = self.cache.packages(&sort);
 
         let mut res = AHashMap::new();
 
@@ -492,7 +491,9 @@ impl<'a> TextSearch<'a> {
 impl OmaSearch for TextSearch<'_> {
     fn search(&self, query: &str) -> OmaSearchResult<Vec<SearchResult>> {
         let mut res = vec![];
-        let pkgs = self.cache.packages(&PackageSort::default());
+
+        let sort = PackageSort::default();
+        let pkgs = self.cache.packages(&sort);
 
         for pkg in pkgs {
             let name = pkg.fullname(true);
diff --git a/oma-refresh/Cargo.toml b/oma-refresh/Cargo.toml
@@ -19,7 +19,7 @@ oma-topics = { version = "^0.25.0", path = "../oma-topics", optional = true, def
 tracing ="0.1"
 oma-repo-verify = { version = "^0.9.0", path = "../oma-repo-verify", default-features = false }
 ahash = "0.8.11"
-oma-apt = { version = "0.10.0", optional = true }
+oma-apt = { version = "0.11", optional = true }
 aho-corasick = "1.1.3"
 # https://github.com/bytecodealliance/rustix/pull/1077
 # rustix = { version = "0.38", features = ["fs"] }
diff --git a/src/subcommand/history.rs b/src/subcommand/history.rs
@@ -6,11 +6,9 @@ use dialoguer::{Select, theme::ColorfulTheme};
 use oma_history::{DATABASE_PATH, HistoryEntry, connect_db, find_history_by_id, list_history};
 use oma_pm::apt::{AptConfig, InstallOperation, OmaAptArgs};
 use oma_pm::matches::{GetArchMethod, PackagesMatcher};
+use oma_pm::oma_apt::PackageSort;
 use oma_pm::pkginfo::PtrIsNone;
-use oma_pm::{
-    apt::{FilterMode, OmaApt},
-    pkginfo::OmaPackage,
-};
+use oma_pm::{apt::OmaApt, pkginfo::OmaPackage};
 use tracing::warn;
 
 use std::path::{Path, PathBuf};
@@ -260,7 +258,10 @@ impl CliExecuter for Undo {
 
         apt.remove(delete, false, true)?;
 
-        let pkgs = apt.filter_pkgs(&[FilterMode::Default])?.collect::<Vec<_>>();
+        let pkgs = apt
+            .cache
+            .packages(&PackageSort::default())
+            .collect::<Vec<_>>();
 
         let install = install
             .iter()
diff --git a/src/subcommand/list.rs b/src/subcommand/list.rs
@@ -4,15 +4,14 @@ use clap::Args;
 use clap_complete::ArgValueCompleter;
 use oma_console::print::Action;
 use oma_pm::{
-    apt::{AptConfig, FilterMode, OmaApt, OmaAptArgs},
-    oma_apt::{PkgCurrentState, PkgSelectedState},
+    apt::{AptConfig, OmaApt, OmaAptArgs},
+    oma_apt::{PackageSort, PkgCurrentState, PkgSelectedState},
 };
 use tracing::info;
 
 use crate::{NOT_DISPLAY_ABORT, fl, utils::pkgnames_completions};
 use crate::{color_formatter, config::Config, error::OutputError, table::PagerPrinter};
 use anyhow::anyhow;
-use smallvec::{SmallVec, smallvec};
 
 use crate::args::CliExecuter;
 
@@ -77,33 +76,33 @@ impl CliExecuter for List {
 
         let apt = OmaApt::new(vec![], oma_apt_args, false, AptConfig::new())?;
 
-        let mut filter_mode: SmallVec<[_; 5]> = smallvec![FilterMode::Names];
+        let mut sort = PackageSort::default();
 
         if installed {
-            filter_mode.push(FilterMode::Installed);
+            sort = sort.installed();
         }
 
         if upgradable {
-            filter_mode.push(FilterMode::Upgradable)
+            sort = sort.upgradable();
         }
 
         if automatic {
-            filter_mode.push(FilterMode::Automatic);
+            sort = sort.auto_installed();
         }
 
         if manually_installed {
-            filter_mode.push(FilterMode::Manual);
+            sort = sort.manually_installed();
         }
 
         if autoremovable {
-            filter_mode.push(FilterMode::AutoRemovable);
+            sort = sort.auto_removable();
         }
 
         if hold {
-            filter_mode.push(FilterMode::Hold);
+            sort = sort.hold_installed();
         }
 
-        let filter_pkgs = apt.filter_pkgs(&filter_mode)?;
+        let filter_pkgs = apt.cache.packages(&sort);
         let filter_pkgs: Box<dyn Iterator<Item = _>> = if packages.is_empty() {
             Box::new(filter_pkgs)
         } else {
diff --git a/src/subcommand/pick.rs b/src/subcommand/pick.rs
@@ -180,11 +180,11 @@ impl CliExecuter for Pick {
 
         let mut version_str_display = versions_str.clone();
         for (a, b) in v {
-            if let Some(uri) = versions[a].uris().next() {
+            if let Some(uri) = versions[a].uris().first() {
                 version_str_display[a] = format!("{} (from: {uri})", versions_str[a]);
             }
 
-            if let Some(uri) = versions[b].uris().next() {
+            if let Some(uri) = versions[b].uris().first() {
                 version_str_display[b] = format!("{} (from: {uri})", versions_str[b]);
             }
         }
diff --git a/src/subcommand/size_analyzer.rs b/src/subcommand/size_analyzer.rs
@@ -8,8 +8,8 @@ use clap::Args;
 use dialoguer::console::{self, style};
 use oma_console::indicatif::HumanBytes;
 use oma_console::pager::{exit_tui, prepare_create_tui};
-use oma_pm::apt::{AptConfig, FilterMode, OmaApt, OmaAptArgs};
-use oma_pm::oma_apt::Package;
+use oma_pm::apt::{AptConfig, OmaApt, OmaAptArgs};
+use oma_pm::oma_apt::{Package, PackageSort};
 use oma_pm::pkginfo::OmaPackageWithoutVersion;
 use ratatui::crossterm::event::{self, KeyCode, KeyModifiers};
 use ratatui::layout::{Flex, Rect};
@@ -225,7 +225,8 @@ impl CliExecuter for SizeAnalyzer {
 
 fn installed_packages(apt: &OmaApt, small_to_big: bool) -> Result<Vec<Package<'_>>, OutputError> {
     let mut installed_packages = apt
-        .filter_pkgs(&[FilterMode::Installed])?
+        .cache
+        .packages(&PackageSort::default().installed())
         .collect::<Vec<_>>();
 
     if small_to_big {
@@ -456,20 +457,15 @@ impl<'a> PkgSizeAnalyzer<'a> {
                 }
 
                 if key.modifiers == KeyModifiers::CONTROL && key.code == KeyCode::Char('a') {
-                    match self.apt.filter_pkgs(&[FilterMode::AutoRemovable]) {
-                        Ok(pkgs) => {
-                            let pkgs = pkgs.collect::<Vec<_>>();
-
-                            if pkgs.is_empty() {
-                                self.popup = Some(fl!("tui-no-package-clean-up"));
-                            } else {
-                                for p in pkgs {
-                                    self.remove_package.items.push(PkgWrapper { pkg: p });
-                                }
-                            }
-                        }
-                        Err(e) => {
-                            self.popup = Some(e.to_string());
+                    let sort = PackageSort::default().auto_removable();
+                    let pkgs = self.apt.cache.packages(&sort);
+                    let pkgs = pkgs.collect::<Vec<_>>();
+
+                    if pkgs.is_empty() {
+                        self.popup = Some(fl!("tui-no-package-clean-up"));
+                    } else {
+                        for p in pkgs {
+                            self.remove_package.items.push(PkgWrapper { pkg: p });
                         }
                     }
                 }
diff --git a/src/subcommand/utils.rs b/src/subcommand/utils.rs
@@ -66,12 +66,12 @@ use oma_history::write_history_entry;
 use oma_pm::CommitNetworkConfig;
 use oma_pm::CustomDownloadMessage;
 use oma_pm::apt::AptConfig;
-use oma_pm::apt::FilterMode;
 use oma_pm::apt::InstallProgressOpt;
 use oma_pm::apt::OmaApt;
 use oma_pm::apt::OmaAptArgs;
 use oma_pm::apt::OmaAptError;
 use oma_pm::apt::{InstallEntry, RemoveEntry};
+use oma_pm::oma_apt::PackageSort;
 use oma_pm::sort::SummarySort;
 use oma_refresh::db::OmaRefresh;
 use oma_utils::dpkg::dpkg_arch;
@@ -817,12 +817,14 @@ pub fn write_oma_installed_status(apt: &OmaApt, sysroot: impl AsRef<Path>) -> an
     }
 
     let pkgs = apt
-        .filter_pkgs(&[FilterMode::Installed])?
+        .cache
+        .packages(&PackageSort::default().installed())
         .map(|x| x.fullname(false))
         .collect::<Vec<_>>();
 
     let manual_pkgs = apt
-        .filter_pkgs(&[FilterMode::Installed, FilterMode::Manual])?
+        .cache
+        .packages(&PackageSort::default().manually_installed())
         .map(|x| x.fullname(false))
         .collect::<Vec<_>>();
 
diff --git a/src/utils.rs b/src/utils.rs
@@ -18,7 +18,10 @@ use crate::{RT, fl};
 use anyhow::anyhow;
 use clap_complete::{CompletionCandidate, engine::ValueCompleter};
 use dialoguer::{Confirm, theme::ColorfulTheme};
-use oma_pm::apt::{AptConfig, FilterMode, OmaApt, OmaAptArgs};
+use oma_pm::{
+    apt::{AptConfig, OmaApt, OmaAptArgs},
+    oma_apt::PackageSort,
+};
 use oma_utils::{
     dbus::{
         Connection, InhibitTypeUnion, create_dbus_connection, is_using_battery, session_name,
@@ -276,7 +279,7 @@ pub fn pkgnames_and_path_completions(current: &std::ffi::OsStr) -> Vec<Completio
 
     let mut completions = vec![];
     let current = &current.to_string_lossy();
-    pkgnames_complete_impl(&mut completions, current, &[FilterMode::Names]);
+    pkgnames_complete_impl(&mut completions, current, PackageSort::default().names());
 
     completions.extend(path_completions);
 
@@ -286,15 +289,15 @@ pub fn pkgnames_and_path_completions(current: &std::ffi::OsStr) -> Vec<Completio
 pub fn pkgnames_completions(current: &std::ffi::OsStr) -> Vec<CompletionCandidate> {
     let mut completions = vec![];
     let current = &current.to_string_lossy();
-    pkgnames_complete_impl(&mut completions, current, &[FilterMode::Names]);
+    pkgnames_complete_impl(&mut completions, current, PackageSort::default().names());
 
     completions
 }
 
 fn pkgnames_complete_impl(
     completions: &mut Vec<CompletionCandidate>,
     current: &str,
-    filter_mode: &[FilterMode],
+    sort: PackageSort,
 ) {
     let Ok(apt) = OmaApt::new(
         vec![],
@@ -305,9 +308,7 @@ fn pkgnames_complete_impl(
         return;
     };
 
-    let Ok(pkgs) = apt.filter_pkgs(filter_mode) else {
-        return;
-    };
+    let pkgs = apt.cache.packages(&sort);
 
     if current.is_empty() {
         for pkg in pkgs {
@@ -331,7 +332,7 @@ pub fn pkgnames_remove_completions(current: &std::ffi::OsStr) -> Vec<CompletionC
     pkgnames_complete_impl(
         &mut completions,
         &current,
-        &[FilterMode::Names, FilterMode::Installed],
+        PackageSort::default().names().installed(),
     );
 
     completions

Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ impl<'a> PackagesMatcher<'a> {`
`136`	`136`	`for ver in &versions {`
`137`	`137`	`let info = OmaPackage::new(ver, &pkg);`
`138`	`138`
`139`		`- let has = ver.uris().any(\|x\| url_no_escape(&x) == path);`
	`139`	`+ let has = ver.uris().iter().any(\|x\| url_no_escape(x) == path);`
`140`	`140`	`if has {`
`141`	`141`	`res.push(info);`
`142`	`142`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,11 +180,11 @@ impl CliExecuter for Pick {`
`180`	`180`
`181`	`181`	`let mut version_str_display = versions_str.clone();`
`182`	`182`	`for (a, b) in v {`
`183`		`- if let Some(uri) = versions[a].uris().next() {`
	`183`	`+ if let Some(uri) = versions[a].uris().first() {`
`184`	`184`	`version_str_display[a] = format!("{} (from: {uri})", versions_str[a]);`
`185`	`185`	`}`
`186`	`186`
`187`		`- if let Some(uri) = versions[b].uris().next() {`
	`187`	`+ if let Some(uri) = versions[b].uris().first() {`
`188`	`188`	`version_str_display[b] = format!("{} (from: {uri})", versions_str[b]);`
`189`	`189`	`}`
`190`	`190`	`}`