From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Sep 2020 12:36:57 +0000 (+0100)
Subject: library list
X-Git-Tag: otter-0.2.0~857
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=e4fac6d96066f0c5d8bab991e3ecd5d001a8e0f6;p=otter.git

library list

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
---

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index bfa8346f..1b1e1a62 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -602,8 +602,15 @@ mod library_list {
     };
 
     let cmd = MgmtCommand::LibraryListByGlob { glob: args.pat.clone() };
-    let items = chan.cmd(&cmd)?;
-    dbg!(&items);
+    let mut items = match chan.cmd(&cmd)? {
+      MgmtResponse::LibraryItems(items) => items,
+      wat => Err(anyhow!("unexpected LibraryListByGlob response: {:?}",
+                         &wat))?,
+    };
+    items.sort();
+    for it in &items {
+      println!("{:20}  {}", it.itemname, it.f0desc.0);
+    }
 
     Ok(())
   }
diff --git a/src/gamestate.rs b/src/gamestate.rs
index a16b6e83..77f98525 100644
--- a/src/gamestate.rs
+++ b/src/gamestate.rs
@@ -25,7 +25,7 @@ visible_slotmap_key!{ VisiblePieceId('.') }
 #[serde(try_from="f64")]
 pub struct ZCoord(pub f64);
 
-#[derive(Clone,Serialize,Deserialize)]
+#[derive(Clone,Serialize,Deserialize,Eq,Ord,PartialEq,PartialOrd)]
 #[serde(transparent)]
 pub struct Html (pub String);
 
diff --git a/src/shapelib.rs b/src/shapelib.rs
index 50b9eb11..8fa730fd 100644
--- a/src/shapelib.rs
+++ b/src/shapelib.rs
@@ -141,7 +141,7 @@ struct Item {
   outline: Box<dyn Outline>,
 }
 
-#[derive(Debug,Clone,Serialize,Deserialize)]
+#[derive(Debug,Clone,Serialize,Deserialize,Eq,PartialEq,Ord,PartialOrd)]
 pub struct ItemEnquiryData {
   pub itemname: String,
   pub f0desc: Html,