timeshifter/pacdef_rust
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

improve regex and comment regex

Browse Source
This commit is contained in:
Book-reader
2024-04-04 18:59:06 +13:00
parent 9a8949227f
commit cf64bb0f72
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pacdef_core/src/backend/actual/void.rs
+4 -1
View File
@@ -50,7 +50,9 @@ impl Backend for Void {
impl_backend_constants!(); impl_backend_constants!();
fn get_all_installed_packages(&self) -> Result<HashSet<Package>> { fn get_all_installed_packages(&self) -> Result<HashSet<Package>> {
let re_str_1 = r"ii | .*"; // Removes the package status and description from output
let re_str_1 = r"^ii |^uu |^hr |^\?\? | .*";
// Removes the package version from output
let re_str_2 = r"-[^-]*$"; let re_str_2 = r"-[^-]*$";
let re1 = Regex::new(re_str_1)?; let re1 = Regex::new(re_str_1)?;
let re2 = Regex::new(re_str_2)?; let re2 = Regex::new(re_str_2)?;
@@ -70,6 +72,7 @@ impl Backend for Void {
} }
fn get_explicitly_installed_packages(&self) -> Result<HashSet<Package>> { fn get_explicitly_installed_packages(&self) -> Result<HashSet<Package>> {
// Removes the package version from output
let re_str = r"-[^-]*$"; let re_str = r"-[^-]*$";
let re = Regex::new(re_str)?; let re = Regex::new(re_str)?;
let mut cmd = Command::new(self.get_binary_info()); let mut cmd = Command::new(self.get_binary_info());