xmppftw/xmpp-rs
Watch
1
0
Fork
You've already forked xmpp-rs
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

abstract plugin logic into PluginContainer

Browse source
This commit is contained in:
lumi 2017-05-27 20:33:56 +02:00
commit 6efc77b423
3 changed files with 90 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/component.rs
View file

@ -3,7 +3,7 @@ use jid::Jid;
use transport::{Transport, PlainTransport};
use error::Error;
use ns;
use plugin::{Plugin, PluginInit, PluginProxyBinding};
use plugin::{Plugin, PluginInit, PluginProxyBinding, PluginContainer, PluginRef};
use event::{Dispatcher, ReceiveElement, SendElement, Propagation, Priority, Event};
use connection::{Connection, Component2S};
use sha_1::{Sha1, Digest};
@ -15,10 +15,6 @@ use xml::reader::XmlEvent as ReaderEvent;
use std::fmt::Write;
use std::sync::{Mutex, Arc};
use std::collections::HashMap;
use std::any::TypeId;
/// A builder for `Component`s.
pub struct ComponentBuilder {
jid: Jid,
@ -63,11 +59,12 @@ impl ComponentBuilder {
Component2S::init(&mut transport, &self.jid.domain, "stream_opening")?;
let dispatcher = Arc::new(Dispatcher::new());
let transport = Arc::new(Mutex::new(transport));
let plugin_container = Arc::new(PluginContainer::new());
let mut component = Component {
jid: self.jid,
transport: transport.clone(),
plugins: HashMap::new(),
binding: PluginProxyBinding::new(dispatcher.clone()),
binding: PluginProxyBinding::new(dispatcher.clone(), plugin_container.clone()),
plugin_container: plugin_container,
dispatcher: dispatcher,
};
component.dispatcher.register(Priority::Default, move |evt: &SendElement| {
@ -84,7 +81,7 @@ impl ComponentBuilder {
pub struct Component {
jid: Jid,
transport: Arc<Mutex<PlainTransport>>,
plugins: HashMap<TypeId, Arc<Plugin>>,
plugin_container: Arc<PluginContainer>,
binding: PluginProxyBinding,
dispatcher: Arc<Dispatcher>,
}
@ -99,20 +96,9 @@ impl Component {
pub fn register_plugin<P: Plugin + PluginInit + 'static>(&mut self, mut plugin: P) {
let binding = self.binding.clone();
plugin.bind(binding);
let p = Arc::new(plugin) as Arc<Plugin>;
let p = Arc::new(plugin);
P::init(&self.dispatcher, p.clone());
if self.plugins.insert(TypeId::of::<P>(), p).is_some() {
panic!("registering a plugin that's already registered");
}
}
/// Returns the plugin given by the type parameter, if it exists, else panics.
pub fn plugin<P: Plugin>(&self) -> &P {
self.plugins.get(&TypeId::of::<P>())
.expect("the requested plugin was not registered")
.as_any()
.downcast_ref::<P>()
.expect("plugin downcast failure (should not happen!!)")
self.plugin_container.register(p);
}
pub fn register_handler<E, F>(&mut self, pri: Priority, func: F)
@ -122,6 +108,11 @@ impl Component {
self.dispatcher.register(pri, func);
}
/// Returns the plugin given by the type parameter, if it exists, else panics.
pub fn plugin<P: Plugin>(&self) -> PluginRef<P> {
self.plugin_container.get::<P>().unwrap()
}
/// Returns the next event and flush the send queue.
pub fn main(&mut self) -> Result<(), Error> {
self.dispatcher.flush_all();