bundles: rework ListBundles return value

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

diff --git a/daemon/cmdlistener.rs b/daemon/cmdlistener.rs
index 5873b979dff43a9a907f67c0cc17cffcb3dade70..606b699e8e4248e676cbb9b60431d8c84618fc5d 100644 (file)
--- a/daemon/cmdlistener.rs
+++ b/daemon/cmdlistener.rs
@@ -250,7 +250,8 @@ fn execute_and_respond<R,W>(cs: &mut CommandStreamData, cmd: MgmtCommand,
       let (_ig, auth) = cs.check_acl(&ag, &mut igu, PCH::Instance,
                                     TP_ACCESS_BUNDLES)?;
       let bundles = bundles.by(auth);
-      MR::Bundles(bundles.list())
+      let bundles = bundles.list();
+      MR::Bundles { bundles }
     }
 
     MC::ListGames { all } => {

diff --git a/src/bin/otter.rs b/src/bin/otter.rs
index 5e378878382ffbcf18a7ab9ed599ac6fc509d070..edf02006b925446e0027ab48f4ecae6cae13aae9 100644 (file)
--- a/src/bin/otter.rs
+++ b/src/bin/otter.rs
@@ -1388,11 +1388,10 @@ mod list_bundles {
     let resp = chan.cmd(&MC::ListBundles {
       game: instance_name.clone(),
     })?;
-    if_let!{ MR::Bundles(bundles) = resp;
+    if_let!{ MR::Bundles { bundles } = resp;
              else throw!(anyhow!("unexpected {:?}", &resp)) };
-    for (index, note) in bundles.into_iter().enumerate() {
-      if_let!{ Some(note) = note; else continue; }
-      println!("{} {:?}", bundles::Index::try_from(index).unwrap(), &note);
+    for (id, state) in bundles {
+      println!("{} {:?}", id, &state);
     }
   }
 

diff --git a/src/bundles.rs b/src/bundles.rs
index b9c56bfd0dcd20696632184d35b7418286d7ade6..b8459b72ea9209e751e1db55fa49a028753ec4dd 100644 (file)
--- a/src/bundles.rs
+++ b/src/bundles.rs
@@ -55,8 +55,6 @@ pub struct InstanceBundles {
   bundles: Vec<Option<Note>>,
 }
 
-pub type MgmtList = Vec<Option<Note>>;
-
 #[derive(Debug,Clone,Serialize,Deserialize)]
 pub struct Note {
   pub kind: Kind,
@@ -180,7 +178,14 @@ fn incorporate_bundle(ib: &mut InstanceBundles, ig: &mut Instance,
 impl InstanceBundles {
   pub fn new() -> Self { InstanceBundles{ bundles: default() } }
 
-  pub fn list(&self) -> MgmtList { self.bundles.clone() }
+  pub fn list(&self) -> MgmtBundleList {
+    self.bundles.iter().enumerate().filter_map(|(index, slot)| {
+      let note = slot.as_ref()?;
+      let index = index.try_into().unwrap();
+      Some((Id { index, kind: note.kind },
+            note.state.clone()))
+    }).collect()
+  }
 
   #[throws(IE)]
   pub fn load_game_bundles(ig: &mut Instance) -> Self {

diff --git a/src/commands.rs b/src/commands.rs
index 6f1205eea0e77c00fcd36fc0cd8a179080b9824e..63c169acff8fa6add89258e1ba5f5fe79fcdb94c 100644 (file)
--- a/src/commands.rs
+++ b/src/commands.rs
@@ -92,9 +92,11 @@ pub enum MgmtResponse {
   AccountsList(Vec<Arc<AccountName>>),
   GamesList(Vec<Arc<InstanceName>>),
   LibraryItems(Vec<shapelib::ItemEnquiryData>),
-  Bundles(bundles::MgmtList),
+  Bundles { bundles: MgmtBundleList },
 }
 
+pub type MgmtBundleList = BTreeMap<bundles::Id, bundles::State>;
+
 #[derive(Debug,Serialize,Deserialize)]
 pub enum MgmtGameInstruction {
   Noop,

diff --git a/src/mgmtchannel.rs b/src/mgmtchannel.rs
index 58a890ead9f60dee8b7b751b9dad22b4d98c0508..3869b8bcfb9c9021661ce282ab4390c2a4e50eea 100644 (file)
--- a/src/mgmtchannel.rs
+++ b/src/mgmtchannel.rs
@@ -81,7 +81,7 @@ impl MgmtChannel {
     let (resp, mut rbulk)= self.read.read_withbulk().context("read response")?;
     match &resp {
       Fine | AccountsList{..} | GamesList{..} |
-      LibraryItems(_) | Bundles(..) => { },
+      LibraryItems(_) | Bundles{..} => { },
       AlterGame { error: None, .. } => { },
       Error { error } => {
         Err(error.clone()).context(

diff --git a/src/prelude.rs b/src/prelude.rs
index 77683e20d5b9ba66783ede5bee822e1096b5bc44..70847be91353c0269301ea0fa81673c096185c66 100644 (file)
--- a/src/prelude.rs
+++ b/src/prelude.rs
@@ -126,7 +126,7 @@ pub use crate::bundles::{self, InstanceBundles};
 pub use crate::commands::{AccessTokenInfo, AccessTokenReport, MgmtError};
 pub use crate::commands::{MgmtCommand, MgmtResponse};
 pub use crate::commands::{MgmtGameInstruction, MgmtGameResponse};
-pub use crate::commands::{MgmtGameUpdateMode};
+pub use crate::commands::{MgmtBundleList, MgmtGameUpdateMode};
 pub use crate::config::*;
 pub use crate::debugreader::DebugReader;
 pub use crate::error::*;