diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2021-04-06 10:25:25 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2021-04-06 10:25:25 +0200 |
commit | f27ff3c73f91e3c5821ed54bbc9b7e6f641dbf53 (patch) | |
tree | ed59bb1e2e8a5db37177ed9e216709fe37f33292 /src/frontend | |
parent | 9251445a5ac5315dca3921b7e77ce4a37cd42497 (diff) | |
parent | a6caaff3c89bb21fd1ed83fae023bb7df9ce59b3 (diff) |
Merge remote-tracking branch 'github/master'
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src/frontend')
-rw-r--r-- | src/frontend/list.rs | 3 | ||||
-rw-r--r-- | src/frontend/table.rs | 8 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/frontend/list.rs b/src/frontend/list.rs index e4ed7d7..950cfe2 100644 --- a/src/frontend/list.rs +++ b/src/frontend/list.rs @@ -2,6 +2,7 @@ use std::io::Stdout; use std::io::Write; use std::ops::Deref; +use librepology::v1::types::Name; use librepology::v1::types::Package; use librepology::v1::types::Problem; use librepology::v1::types::Repo; @@ -48,7 +49,7 @@ impl Frontend for ListFrontend { writeln!(outlock, "{name:10} - {version:8} - {repo:15} - {status:5} - {www}", - name = package.name().deref(), + name = package.any_name().map(Name::deref).map(String::deref).unwrap_or_else(|| "<unknown>"), version = package.version().deref(), repo = package.repo().deref(), status = status, diff --git a/src/frontend/table.rs b/src/frontend/table.rs index 2bef1b8..e7b4840 100644 --- a/src/frontend/table.rs +++ b/src/frontend/table.rs @@ -1,6 +1,7 @@ use std::io::Stdout; use std::ops::Deref; +use librepology::v1::types::Name; use librepology::v1::types::Package; use librepology::v1::types::Problem; use librepology::v1::types::Repo; @@ -64,7 +65,12 @@ impl Frontend for TableFrontend { String::from("") }; // not optimal, but works for now - table.add_row(row![package.name(), package.version(), package.repo(), status, url]); + let name = package.any_name() + .map(Name::deref) + .map(String::clone) + .unwrap_or_else(|| String::from("<unknown>")); + + table.add_row(row![name, package.version(), package.repo(), status, url]); }); self.print(table) } |