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

refactor(minor code changes)

Browse Source
This commit is contained in:
innocentzero
2024-01-28 03:11:41 +05:30
parent bf01859f05
commit 34a428f280
1 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/pacdef_core/src/backend/actual/python.rs
+19 -13
View File
@@ -27,6 +27,12 @@ const SWITCHES_REMOVE: Switches = &["uninstall"];
const SUPPORTS_AS_DEPENDENCY: bool = false; const SUPPORTS_AS_DEPENDENCY: bool = false;
macro_rules! ERROR{
($bin:expr) => {
panic!("Cannot use {} for package management in python. Please use a valid package manager like pip or pipx.", $bin)
};
}
impl Backend for Python { impl Backend for Python {
impl_backend_constants!(); impl_backend_constants!();
@@ -38,21 +44,13 @@ impl Backend for Python {
fn get_all_installed_packages(&self) -> Result<HashSet<Package>> { fn get_all_installed_packages(&self) -> Result<HashSet<Package>> {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
let output = run_pip_command(&mut cmd, self.get_switches_runtime())?; let output = run_pip_command(&mut cmd, self.get_switches_runtime())?;
match self.get_binary(){ self.extract_packages(output)
"pip" => extract_pacdef_packages(output),
"pipx" => extract_pacdef_packages_pipx(output),
_ => panic!("Cannot use {} for package management in python. Please use a valid package manager like pip or pipx", self.get_binary()),
}
} }
fn get_explicitly_installed_packages(&self) -> Result<HashSet<Package>> { fn get_explicitly_installed_packages(&self) -> Result<HashSet<Package>> {
let mut cmd = Command::new(self.get_binary()); let mut cmd = Command::new(self.get_binary());
let output = run_pip_command(&mut cmd, self.get_switches_explicit())?; let output = run_pip_command(&mut cmd, self.get_switches_explicit())?;
match self.get_binary(){ self.extract_packages(output)
"pip" => extract_pacdef_packages(output),
"pipx" => extract_pacdef_packages_pipx(output),
_ => panic!("Cannot use {} for package management in python. Please use a valid package manager like pip or pipx", self.get_binary()),
}
} }
fn make_dependency(&self, _packages: &[Package]) -> Result<ExitStatus> { fn make_dependency(&self, _packages: &[Package]) -> Result<ExitStatus> {
@@ -79,14 +77,22 @@ impl Python {
match self.get_binary() { match self.get_binary() {
"pip" => &["list", "--format", "json", "--not-required", "--user"], "pip" => &["list", "--format", "json", "--not-required", "--user"],
"pipx" => &["list", "--json"], "pipx" => &["list", "--json"],
_ => panic!("Cannot use {} for package management in python. Please use a valid package manager like pip or pipx", self.get_binary()), _ => ERROR!(self.get_binary()),
} }
} }
fn get_switches_explicit(&self) -> Switches { fn get_switches_explicit(&self) -> Switches {
match self.get_binary() { match self.get_binary() {
"pip" => &["list", "--format", "json", "--user", ""], "pip" => &["list", "--format", "json", "--user"],
"pipx" => &["list", "--json"], "pipx" => &["list", "--json"],
_ => panic!("Cannot use {} for package management in python. Please use a valid package manager like pip or pipx", self.get_binary()), _ => ERROR!(self.get_binary()),
}
}
fn extract_packages(&self, output: Value) -> Result<HashSet<Package>> {
match self.get_binary() {
"pip" => extract_pacdef_packages(output),
"pipx" => extract_pacdef_packages_pipx(output),
_ => ERROR!(self.get_binary()),
} }
} }
} }