feat(oma-refresh): add run apt update success post invoke feature (#103)

* feat(oma-refresh): add run apt update success post invoke feature

* Wait remove useless file task finish after run success post invoke

* Fix apt dump config contains useless `"` and `;`

* clippy

* Fix remove useless repr char

* Remove useless line

* No need to collect iter

* Improve code style

Author: eatradish

oma-refresh/Cargo.toml

@@ -11,7 +11,7 @@ license = "GPL-3.0-or-later"
 oma-fetch = { version = "^0.14.0", path = "../oma-fetch", default-features = false }
 thiserror = "1.0"
 url = "2.3"
-tokio = { version = "1.28", default-features = false, features = ["fs"] }
+tokio = { version = "1.28", default-features = false, features = ["fs", "process"] }
 futures = "0.3"
 oma-apt-sources-lists = "0.4"
 oma-debcontrol = "0.3"

oma-refresh/src/config.rs

@@ -1,4 +1,4 @@
-use std::{cmp::Ordering, collections::VecDeque, env, path::Path};
+use std::{env, path::Path};
 
 use ahash::AHashMap;
 use oma_apt::config::Config;
@@ -8,69 +8,25 @@ use tracing::debug;
 
 use crate::inrelease::ChecksumItem;
 
-fn get_config(config: &Config) -> Vec<(String, String)> {
-    let Some(tree) = config.root_tree() else {
-        return vec![];
-    };
-
-    let mut list = vec![];
-
-    let mut stack = VecDeque::new();
-    stack.push_back((tree, 0));
-
-    let mut depth = 0;
-    let mut name = "".to_string();
-
-    while let Some((node, indent)) = stack.pop_back() {
-        let mut k = None;
-        let mut v = None;
+pub fn get_config(config: &Config) -> Vec<(String, String)> {
+    config
+        .dump()
+        .lines()
+        .filter_map(|x| x.split_once(|c: char| c.is_ascii_whitespace()))
+        .map(|(k, v)| {
+            let mut v = v.to_string();
 
-        if let Some(item) = node.sibling() {
-            stack.push_back((item, indent));
-        }
-
-        if let Some(item) = node.child() {
-            stack.push_back((item, indent + 2));
-        }
-
-        if let Some(tag) = node.tag() {
-            match indent.cmp(&depth) {
-                Ordering::Less => {
-                    let mut tmp = name.split("::").collect::<Vec<_>>();
-                    for _ in 0..=1 {
-                        tmp.pop();
-                    }
-                    name = tmp.join("::");
-                    name.push_str("::");
-                    name.push_str(&tag);
-                }
-                Ordering::Equal => {
-                    let mut tmp = name.split("::").collect::<Vec<_>>();
-                    tmp.pop();
-                    name = tmp.join("::");
-                    name.push_str("::");
-                    name.push_str(&tag);
-                }
-                Ordering::Greater => {
-                    name.push_str("::");
-                    name.push_str(&tag);
-                }
+            while v.ends_with(";") || v.ends_with("\"") {
+                v.pop();
             }
 
-            depth = indent;
-            k = Some(name.strip_prefix("::").unwrap().to_string());
-        }
-
-        if let Some(value) = node.value() {
-            v = Some(value);
-        }
-
-        if let Some(v) = k.zip(v) {
-            list.push((v.0, v.1));
-        }
-    }
+            while v.starts_with("\"") {
+                v.remove(0);
+            }
 
-    list
+            (k.to_string(), v)
+        })
+        .collect()
 }
 
 #[derive(Debug)]
@@ -83,13 +39,13 @@ pub struct ChecksumDownloadEntry {
 pub fn fiilter_download_list(
     checksums: &SmallVec<[ChecksumItem; 32]>,
     config: &Config,
+    config_tree: &[(String, String)],
     archs: &[String],
     components: &[String],
     native_arch: &str,
     is_flat: bool,
 ) -> SmallVec<[ChecksumDownloadEntry; 32]> {
     let mut v = smallvec![];
-    let config_tree = get_config(config);
 
     let mut filter_entry = vec![];
 
@@ -116,10 +72,10 @@ pub fn fiilter_download_list(
         {
             for a in &archs_contains_all {
                 for c in components {
-                    let s = replace_arch_and_component(&v, c, a, native_arch);
+                    let s = replace_arch_and_component(v, c, a, native_arch);
                     let e = k
                         .strip_prefix("APT::")
-                        .unwrap_or(&k)
+                        .unwrap_or(k)
                         .strip_suffix(metakey)
                         .unwrap();
 

oma-refresh/src/db.rs

@@ -24,11 +24,11 @@ use oma_fetch::DownloadError;
 use reqwest::StatusCode;
 
 use smallvec::SmallVec;
-use tokio::fs;
-use tracing::debug;
+use tokio::{fs, process::Command};
+use tracing::{debug, warn};
 
 use crate::{
-    config::{fiilter_download_list, ChecksumDownloadEntry},
+    config::{fiilter_download_list, get_config, ChecksumDownloadEntry},
     inrelease::{
         file_is_compress, split_ext_and_filename, ChecksumType, InRelease, InReleaseParser,
         InReleaseParserError,
@@ -209,26 +209,66 @@ impl<'a> OmaRefresh<'a> {
             .handle_downloaded_release_result(release_results, _callback.clone(), _handle_topic_msg)
             .await?;
 
+        let config_tree = get_config(self.apt_config);
+
         let (tasks, total) = self
-            .collect_all_release_entry(all_inrelease, &sourcelist, &replacer, soueces_map)
+            .collect_all_release_entry(
+                all_inrelease,
+                &sourcelist,
+                &replacer,
+                soueces_map,
+                &config_tree,
+            )
             .await?;
 
         for i in &tasks {
             download_list.push(i.filename.to_string());
         }
 
         let download_dir = self.download_dir.clone();
-        tokio::spawn(async move { remove_unused_db(download_dir, download_list).await });
+        let remove_task =
+            tokio::spawn(async move { remove_unused_db(download_dir, download_list).await });
 
         let res = OmaFetcher::new(self.client, tasks, self.limit)?
             .start_download(|count, event| _callback(count, RefreshEvent::from(event), Some(total)))
             .await;
 
         res.into_iter().collect::<DownloadResult<Vec<_>>>()?;
 
+        // Finally, run success post invoke
+        let _ = remove_task.await;
+        Self::run_success_post_invoke(&config_tree).await;
+
         Ok(())
     }
 
+    async fn run_success_post_invoke(config_tree: &[(String, String)]) {
+        let cmds = config_tree
+            .iter()
+            .filter(|x| x.0 == "APT::Update::Post-Invoke-Success::");
+
+        for (_, cmd) in cmds {
+            debug!("Running post-invoke script: {cmd}");
+            let output = Command::new("sh").arg("-c").arg(cmd).output().await;
+
+            match output {
+                Ok(output) => {
+                    if !output.status.success() {
+                        warn!(
+                            "Run {cmd} return non-zero code: {}",
+                            output.status.code().unwrap_or(1)
+                        );
+                        continue;
+                    }
+                    debug!("Run {cmd} success");
+                }
+                Err(e) => {
+                    warn!("Run {cmd} failed: {e}");
+                }
+            }
+        }
+    }
+
     async fn get_is_inrelease_map<F>(
         &mut self,
         sourcelist: &[OmaSourceEntry],
@@ -521,6 +561,7 @@ impl<'a> OmaRefresh<'a> {
         sourcelist: &[OmaSourceEntry],
         replacer: &DatabaseFilenameReplacer,
         sources_map: AHashMap<String, OmaSourceEntry>,
+        config_tree: &[(String, String)],
     ) -> Result<(Vec<DownloadEntry>, u64)> {
         let mut total = 0;
         let mut tasks = vec![];
@@ -562,6 +603,7 @@ impl<'a> OmaRefresh<'a> {
             let filter_checksums = fiilter_download_list(
                 &inrelease.checksums,
                 self.apt_config,
+                config_tree,
                 &archs,
                 &ose.components,
                 &ose.native_arch,