arabianq/rpmi
1
0
Fork 0
mirror of https://github.com/arabianq/rpmi.git synced 2026-06-19 04:53:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

cargo clippy --fix

Browse Source
This commit is contained in:
Tarasov Aleksandr
2026-06-10 15:10:23 +03:00
parent cedeb89d2f
commit 8e5195d233
2 changed files with 43 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/dnf.rs
+36 -42
View File
@@ -43,47 +43,45 @@ pub fn get_package_state(pkg: &rpm::Package) -> PackageState {
let child_stdout = child.stdout.take().expect("Couldn't take stdout"); let child_stdout = child.stdout.take().expect("Couldn't take stdout");
for line in BufReader::new(child_stdout).lines() { for line in BufReader::new(child_stdout).lines().flatten() {
if let Ok(line) = line { let parts: Vec<&str> = line.split_whitespace().collect();
let parts: Vec<&str> = line.split_whitespace().collect();
if parts.len() != 3 { if parts.len() != 3 {
continue; continue;
} }
let name_splitted: Vec<&str> = parts[0].split(".").collect(); let name_splitted: Vec<&str> = parts[0].split(".").collect();
let (name, arch) = (name_splitted[0], name_splitted[1]); let (name, arch) = (name_splitted[0], name_splitted[1]);
let version_prepared = parts[1] let version_prepared = parts[1]
.split_once(':') .split_once(':')
.map(|(_epoch, version)| version) .map(|(_epoch, version)| version)
.unwrap_or(parts[1]); .unwrap_or(parts[1]);
let version_splitted: Vec<&str> = version_prepared.split("-").collect(); let version_splitted: Vec<&str> = version_prepared.split("-").collect();
let (version, release) = (version_splitted[0], version_splitted[1]); let (version, release) = (version_splitted[0], version_splitted[1]);
if pkg_name.eq(name) && pkg_arch.eq(arch) { if pkg_name.eq(name) && pkg_arch.eq(arch) {
child.kill().unwrap(); child.kill().unwrap();
child.wait().unwrap(); child.wait().unwrap();
let package_entry = PackageEntry { let package_entry = PackageEntry {
name: name.to_string(), name: name.to_string(),
arch: arch.to_string(), arch: arch.to_string(),
version: version.to_string(), version: version.to_string(),
release: release.to_string(), release: release.to_string(),
}; };
if pkg_version.eq(version) && pkg_release.eq(release) { if pkg_version.eq(version) && pkg_release.eq(release) {
return PackageState::OldVersion; return PackageState::OldVersion;
}
return PackageState::NewVersion(package_entry);
} }
return PackageState::NewVersion(package_entry);
} }
} }
child.kill().ok(); child.kill().ok();
child.wait().ok(); child.wait().ok();
return PackageState::NewPackage; PackageState::NewPackage
} }
pub fn dnf_start_action( pub fn dnf_start_action(
@@ -117,19 +115,15 @@ pub fn dnf_start_action(
let stdout_thread = thread::spawn(move || { let stdout_thread = thread::spawn(move || {
let stdout_lines = BufReader::new(child_stdout).lines(); let stdout_lines = BufReader::new(child_stdout).lines();
for line in stdout_lines { for line in stdout_lines.flatten() {
if let Ok(line) = line { stdout_tx.send(line).ok();
stdout_tx.send(line).ok();
}
} }
}); });
let stderr_thread = thread::spawn(move || { let stderr_thread = thread::spawn(move || {
let stderr_lines = BufReader::new(child_stderr).lines(); let stderr_lines = BufReader::new(child_stderr).lines();
for line in stderr_lines { for line in stderr_lines.flatten() {
if let Ok(line) = line { stderr_tx.send(line).ok();
stderr_tx.send(line).ok();
}
} }
}); });
@@ -148,5 +142,5 @@ pub fn dnf_start_action(
child.wait().ok(); child.wait().ok();
}); });
return (action_thread, rx); (action_thread, rx)
} }
src/gui.rs
+7 -7
View File
@@ -62,7 +62,7 @@ impl Application {
let mut guard = pkg_state_shared.lock().unwrap(); let mut guard = pkg_state_shared.lock().unwrap();
*guard = Some(pkg_state); *guard = Some(pkg_state);
}); });
return thread; thread
} }
fn start_process(&mut self) { fn start_process(&mut self) {
@@ -105,7 +105,7 @@ impl Application {
} else { } else {
let mut value_layout_job = LayoutJob { let mut value_layout_job = LayoutJob {
wrap: TextWrapping { wrap: TextWrapping {
max_rows: max_rows, max_rows,
..Default::default() ..Default::default()
}, },
..Default::default() ..Default::default()
@@ -165,7 +165,7 @@ impl Application {
add_info_entry( add_info_entry(
ui, ui,
"Architecture", "Architecture",
&self.pkg.metadata.get_arch().unwrap_or("-"), self.pkg.metadata.get_arch().unwrap_or("-"),
1, 1,
false, false,
); );
@@ -179,28 +179,28 @@ impl Application {
add_info_entry( add_info_entry(
ui, ui,
"Summary ", "Summary ",
&self.pkg.metadata.get_summary().unwrap_or("-"), self.pkg.metadata.get_summary().unwrap_or("-"),
3, 3,
false, false,
); );
add_info_entry( add_info_entry(
ui, ui,
"URL ", "URL ",
&self.pkg.metadata.get_url().unwrap_or("-"), self.pkg.metadata.get_url().unwrap_or("-"),
1, 1,
true, true,
); );
add_info_entry( add_info_entry(
ui, ui,
"License ", "License ",
&self.pkg.metadata.get_license().unwrap_or("-"), self.pkg.metadata.get_license().unwrap_or("-"),
2, 2,
false, false,
); );
add_info_entry( add_info_entry(
ui, ui,
"Description ", "Description ",
&self.pkg.metadata.get_description().unwrap_or("-"), self.pkg.metadata.get_description().unwrap_or("-"),
5, 5,
false, false,
); );