diff options
Diffstat (limited to 'src/frontend')
| -rw-r--r-- | src/frontend/json.rs | 41 | ||||
| -rw-r--r-- | src/frontend/list.rs | 27 | ||||
| -rw-r--r-- | src/frontend/mod.rs | 3 | ||||
| -rw-r--r-- | src/frontend/table.rs | 40 |
4 files changed, 111 insertions, 0 deletions
diff --git a/src/frontend/json.rs b/src/frontend/json.rs index 9cf5573..b6a34e5 100644 --- a/src/frontend/json.rs +++ b/src/frontend/json.rs @@ -4,10 +4,14 @@ use std::ops::Deref; use librepology::v1::types::Package; use librepology::v1::types::Problem; +use librepology::v1::types::Repo; use failure::Fallible as Result; use failure::Error; use crate::frontend::Frontend; +use crate::backend::Backend; +use crate::compare::ComparePackage; +use librepology::v1::api::Api; pub struct JsonFrontend(Stdout); @@ -29,5 +33,42 @@ impl Frontend for JsonFrontend { let mut outlock = self.0.lock(); writeln!(outlock, "{}", output).map_err(Error::from) } + + fn compare_packages(&self, packages: Vec<ComparePackage>, backend: &Backend, filter_repos: Vec<Repo>) -> Result<()> { + #[derive(Serialize)] + struct PackageComp { + // not optimal, as we have to clone the inner variables from the package + // but using references is too complicated right now + package_name: String, + local_version: String, + upstream_repo: String, + upstream_version: String, + } + + let mut output: Vec<PackageComp> = vec![]; + + for package in packages.iter() { + let mut list = backend + .project(package.name().deref())? + .into_iter() + .filter(|p| filter_repos.contains(p.repo())) + .map(|upstream_package| { + PackageComp { + package_name: package.name().clone(), + local_version: package.version().clone(), + upstream_repo: upstream_package.repo().deref().clone(), + upstream_version: upstream_package.version().deref().clone(), + } + }) + .collect::<Vec<_>>(); + + output.append(&mut list); + } + + let output = serde_json::ser::to_string_pretty(&output)?; + + let mut outlock = self.0.lock(); + writeln!(outlock, "{}", output).map_err(Error::from) + } } diff --git a/src/frontend/list.rs b/src/frontend/list.rs index 8cff146..e870ab0 100644 --- a/src/frontend/list.rs +++ b/src/frontend/list.rs @@ -4,10 +4,14 @@ use std::ops::Deref; use librepology::v1::types::Package; use librepology::v1::types::Problem; +use librepology::v1::types::Repo; use failure::Fallible as Result; use failure::Error; use crate::frontend::Frontend; +use crate::backend::Backend; +use crate::compare::ComparePackage; +use librepology::v1::api::Api; pub struct ListFrontend(Stdout); @@ -67,5 +71,28 @@ impl Frontend for ListFrontend { }) }) } + + fn compare_packages(&self, packages: Vec<ComparePackage>, backend: &Backend, filter_repos: Vec<Repo>) -> Result<()> { + let mut output = self.0.lock(); + + for package in packages { + backend + .project(package.name().deref())? + .into_iter() + .filter(|p| filter_repos.contains(p.repo())) + .map(|upstream_package| { + writeln!(output, + "{our_package_name} - {our_package_version} - {up_repo_name} - {up_package_version}", + our_package_name = package.name().deref(), + our_package_version = package.version().deref(), + up_repo_name = upstream_package.repo().deref(), + up_package_version = upstream_package.version().deref() + ).map_err(Error::from) + }) + .collect::<Result<Vec<()>>>()?; + } + + Ok(()) + } } diff --git a/src/frontend/mod.rs b/src/frontend/mod.rs index 41ab972..43e5b5e 100644 --- a/src/frontend/mod.rs +++ b/src/frontend/mod.rs @@ -7,10 +7,13 @@ use crate::config::Configuration; use crate::frontend::list::ListFrontend; use crate::frontend::json::JsonFrontend; use crate::frontend::table::TableFrontend; +use crate::compare::ComparePackage; +use crate::backend::Backend; pub trait Frontend { fn list_packages(&self, packages: Vec<Package>) -> Result<()>; fn list_problems(&self, problems: Vec<Problem>) -> Result<()>; + fn compare_packages(&self, packages: Vec<ComparePackage>, backend: &Backend, filter_repos: Vec<Repo>) -> Result<()>; } pub mod list; diff --git a/src/frontend/table.rs b/src/frontend/table.rs index ba4e77a..6a30e9c 100644 --- a/src/frontend/table.rs +++ b/src/frontend/table.rs @@ -3,11 +3,15 @@ use std::ops::Deref; use librepology::v1::types::Package; use librepology::v1::types::Problem; +use librepology::v1::types::Repo; use failure::Fallible as Result; use prettytable::format; use prettytable::Table; use crate::frontend::Frontend; +use crate::backend::Backend; +use crate::compare::ComparePackage; +use librepology::v1::api::Api; pub struct TableFrontend(Stdout); @@ -90,5 +94,41 @@ impl Frontend for TableFrontend { Ok(()) } + + fn compare_packages(&self, packages: Vec<ComparePackage>, backend: &Backend, filter_repos: Vec<Repo>) -> Result<()> { + let mut table = Table::new(); + let format = format::FormatBuilder::new() + .column_separator('|') + .borders('|') + .separators( + &[format::LinePosition::Title, format::LinePosition::Top, format::LinePosition::Bottom], + format::LineSeparator::new('-', '+', '+', '+') + ) + .padding(1, 1) + .build(); + table.set_format(format); + + table.set_titles(row!["Name", "Local Version", "Repo", "Upstream Version"]); + + for package in packages { + backend + .project(package.name().deref())? + .into_iter() + .filter(|p| filter_repos.contains(p.repo())) + .for_each(|upstream_package| { + table.add_row(row![ + package.name().deref().clone(), + package.version().deref().clone(), + upstream_package.repo().deref().clone(), + upstream_package.version().deref().clone(), + ]); + }); + } + + let mut outlock = self.0.lock(); + table.print(&mut outlock)?; + + Ok(()) + } } |