matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix multi-line reading

Browse source 
Reading entries with multiple entries caused all lines to be read as one
line.

This bug is fixed with this patch.
This commit is contained in:
Matthias Beyer 2018-03-02 21:48:17 +01:00
parent 87d6f1221f
commit ee5a17790f
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/core/libimagstore/src/util.rs
View file

@ -46,7 +46,9 @@ pub fn entry_buffer_to_header_content(buf: &str) -> Result<(Value, String)> {
let mut content = String::new();
let mut header_consumed = false;
for line in buf.lines().skip(1) { // the first line is "---"
let mut iter = buf.lines().skip(1).peekable(); // the first line is "---"
while let Some(line) = iter.next() {
if line == "---" {
header_consumed = true;
// do not further process the line
@ -54,7 +56,11 @@ pub fn entry_buffer_to_header_content(buf: &str) -> Result<(Value, String)> {
if !header_consumed {
let _ = writeln!(header, "{}", line)?;
} else {
let _ = write!(content, "{}", line)?;
if iter.peek().is_some() {
let _ = writeln!(content, "{}", line)?;
} else {
let _ = write!(content, "{}", line)?;
}
}
}
}