From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 27 Sep 2020 12:39:14 +0000 (+0100)
Subject: break out list_items
X-Git-Tag: otter-0.2.0~856
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=77c65469b5884f8c8ecef9b37524929c1e603342;p=otter.git

break out list_items

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

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 1b1e1a62..1c601f87 100644
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -313,6 +313,19 @@ impl ConnForGame {
       wat => Err(anyhow!("ListPieces => {:?}", &wat))?,
     }
   }
+
+  #[throws(AE)]
+  fn list_items(&mut self, pat: &shapelib::ItemSpec)
+                -> Vec<shapelib::ItemEnquiryData> {
+    let cmd = MgmtCommand::LibraryListByGlob { glob: pat.clone() };
+    let mut items = match self.cmd(&cmd)? {
+      MgmtResponse::LibraryItems(items) => items,
+      wat => Err(anyhow!("unexpected LibraryListByGlob response: {:?}",
+                         &wat))?,
+    };
+    items.sort();
+    items
+  }
 }
 
 #[throws(E)]
@@ -601,13 +614,7 @@ mod library_list {
       how: MgmtGameUpdateMode::Bulk,
     };
 
-    let cmd = MgmtCommand::LibraryListByGlob { glob: args.pat.clone() };
-    let mut items = match chan.cmd(&cmd)? {
-      MgmtResponse::LibraryItems(items) => items,
-      wat => Err(anyhow!("unexpected LibraryListByGlob response: {:?}",
-                         &wat))?,
-    };
-    items.sort();
+    let items = chan.list_items(&args.pat)?;
     for it in &items {
       println!("{:20}  {}", it.itemname, it.f0desc.0);
     }