aboutsummaryrefslogtreecommitdiff
path: root/src/format/weechat3.rs
diff options
context:
space:
mode:
Diffstat (limited to 'src/format/weechat3.rs')
-rw-r--r--src/format/weechat3.rs147
1 files changed, 89 insertions, 58 deletions
diff --git a/src/format/weechat3.rs b/src/format/weechat3.rs
index bc6e968..947bd61 100644
--- a/src/format/weechat3.rs
+++ b/src/format/weechat3.rs
@@ -13,11 +13,13 @@
// limitations under the License.
use std::io::{ BufRead, Write };
-use std::borrow::ToOwned;
+use std::borrow::{ ToOwned, Cow, IntoCow };
use std::iter::{ Iterator };
+use std::marker::PhantomData;
-use log::Event;
-use format::{ Encode, Decode };
+use event::{ Event, Type, Time };
+use context::Context;
+use format::{ Encode, Decode, rejoin, strip_one };
use l::LogLevel::Info;
@@ -27,25 +29,18 @@ pub struct Weechat3;
static TIME_DATE_FORMAT: &'static str = "%Y-%m-%d %H:%M:%S";
-pub struct Iter<R> where R: BufRead {
+pub struct Iter<'a, R: 'a> where R: BufRead {
+ _phantom: PhantomData<&'a ()>,
+ context: &'a Context,
input: R,
buffer: String
}
-impl<R> Iterator for Iter<R> where R: BufRead {
- type Item = ::Result<Event>;
- fn next(&mut self) -> Option<::Result<Event>> {
- fn timestamp(date: &str, time: &str) -> i64 {
- UTC.datetime_from_str(&format!("{} {}", date, time), TIME_DATE_FORMAT).unwrap().timestamp()
- }
- fn join(s: &[&str], splits: &[char]) -> String {
- let len = s.iter().map(|s| s.len()).sum();
- let mut out = s.iter().zip(splits.iter()).fold(String::with_capacity(len),
- |mut s, (b, &split)| { s.push_str(b); s.push(split); s });
- out.pop(); out
- }
- fn mask(s: &str) -> String {
- if s.len() >= 2 { s[1..(s.len() - 1)].to_owned() } else { String::new() }
+impl<'a: 'b, 'b, R: 'a> Iterator for Iter<'a, R> where R: BufRead {
+ type Item = ::Result<Event<'static>>;
+ fn next(&mut self) -> Option<::Result<Event<'static>>> {
+ fn parse_time<'b, 'c>(c: &Context, date: &'b str, time: &'c str) -> Time {
+ Time::from_format(&c.timezone, &format!("{} {}", date, time), TIME_DATE_FORMAT)
}
loop {
@@ -56,80 +51,116 @@ impl<R> Iterator for Iter<R> where R: BufRead {
}
let mut split_tokens: Vec<char> = Vec::new();
- let tokens = self.buffer.split( |c: char| {
+ let tokens: Vec<&'b str> = self.buffer.split(|c: char| {
if c.is_whitespace() { split_tokens.push(c); true } else { false }
}).collect::<Vec<_>>();
- if log_enabled!(Info) {
+
+ /*if log_enabled!(Info) {
info!("Original: `{}`", self.buffer);
info!("Parsing: {:?}", tokens);
- }
- match tokens[..tokens.len() - 1].as_ref() {
- [date, time, "-->", nick, host, "has", "joined", channel, _..] => return Some(Ok(Event::Join {
- nick: nick.to_owned(), channel: channel.to_owned(), mask: mask(host),
- time: timestamp(date, time)
+ }*/
+
+ match &tokens[..tokens.len() - 1] as &'b [&'b str] {
+ /*[date, time, "-->", nick, host, "has", "joined", channel, _..]
+ => return Some(Ok(Event {
+ ty: Type::Join {
+ nick: nick.to_owned(),
+ mask: Some(strip_one(host)),
+ time: timestamp(date, time)
+ },
+ channel: Some(channel.into_cow()),
})),
- [date, time, "<--", nick, host, "has", "left", channel, reason..] => return Some(Ok(Event::Part {
- nick: nick.to_owned(), channel: channel.to_owned(), mask: mask(host),
- reason: mask(&join(reason, &split_tokens[8..])), time: timestamp(date, time)
+ [date, time, "<--", nick, host, "has", "left", channel, reason..]
+ => return Some(Ok(Event {
+ ty: Type::Part {
+ nick: nick.to_owned(),
+ mask: Some(strip_one(host)),
+ reason: Some(strip_one(&rejoin(reason, &split_tokens[8..]))),
+ },
+ channel: Some(channel.to_owned()),
+ time: timestamp(date, time)
})),
- [date, time, "<--", nick, host, "has", "quit", reason..] => return Some(Ok(Event::Quit {
- nick: nick.to_owned(), mask: mask(host),
- reason: mask(&join(reason, &split_tokens[7..])), time: timestamp(date, time)
+ [date, time, "<--", nick, host, "has", "quit", reason..]
+ => return Some(Ok(Event {
+ ty: Type::Quit {
+ nick: nick.to_owned(),
+ mask: Some(strip_one(host)),
+ reason: Some(strip_one(&rejoin(reason, &split_tokens[7..]))),
+ }
})),
[date, time, "--", notice, content..]
if notice.starts_with("Notice(")
- => return Some(Ok(Event::Notice {
- nick: notice["Notice(".len()..notice.len() - 2].to_owned(),
- content: join(content, &split_tokens[4..]),
- time: timestamp(date, time)
+ => return Some(Ok(Event {
+ ty: Type::Notice {
+ nick: notice["Notice(".len()..notice.len() - 2].to_owned(),
+ content: rejoin(content, &split_tokens[4..]),
+ time: timestamp(date, time)
+ }
})),
- [date, time, "--", "irc:", "disconnected", "from", "server", _..] => return Some(Ok(Event::Disconnect {
- time: timestamp(date, time)
+ [date, time, "--", "irc:", "disconnected", "from", "server", _..]
+ => return Some(Ok(Event {
+ ty: Type::Disconnect {
+ time: timestamp(date, time)
+ }
})),
[date, time, "--", nick, verb, "now", "known", "as", new_nick]
if verb == "is" || verb == "are"
- => return Some(Ok(Event::Nick {
+ => return Some(Ok(Event {
+ ty: Type::Nick {
old: nick.to_owned(), new: new_nick.to_owned(), time: timestamp(date, time)
- })),
+ }
+ })),*/
[date, time, sp, "*", nick, msg..]
- if sp.is_empty()
- => return Some(Ok(Event::Action {
- from: nick.to_owned(), content: join(msg, &split_tokens[5..]),
- time: timestamp(date, time)
- })),
- [date, time, nick, msg..] => return Some(Ok(Event::Msg {
- from: nick.to_owned(),
- content: join(msg, &split_tokens[3..]),
- time: timestamp(date, time)
+ if sp.clone().is_empty()
+ => return Some(Ok(Event {
+ ty: Type::Action {
+ from: nick.clone().into_cow(),
+ content: rejoin(msg, &split_tokens[5..]),
+ },
+ time: parse_time(&self.context, &date.clone().to_owned(), &time.clone().to_owned()),
+ channel: None
})),
+ /*[date, time, nick, msg..]
+ => return Some(Ok(Event {
+ ty: Type::Msg {
+ from: nick.into(),
+ content: rejoin(msg, &split_tokens[3..]),
+ },
+ time: parse_time(&self.context, &date, &time),
+ channel: None
+ })),*/
_ => ()
}
}
}
}
-impl<R> Decode<R, Iter<R>> for Weechat3 where R: BufRead {
- fn decode(&mut self, input: R) -> Iter<R> {
+impl<'a, R: 'a> Decode<'static, R, Iter<'a, R>> for Weechat3 where R: BufRead {
+ fn decode(&'a mut self, context: &'a Context, input: R) -> Iter<R> {
Iter {
+ _phantom: PhantomData,
+ context: context,
input: input,
buffer: String::new()
}
}
}
-impl<W> Encode<W> for Weechat3 where W: Write {
- fn encode(&self, mut output: W, event: &Event) -> ::Result<()> {
+impl<'a, W> Encode<'a, W> for Weechat3 where W: Write {
+ fn encode(&'a self, context: &'a Context, mut output: W, event: &'a Event) -> ::Result<()> {
fn date(t: i64) -> String {
format!("{}", UTC.timestamp(t, 0).format(TIME_DATE_FORMAT))
}
match event {
- &Event::Msg { ref from, ref content, ref time } => {
- try!(writeln!(&mut output, "{}\t{}\t{}", date(*time), from, content))
+ &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))
},
- &Event::Action { ref from, ref content, ref time } => {
- try!(writeln!(&mut output, "{}\t *\t{} {}", date(*time), 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))
},
- &Event::Join { ref nick, ref mask, ref channel, ref time } => {
+ /*&Event::Join { ref nick, ref mask, ref channel, ref time } => {
try!(writeln!(&mut output, "{}\t-->\t{} ({}) has joined {}",
date(*time), nick, mask, channel))
},
@@ -153,7 +184,7 @@ impl<W> Encode<W> for Weechat3 where W: Write {
},
&Event::Notice { ref nick, ref content, ref time } => {
try!(writeln!(&mut output, "{}\t--\tNotice({}): {}", date(*time), nick, content))
- },
+ },*/
_ => ()
}
Ok(())
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 10:39:14 +0000