Clean up, collect with timeout

items_0/src/collect_c.rs

@@ -3,7 +3,10 @@ use crate::collect_s::ToJsonResult;
 use crate::AsAnyMut;
 use crate::AsAnyRef;
 use crate::Events;
+use crate::WithLen;
 use err::Error;
+use netpod::BinnedRange;
+use netpod::NanoRange;
 use std::fmt;
 
 pub trait Collector: fmt::Debug + Send {
@@ -11,14 +14,13 @@ pub trait Collector: fmt::Debug + Send {
     fn ingest(&mut self, item: &mut dyn Collectable);
     fn set_range_complete(&mut self);
     fn set_timed_out(&mut self);
-    fn result(&mut self) -> Result<Box<dyn Collected>, Error>;
+    fn result(&mut self, range: Option<NanoRange>, binrange: Option<BinnedRange>) -> Result<Box<dyn Collected>, Error>;
 }
 
-pub trait Collectable: fmt::Debug + AsAnyMut {
+pub trait Collectable: fmt::Debug + AsAnyMut + crate::WithLen {
     fn new_collector(&self) -> Box<dyn Collector>;
 }
 
-// TODO can this get removed?
 pub trait Collected: fmt::Debug + ToJsonResult + AsAnyRef + Send {}
 
 erased_serde::serialize_trait_object!(Collected);
@@ -44,13 +46,19 @@ pub trait CollectorDyn: fmt::Debug + Send {
 
     fn set_timed_out(&mut self);
 
-    fn result(&mut self) -> Result<Box<dyn Collected>, Error>;
+    fn result(&mut self, range: Option<NanoRange>, binrange: Option<BinnedRange>) -> Result<Box<dyn Collected>, Error>;
 }
 
 pub trait CollectableWithDefault: AsAnyMut {
     fn new_collector(&self) -> Box<dyn CollectorDyn>;
 }
 
+impl crate::WithLen for Box<dyn Events> {
+    fn len(&self) -> usize {
+        self.as_ref().len()
+    }
+}
+
 impl Collectable for Box<dyn Events> {
     fn new_collector(&self) -> Box<dyn Collector> {
         todo!()
@@ -77,11 +85,21 @@ impl Collector for TimeBinnedCollector {
         todo!()
     }
 
-    fn result(&mut self) -> Result<Box<dyn Collected>, Error> {
+    fn result(
+        &mut self,
+        _range: Option<NanoRange>,
+        _binrange: Option<BinnedRange>,
+    ) -> Result<Box<dyn Collected>, Error> {
         todo!()
     }
 }
 
+impl WithLen for Box<dyn crate::TimeBinned> {
+    fn len(&self) -> usize {
+        self.as_ref().len()
+    }
+}
+
 impl Collectable for Box<dyn crate::TimeBinned> {
     fn new_collector(&self) -> Box<dyn Collector> {
         self.as_ref().new_collector()

items_0/src/collect_s.rs

@@ -1,6 +1,10 @@
 use super::collect_c::Collected;
-use crate::{AsAnyMut, AsAnyRef, WithLen};
+use crate::AsAnyMut;
+use crate::AsAnyRef;
+use crate::WithLen;
 use err::Error;
+use netpod::BinnedRange;
+use netpod::NanoRange;
 use serde::Serialize;
 use std::any::Any;
 use std::fmt;
@@ -15,14 +19,18 @@ pub trait CollectorType: Send + Unpin + WithLen {
     fn set_timed_out(&mut self);
 
     // TODO use this crate's Error instead:
-    fn result(&mut self) -> Result<Self::Output, Error>;
+    fn result(&mut self, range: Option<NanoRange>, binrange: Option<BinnedRange>) -> Result<Self::Output, Error>;
 }
 
 pub trait Collector: Send + Unpin + WithLen {
     fn ingest(&mut self, src: &mut dyn Collectable);
     fn set_range_complete(&mut self);
     fn set_timed_out(&mut self);
-    fn result(&mut self) -> Result<Box<dyn ToJsonResult>, Error>;
+    fn result(
+        &mut self,
+        range: Option<NanoRange>,
+        binrange: Option<BinnedRange>,
+    ) -> Result<Box<dyn ToJsonResult>, Error>;
 }
 
 // TODO rename to `Typed`
@@ -49,8 +57,12 @@ impl<T: CollectorType + 'static> Collector for T {
         T::set_timed_out(self)
     }
 
-    fn result(&mut self) -> Result<Box<dyn ToJsonResult>, Error> {
-        let ret = T::result(self)?;
+    fn result(
+        &mut self,
+        range: Option<NanoRange>,
+        binrange: Option<BinnedRange>,
+    ) -> Result<Box<dyn ToJsonResult>, Error> {
+        let ret = T::result(self, range, binrange)?;
         Ok(Box::new(ret) as _)
     }
 }

items_0/src/items_0.rs

@@ -127,7 +127,7 @@ pub trait TimeBinnable: fmt::Debug + WithLen + RangeOverlapInfo + Any + AsAnyRef
 
 /// Container of some form of events, for use as trait object.
 pub trait Events:
-    fmt::Debug + Any + Collectable + CollectableWithDefault + TimeBinnable + Send + erased_serde::Serialize
+    fmt::Debug + Any + Collectable + CollectableWithDefault + TimeBinnable + WithLen + Send + erased_serde::Serialize
 {
     fn as_time_binnable(&self) -> &dyn TimeBinnable;
     fn verify(&self) -> bool;