Thelie/irc-stream
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Some minor fixes.

Browse source
This commit is contained in:
Daniel Mowitz 2021-05-01 15:57:40 +02:00
parent fea845a533
commit 10c85a9584
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/lib.rs
View file

@ -40,13 +40,13 @@ impl<S: Read + Write> IrcRead for IrcStream<S> {
let mut message: Option<Message> = None; let mut message: Option<Message> = None;
while message == None { while message == None {
let mut temp_buf = [0; 512]; let mut temp_buf = [0; 512];
self.stream.read(&mut temp_buf); self.stream.read(&mut temp_buf)?;
self.buffer.push_str(std::str::from_utf8(&temp_buf)?); self.buffer.push_str(std::str::from_utf8(&temp_buf)?);
match self.buffer.find("\r\n") { match self.buffer.find("\r\n") {
Some(i) => { Some(i) => {
let mut raw_message = self.buffer.clone(); let mut raw_message = self.buffer.clone();
// This returns the part after the line break to the buffer. // This returns the part after the line break to the buffer.
self.buffer = raw_message.split_off(i); self.buffer = raw_message.split_off(i+2);
message = Some(Message::from(raw_message.as_str())); message = Some(Message::from(raw_message.as_str()));
}, },
None => (), None => (),
@ -71,7 +71,7 @@ impl<S: Read + Write> IrcWrite for IrcStream<S> {
} }
impl<S: Read + Write> IrcStream<S> { impl<S: Read + Write> IrcStream<S> {
fn new(stream: S) -> Self { pub fn new(stream: S) -> Self {
Self{ Self{
stream, stream,
buffer: String::new() buffer: String::new()