WIP

Yoric · May 20, 2016 · 822a52e · 822a52e
1 parent e784e1e
commit 822a52e
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 47 deletions.
diff --git a/components/taxonomy/src/adapter.rs b/components/taxonomy/src/adapter.rs
@@ -1,4 +1,4 @@
-use api::{ Error, User };
+use api::{ Error, Operation, User };
 use io::*;
 use services::*;
 use values::*;
@@ -114,9 +114,21 @@ pub trait RawAdapter: Send + Sync {
     /// reboots/reconnections.
     fn id(&self) -> Id<AdapterId>;
 
-    fn fetch_values(&self, mut target: Vec<(Id<Channel>, Type)>, _: User) -> ResultMap<Id<Channel>, Option<(Payload, Type)>, Error>;
-    fn send_values(&self, values: HashMap<Id<Channel>, (Payload, Type)>, user: User) -> ResultMap<Id<Channel>, (), Error>;
-    fn register_watch(&self, Vec<RawWatchTarget>) -> WatchResult;
+    fn fetch_values(&self, mut target: Vec<(Id<Channel>, Type)>, _: User) -> ResultMap<Id<Channel>, Option<(Payload, Type)>, Error> {
+        target.drain(..).map(|(id, _)| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
+    fn send_values(&self, mut values: HashMap<Id<Channel>, (Payload, Type)>, _: User) -> ResultMap<Id<Channel>, (), Error> {
+        values.drain().map(|(id, _)| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
+    fn register_watch(&self, mut target: Vec<RawWatchTarget>) -> WatchResult {
+        target.drain(..).map(|(id, _, _, _)| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
 
     /// Signal the adapter that it is time to stop.
     ///
@@ -154,13 +166,23 @@ pub trait Adapter: Send + Sync {
     /// expects the adapter to attempt to minimize the connections with the actual devices.
     ///
     /// The AdapterManager is in charge of keeping track of the age of values.
-    fn fetch_values(&self, mut target: Vec<Id<Channel>>, _: User) -> ResultMap<Id<Channel>, Option<Value>, Error>;
+    fn fetch_values(&self, mut target: Vec<Id<Channel>>, _: User) -> ResultMap<Id<Channel>, Option<Value>, Error>
+    {
+        target.drain(..).map(|id| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
 
     /// Request that values be sent to channels.
     ///
     /// The AdapterManager always attempts to group calls to `send_values` by `Adapter`, and then
     /// expects the adapter to attempt to minimize the connections with the actual devices.
-    fn send_values(&self, values: HashMap<Id<Channel>, Value>, user: User) -> ResultMap<Id<Channel>, (), Error>;
+    fn send_values(&self, mut op: HashMap<Id<Channel>, Value>, _: User) -> ResultMap<Id<Channel>, (), Error>
+    {
+        op.drain().map(|(id, _)| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
 
     /// Watch a bunch of getters as they change.
     ///
@@ -171,7 +193,12 @@ pub trait Adapter: Send + Sync {
     ///
     /// If a `Range` option is set, the watcher expects to receive `EnterRange`/`ExitRange` events
     /// whenever the value available on the device enters/exits the range.
-    fn register_watch(&self, Vec<WatchTarget>) -> WatchResult;
+    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult
+    {
+        watch.drain(..).map(|(id, _, _)| {
+            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
+        }).collect()
+    }
 
     /// Signal the adapter that it is time to stop.
     ///

diff --git a/src/adapters/console/mod.rs b/src/adapters/console/mod.rs
@@ -2,7 +2,7 @@
 //!
 //! Useful for logging.
 
-use foxbox_taxonomy::api::{ Error, InternalError, Operation, User };
+use foxbox_taxonomy::api::{ Error, InternalError, User };
 use foxbox_taxonomy::manager::*;
 use foxbox_taxonomy::services::*;
 use foxbox_taxonomy::values::{ Value };
@@ -74,13 +74,6 @@ impl Adapter for Console {
             })
             .collect()
     }
-
-    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult
-    {
-        watch.drain(..).map(|(id, _, _)| {
-            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
-        }).collect()
-    }
 }
 
 

diff --git a/src/adapters/ip_camera/mod.rs b/src/adapters/ip_camera/mod.rs
@@ -12,7 +12,7 @@ mod api;
 mod upnp_listener;
 
 use config_store::ConfigService;
-use foxbox_taxonomy::api::{Error, InternalError, Operation, User};
+use foxbox_taxonomy::api::{Error, InternalError, User};
 use foxbox_taxonomy::manager::*;
 use foxbox_taxonomy::selector::*;
 use foxbox_taxonomy::services::*;
@@ -285,11 +285,4 @@ impl Adapter for IPCameraAdapter {
             (id.clone(), Err(Error::InternalError(InternalError::NoSuchChannel(id))))
         }).collect()
     }
-
-    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult
-    {
-        watch.drain(..).map(|(id, _, _)| {
-            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
-        }).collect()
-    }
 }
diff --git a/src/adapters/mod.rs b/src/adapters/mod.rs
@@ -9,7 +9,6 @@ pub mod clock;
 pub mod console;
 
 /// A Text To Speak adapter
-#[cfg(target_os = "linux")]
 pub mod tts;
 
 /// An adapter providing access to IP cameras.

diff --git a/src/adapters/philips_hue/mod.rs b/src/adapters/philips_hue/mod.rs
@@ -17,7 +17,7 @@ pub mod hub_api;
 pub mod lights;
 pub mod structs;
 
-use foxbox_taxonomy::api::{ Error, InternalError, Operation, User };
+use foxbox_taxonomy::api::{ Error, InternalError, User };
 use foxbox_taxonomy::manager::*;
 use foxbox_taxonomy::services::*;
 use foxbox_taxonomy::values::{ Color, OnOff, Type, TypeError, Value };
@@ -297,10 +297,4 @@ impl<C: Controller> Adapter for PhilipsHueAdapter<C> {
             (id.clone(), Err(Error::InternalError(InternalError::NoSuchChannel(id))))
         }).collect()
     }
-
-    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult {
-        watch.drain(..).map(|(id, _, _)| {
-            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
-        }).collect()
-    }
 }
diff --git a/src/adapters/thinkerbell/mod.rs b/src/adapters/thinkerbell/mod.rs
@@ -1,6 +1,6 @@
 //! An adapter providing access to the Thinkerbell rules engine.
 
-use foxbox_taxonomy::api::{ Error, InternalError, Operation, User };
+use foxbox_taxonomy::api::{ Error, InternalError, User };
 use foxbox_taxonomy::manager::*;
 use foxbox_taxonomy::services::{ AdapterId, ServiceId, Service, Channel, ChannelKind };
 use foxbox_taxonomy::util::Id;
@@ -133,13 +133,6 @@ impl Adapter for ThinkerbellAdapter {
             })
             .collect()
     }
-
-    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult
-    {
-        watch.drain(..).map(|(id, _, _)| {
-            (id.clone(), Err(Error::OperationNotSupported(Operation::Watch, id)))
-        }).collect()
-    }
 }
 
 /// `ThinkerbellAdapter`'s main loop handles messages of these types.

diff --git a/src/adapters/tts/mod.rs b/src/adapters/tts/mod.rs
@@ -12,7 +12,7 @@ use foxbox_taxonomy::manager::AdapterManager;
 use foxbox_taxonomy::api::{ Error, InternalError, User };
 use foxbox_taxonomy::services::{ AdapterId, Channel, ChannelKind, Id, Service, ServiceId };
 use foxbox_taxonomy::values::{ Type, Value };
-use std::collections::{ HashMap, HashSet };
+use std::collections::HashMap;
 use std::sync::Arc;
 use transformable_channels::mpsc::*;
 
@@ -69,13 +69,6 @@ impl<T: TtsEngine> Adapter for TtsAdapter<T> {
             (id.clone(), Err(Error::InternalError(InternalError::NoSuchChannel(id))))
         }).collect()
     }
-
-    fn register_watch(&self, mut watch: Vec<WatchTarget>) -> WatchResult
-    {
-        watch.drain(..).map(|(id, _, _)| {
-            (id.clone(), Err(Error::GetterDoesNotSupportWatching(id)))
-        }).collect()
-    }
 }
 
 pub fn init(adapt: &Arc<AdapterManager>) -> Result<(), Error> {