summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-09-10 09:33:37 +0200
committerMatthias Beyer <mail@beyermatthias.de>2020-09-10 09:56:02 +0200
commit1a1ef22fa99096b7a997b313d90bdad542d8742b (patch)
treeb07cf500a5d7ea0e70d2bf549e34fde422aefb34
parentf0b78fdfea41d26442b315559958b14c18fae3cf (diff)
Fix for API change with name as Option<>
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
-rw-r--r--src/frontend/list.rs3
-rw-r--r--src/frontend/table.rs8
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 35c867c..cf95173 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)
}