Docopt -> clap, main.rs -> src/app

Modularise the old main function,
switch to clap for easier addition of CLI arguments

1 files changed, 7 insertions, 4 deletions

diff --git a/src/format/mod.rs b/src/format/mod.rs
index ff3a328..f7de677 100644
--- a/src/format/mod.rs
+++ b/src/format/mod.rs
@@ -25,6 +25,7 @@ use context::Context;
 
 pub mod energymech;
 pub mod weechat3;
+// pub mod irssi;
 pub mod binary;
 pub mod msgpack;
 
@@ -46,8 +47,9 @@ impl Decode for Dummy {
 
 pub fn decoder(format: &str) -> Option<Box<Decode>> {
     match format {
-        "energymech" => Some(Box::new(energymech::Energymech)),
-        "weechat3" => Some(Box::new(weechat3::Weechat3)),
+        "energymech" | "em" => Some(Box::new(energymech::Energymech)),
+        "weechat3" | "weechat" | "w3" => Some(Box::new(weechat3::Weechat3)),
+//         "irssi" => Some(Box::new(irssi::Irssi)),
         "binary" => Some(Box::new(binary::Binary)),
         "msgpack" => Some(Box::new(msgpack::Msgpack)),
         _ => None
@@ -56,8 +58,9 @@ pub fn decoder(format: &str) -> Option<Box<Decode>> {
 
 pub fn encoder(format: &str) -> Option<Box<Encode>> {
     match format {
-        "energymech" => Some(Box::new(energymech::Energymech)),
-        "weechat3" => Some(Box::new(weechat3::Weechat3)),
+        "energymech" | "em" => Some(Box::new(energymech::Energymech)),
+        "weechat3" | "weechat" | "w3" => Some(Box::new(weechat3::Weechat3)),
+//         "irssi" => Some(Box::new(irssi::Irssi)),
         "binary" => Some(Box::new(binary::Binary)),
         "msgpack" => Some(Box::new(msgpack::Msgpack)),
         _ => None