Merge pull request #569 from AOSC-Dev/allow-set-dir-state

Allow set apt option `Dir::State::lists`

Author: eatradish

oma-tum/src/lib.rs

@@ -140,10 +140,10 @@ pub enum TumError {
     ReadFile { path: PathBuf, source: io::Error },
 }
 
-pub fn get_tum(sysroot: &Path) -> Result<Vec<TopicUpdateManifest>, TumError> {
+pub fn get_tum(list_dir: impl AsRef<Path>) -> Result<Vec<TopicUpdateManifest>, TumError> {
     let mut entries = vec![];
 
-    for i in read_dir(sysroot.join("var/lib/apt/lists")).context(ReadAptListDirSnafu)? {
+    for i in read_dir(list_dir).context(ReadAptListDirSnafu)? {
         let i = i.context(ReadDirEntrySnafu)?;
 
         if i.path()

src/error.rs

@@ -262,7 +262,14 @@ impl From<OmaDbusError> for OutputError {
 #[cfg(feature = "aosc")]
 impl From<TumError> for OutputError {
     fn from(value: TumError) -> Self {
-        let p1 = "/var/lib/apt/lists".to_string();
+        use oma_pm::apt::AptConfig;
+
+        use crate::utils::get_lists_dir;
+
+        let p1 = get_lists_dir(&AptConfig::new())
+            .to_string_lossy()
+            .to_string();
+
         match value {
             TumError::ReadAptListDir { source } => Self {
                 description: fl!("failed-to-operate-path", p = p1),

src/main.rs

@@ -32,6 +32,7 @@ use lang::LANGUAGE_LOADER;
 use oma_console::OmaLayer;
 use oma_console::print::{OmaColorFormat, termbg};
 use oma_console::writer::{MessageType, Writer, writeln_inner};
+use oma_pm::apt::AptConfig;
 use oma_utils::OsRelease;
 use oma_utils::dbus::{create_dbus_connection, get_another_oma_status};
 use reqwest::Client;
@@ -210,6 +211,8 @@ fn main() {
         }
     }
 
+    init_apt_config(&oma);
+
     let code = match try_main(oma, config, matches) {
         Ok(exit_code) => {
             unlock_oma().ok();
@@ -233,6 +236,17 @@ fn main() {
     exit(code);
 }
 
+fn init_apt_config(oma: &OhManagerAilurus) {
+    let apt_config = AptConfig::new();
+    apt_config.set("Dir", &oma.global.sysroot.to_string_lossy());
+
+    for kv in &oma.global.apt_options {
+        let (k, v) = kv.split_once('=').unwrap_or((kv.as_str(), ""));
+        debug!("Set apt option: {k}={v}");
+        apt_config.set(k, v);
+    }
+}
+
 fn parse_args() -> (ArgMatches, OhManagerAilurus) {
     let matches = match OhManagerAilurus::command().try_get_matches() {
         Ok(m) => m,

src/subcommand/command_not_found.rs

@@ -12,12 +12,12 @@ use tracing::error;
 use crate::config::Config;
 use crate::error::OutputError;
 use crate::table::PagerPrinter;
+use crate::utils::get_lists_dir;
 use crate::{color_formatter, due_to, fl};
 
 use crate::args::CliExecuter;
 
 const FILTER_JARO_NUM: u8 = 204;
-const APT_LIST_PATH: &str = "/var/lib/apt/lists";
 
 type IndexSet<T> = indexmap::IndexSet<T, ahash::RandomState>;
 
@@ -40,7 +40,12 @@ impl CliExecuter for CommandNotFound {
             }
         };
 
-        let search_res = search(APT_LIST_PATH, Mode::BinProvides, &keyword, cb);
+        let search_res = search(
+            get_lists_dir(&AptConfig::new()),
+            Mode::BinProvides,
+            &keyword,
+            cb,
+        );
 
         match search_res {
             Ok(()) if res.is_empty() => {

src/subcommand/depends.rs

@@ -64,7 +64,7 @@ impl CliExecuter for Depends {
         let (pkgs, no_result) =
             matcher.match_pkgs_and_versions(packages.iter().map(|x| x.as_str()))?;
 
-        handle_no_result(&sysroot, no_result, no_progress)?;
+        handle_no_result(no_result, no_progress)?;
 
         if !json {
             for pkg in pkgs {

src/subcommand/download.rs

@@ -61,7 +61,7 @@ impl CliExecuter for Download {
 
         let (pkgs, no_result) =
             matcher.match_pkgs_and_versions(packages.iter().map(|x| x.as_str()))?;
-        handle_no_result("/", no_result, no_progress)?;
+        handle_no_result(no_result, no_progress)?;
 
         let (tx, rx) = unbounded();
 

src/subcommand/history.rs

@@ -256,7 +256,7 @@ impl CliExecuter for Undo {
             }
         }
 
-        handle_no_result(&sysroot, no_result, no_progress)?;
+        handle_no_result(no_result, no_progress)?;
 
         apt.remove(delete, false, true)?;
 

src/subcommand/install.rs

@@ -219,7 +219,7 @@ impl CliExecuter for Install {
 
         let (pkgs, no_result) = matcher.match_pkgs_and_versions(pkgs_unparse)?;
 
-        handle_no_result(&sysroot, no_result, no_progress)?;
+        handle_no_result(no_result, no_progress)?;
 
         let no_marked_install = apt.install(&pkgs, reinstall)?;
 

src/subcommand/mark.rs

@@ -98,7 +98,7 @@ impl CliExecuter for Mark {
                 let (pkgs, no_result) =
                     matcher.match_pkgs_and_versions(packages.iter().map(|x| x.as_str()))?;
 
-                handle_no_result(&sysroot, no_result, no_progress)?;
+                handle_no_result(no_result, no_progress)?;
 
                 apt.mark_install_status(pkgs, action == MarkAction::Auto, dry_run)?
                     .into_iter()

src/subcommand/rdepends.rs

@@ -60,7 +60,7 @@ impl CliExecuter for Rdepends {
         let (pkgs, no_result) =
             matcher.match_pkgs_and_versions(packages.iter().map(|x| x.as_str()))?;
 
-        handle_no_result(&sysroot, no_result, no_progress)?;
+        handle_no_result(no_result, no_progress)?;
 
         if !json {
             for pkg in pkgs {