aboutsummaryrefslogtreecommitdiff
path: root/formats
diff options
context:
space:
mode:
authorTill Höppner2016-03-09 16:59:15 +0100
committerTill Höppner2016-03-09 17:01:04 +0100
commiteca90a051b4daebe12a8421c6c4f57d5b5b9fbbd (patch)
tree4af753d758b1349b105d4b79dc2ac740cff28581 /formats
parente15f184edc228b991ee87ca39a6a177e6938d9c6 (diff)
downloadilc-eca90a051b4daebe12a8421c6c4f57d5b5b9fbbd.tar.gz
ilc-eca90a051b4daebe12a8421c6c4f57d5b5b9fbbd.tar.xz
ilc-eca90a051b4daebe12a8421c6c4f57d5b5b9fbbd.zip
Allow ARM failure
Diffstat (limited to 'formats')
-rw-r--r--formats/binary/src/lib.rs14
-rw-r--r--formats/energymech/src/lib.rs14
-rw-r--r--formats/irssi/src/lib.rs281
-rw-r--r--formats/msgpack/src/lib.rs14
-rw-r--r--formats/weechat/src/lib.rs14
5 files changed, 150 insertions, 187 deletions
diff --git a/formats/binary/src/lib.rs b/formats/binary/src/lib.rs
index 7cc4281..e95804d 100644
--- a/formats/binary/src/lib.rs
+++ b/formats/binary/src/lib.rs
@@ -1,17 +1,3 @@
-// Copyright 2015 Till Höppner
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
use std::io::{BufRead, Write};
use std::iter::Iterator;
diff --git a/formats/energymech/src/lib.rs b/formats/energymech/src/lib.rs
index ed687f0..cf9f654 100644
--- a/formats/energymech/src/lib.rs
+++ b/formats/energymech/src/lib.rs
@@ -1,17 +1,3 @@
-// Copyright 2015 Till Höppner
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
#[macro_use]
extern crate log;
extern crate ilc_base;
diff --git a/formats/irssi/src/lib.rs b/formats/irssi/src/lib.rs
index 6afcd61..15100f9 100644
--- a/formats/irssi/src/lib.rs
+++ b/formats/irssi/src/lib.rs
@@ -1,24 +1,10 @@
-// Copyright 2015 Till Höppner
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
+use std::io::{BufRead, Write};
+use std::borrow::ToOwned;
+use std::iter::Iterator;
-use std::io::{ BufRead, Write };
-use std::borrow::{ ToOwned };
-use std::iter::{ Iterator };
-
-use event::{ Event, Type, Time };
+use event::{Event, Time, Type};
use context::Context;
-use format::{ Encode, Decode, rejoin, strip_one };
+use format::{Decode, Encode, rejoin, strip_one};
use l::LogLevel::Info;
@@ -30,7 +16,7 @@ static LINE_FORMAT: &'static str = "%H:%M";
pub struct Iter<'a> {
context: &'a Context,
input: &'a mut BufRead,
- buffer: Vec<u8>
+ buffer: Vec<u8>,
}
impl<'a> Iterator for Iter<'a> {
@@ -44,15 +30,21 @@ impl<'a> Iterator for Iter<'a> {
self.buffer.clear();
match self.input.read_until(b'\n', &mut self.buffer) {
Ok(0) | Err(_) => return None,
- Ok(_) => ()
+ Ok(_) => (),
}
let buffer = String::from_utf8_lossy(&self.buffer);
let mut split_tokens: Vec<char> = Vec::new();
let tokens = buffer.split(|c: char| {
- if c.is_whitespace() { split_tokens.push(c); true } else { false }
- }).collect::<Vec<_>>();
+ if c.is_whitespace() {
+ split_tokens.push(c);
+ true
+ } else {
+ false
+ }
+ })
+ .collect::<Vec<_>>();
if log_enabled!(Info) {
info!("Original: `{}`", buffer);
@@ -60,145 +52,172 @@ impl<'a> Iterator for Iter<'a> {
}
match &tokens[..tokens.len() - 1] {
- ["---", "Log", "opened", day_of_week, month, day, time, year] => {
- year
- },
- ["---", "Log", "closed", day_of_week, month, day, time, year]
- => return Some(Ok(Event {
- ty: Type::Disconnect,
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
- [time, "-!-", nick, host, "has", "joined", channel]
- => return Some(Ok(Event {
- ty: Type::Join {
- nick: nick.to_owned().into(),
- mask: Some(strip_one(host).into()),
- },
- channel: Some(channel.to_owned().into()),
- time: parse_time(&self.context, date, time)
- })),
- [time, "-!-", nick, host, "has", "left", channel, reason..]
- => return Some(Ok(Event {
- ty: Type::Part {
- nick: nick.to_owned().into(),
- mask: Some(strip_one(host).into()),
- reason: Some(strip_one(&rejoin(reason, &split_tokens[8..])).into()),
- },
- channel: Some(channel.to_owned().into()),
- time: parse_time(&self.context, date, time)
- })),
- [time, "-!-", nick, host, "has", "quit", reason..]
- => return Some(Ok(Event {
- ty: Type::Quit {
- nick: nick.to_owned().into(),
- mask: Some(strip_one(host).into()),
- reason: Some(strip_one(&rejoin(reason, &split_tokens[7..])).into()),
- },
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
+ ["---", "Log", "opened", day_of_week, month, day, time, year] => year,
+ ["---", "Log", "closed", day_of_week, month, day, time, year] => {
+ return Some(Ok(Event {
+ ty: Type::Disconnect,
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
+ [time, "-!-", nick, host, "has", "joined", channel] => {
+ return Some(Ok(Event {
+ ty: Type::Join {
+ nick: nick.to_owned().into(),
+ mask: Some(strip_one(host).into()),
+ },
+ channel: Some(channel.to_owned().into()),
+ time: parse_time(&self.context, date, time),
+ }))
+ }
+ [time, "-!-", nick, host, "has", "left", channel, reason..] => {
+ return Some(Ok(Event {
+ ty: Type::Part {
+ nick: nick.to_owned().into(),
+ mask: Some(strip_one(host).into()),
+ reason: Some(strip_one(&rejoin(reason, &split_tokens[8..])).into()),
+ },
+ channel: Some(channel.to_owned().into()),
+ time: parse_time(&self.context, date, time),
+ }))
+ }
+ [time, "-!-", nick, host, "has", "quit", reason..] => {
+ return Some(Ok(Event {
+ ty: Type::Quit {
+ nick: nick.to_owned().into(),
+ mask: Some(strip_one(host).into()),
+ reason: Some(strip_one(&rejoin(reason, &split_tokens[7..])).into()),
+ },
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
// TODO: reorder
- [date, time, "--", notice, content..]
- if notice.starts_with("Notice(")
- => return Some(Ok(Event {
- ty: Type::Notice {
- from: notice["Notice(".len()..notice.len() - 2].to_owned().into(),
- content: rejoin(content, &split_tokens[4..]),
- },
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
- [date, time, "--", nick, verb, "now", "known", "as", new_nick]
- if verb == "is" || verb == "are"
- => return Some(Ok(Event {
- ty: Type::Nick {
- old_nick: nick.to_owned().into(),
- new_nick: new_nick.to_owned().into()
- },
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
- [date, time, sp, "*", nick, msg..]
- if sp.clone().is_empty()
- => return Some(Ok(Event {
- ty: Type::Action {
- from: nick.to_owned().into(),
- content: rejoin(msg, &split_tokens[5..]),
- },
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
- [date, time, nick, msg..]
- => return Some(Ok(Event {
- ty: Type::Msg {
- from: nick.to_owned().into(),
- content: rejoin(msg, &split_tokens[3..]),
- },
- time: parse_time(&self.context, date, time),
- channel: self.context.channel.clone().map(Into::into)
- })),
- _ => ()
+ [date, time, "--", notice, content..] if notice.starts_with("Notice(") => {
+ return Some(Ok(Event {
+ ty: Type::Notice {
+ from: notice["Notice(".len()..notice.len() - 2].to_owned().into(),
+ content: rejoin(content, &split_tokens[4..]),
+ },
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
+ [date, time, "--", nick, verb, "now", "known", "as", new_nick] if verb == "is" ||
+ verb == "are" => {
+ return Some(Ok(Event {
+ ty: Type::Nick {
+ old_nick: nick.to_owned().into(),
+ new_nick: new_nick.to_owned().into(),
+ },
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
+ [date, time, sp, "*", nick, msg..] if sp.clone().is_empty() => {
+ return Some(Ok(Event {
+ ty: Type::Action {
+ from: nick.to_owned().into(),
+ content: rejoin(msg, &split_tokens[5..]),
+ },
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
+ [date, time, nick, msg..] => {
+ return Some(Ok(Event {
+ ty: Type::Msg {
+ from: nick.to_owned().into(),
+ content: rejoin(msg, &split_tokens[3..]),
+ },
+ time: parse_time(&self.context, date, time),
+ channel: self.context.channel.clone().map(Into::into),
+ }))
+ }
+ _ => (),
}
}
}
}
impl Decode for Irssi {
- fn decode<'a>(&'a mut self, context: &'a Context, input: &'a mut BufRead) -> Box<Iterator<Item = ::Result<Event<'a>>> + 'a> {
+ fn decode<'a>(&'a mut self,
+ context: &'a Context,
+ input: &'a mut BufRead)
+ -> Box<Iterator<Item = ::Result<Event<'a>>> + 'a> {
Box::new(Iter {
context: context,
input: input,
- buffer: Vec::new()
+ buffer: Vec::new(),
})
}
}
impl Encode for Irssi {
- fn encode<'a>(&'a self, context: &'a Context, mut output: &'a mut Write, event: &'a Event) -> ::Result<()> {
+ fn encode<'a>(&'a self,
+ context: &'a Context,
+ mut output: &'a mut Write,
+ event: &'a Event)
+ -> ::Result<()> {
match event {
&Event { ty: Type::Msg { ref from, ref content, .. }, ref time, .. } => {
- try!(writeln!(&mut output, "{}\t{}\t{}",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), from, content))
- },
+ try!(writeln!(&mut output,
+ "{}\t{}\t{}",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ from,
+ content))
+ }
&Event { ty: Type::Action { ref from, ref content, .. }, ref time, .. } => {
- try!(writeln!(&mut output, "{}\t *\t{} {}",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), from, content))
- },
+ try!(writeln!(&mut output,
+ "{}\t *\t{} {}",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ from,
+ content))
+ }
&Event { ty: Type::Join { ref nick, ref mask, .. }, ref channel, ref time } => {
- try!(writeln!(&mut output, "{}\t-->\t{} ({}) has joined {}",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), nick,
- mask.as_ref().expect("Hostmask not present, but required."),
- channel.as_ref().expect("Channel not present, but required.")))
- },
+ try!(writeln!(&mut output,
+ "{}\t-->\t{} ({}) has joined {}",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ nick,
+ mask.as_ref().expect("Hostmask not present, but required."),
+ channel.as_ref().expect("Channel not present, but required.")))
+ }
&Event { ty: Type::Part { ref nick, ref mask, ref reason }, ref channel, ref time } => {
- try!(write!(&mut output, "{}\t<--\t{} ({}) has left {}",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), nick,
- mask.as_ref().expect("Hostmask not present, but required."),
- channel.as_ref().expect("Channel not present, but required.")));
+ try!(write!(&mut output,
+ "{}\t<--\t{} ({}) has left {}",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ nick,
+ mask.as_ref().expect("Hostmask not present, but required."),
+ channel.as_ref().expect("Channel not present, but required.")));
if reason.is_some() && reason.as_ref().unwrap().len() > 0 {
try!(write!(&mut output, " ({})", reason.as_ref().unwrap()));
}
try!(write!(&mut output, "\n"))
- },
+ }
&Event { ty: Type::Quit { ref nick, ref mask, ref reason }, ref time, .. } => {
- try!(write!(&mut output, "{}\t<--\t{} ({}) has quit",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), nick,
- mask.as_ref().expect("Hostmask not present, but required.")));
+ try!(write!(&mut output,
+ "{}\t<--\t{} ({}) has quit",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ nick,
+ mask.as_ref().expect("Hostmask not present, but required.")));
if reason.is_some() && reason.as_ref().unwrap().len() > 0 {
try!(write!(&mut output, " ({})", reason.as_ref().unwrap()));
}
try!(write!(&mut output, "\n"))
- },
+ }
&Event { ty: Type::Disconnect, ref time, .. } => {
- try!(writeln!(&mut output, "{}\t--\tirc: disconnected from server",
- time.with_format(&context.timezone, TIME_DATE_FORMAT)))
- },
+ try!(writeln!(&mut output,
+ "{}\t--\tirc: disconnected from server",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT)))
+ }
&Event { ty: Type::Notice { ref from, ref content }, ref time, .. } => {
- try!(writeln!(&mut output, "{}\t--\tNotice({}): {}",
- time.with_format(&context.timezone, TIME_DATE_FORMAT), from, content))
- },
- _ => ()
+ try!(writeln!(&mut output,
+ "{}\t--\tNotice({}): {}",
+ time.with_format(&context.timezone, TIME_DATE_FORMAT),
+ from,
+ content))
+ }
+ _ => (),
}
Ok(())
}
diff --git a/formats/msgpack/src/lib.rs b/formats/msgpack/src/lib.rs
index 36af1aa..6d041b8 100644
--- a/formats/msgpack/src/lib.rs
+++ b/formats/msgpack/src/lib.rs
@@ -1,17 +1,3 @@
-// Copyright 2015 Till Höppner
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
use std::io::{BufRead, Write};
use std::iter::Iterator;
diff --git a/formats/weechat/src/lib.rs b/formats/weechat/src/lib.rs
index 4e1bd42..7d9eb3d 100644
--- a/formats/weechat/src/lib.rs
+++ b/formats/weechat/src/lib.rs
@@ -1,17 +1,3 @@
-// Copyright 2015 Till Höppner
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
#[macro_use]
extern crate log;
extern crate ilc_base;