Matthias Beyer
da408b9e67
Unfortunately, our latest fix to file parsing did not solve all issues.
So we have to fix it _again_.
The problem was the `std::str::Lines` iterator, which apparently fails
this:
assert_eq!(1, "".lines().count());
as an empty line seems not to be a line.
Because of that, when reading a file with an empty line at its bottom
got stripped off that line.
This patch removes the use of the `lines()` iterator and uses
`split("\n")` instead. This only works on Unix operating systems, but as
we only target unix operating systems with imag, this is not considered
an issue right now.
This patch also adds extensive tests on multiple levels in the
`libimagstore` implementation:
* On the parsing level, for the function which implements the parsing
* On the filesystem abstraction levels
* On the `Store` levels
to make sure that everything is parsed correctly.
168 lines
4.3 KiB
Rust
168 lines
4.3 KiB
Rust
//
|
|
// imag - the personal information management suite for the commandline
|
|
// Copyright (C) 2015-2018 Matthias Beyer <mail@beyermatthias.de> and contributors
|
|
//
|
|
// This library is free software; you can redistribute it and/or
|
|
// modify it under the terms of the GNU Lesser General Public
|
|
// License as published by the Free Software Foundation; version
|
|
// 2.1 of the License.
|
|
//
|
|
// This library is distributed in the hope that it will be useful,
|
|
// but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
// Lesser General Public License for more details.
|
|
//
|
|
// You should have received a copy of the GNU Lesser General Public
|
|
// License along with this library; if not, write to the Free Software
|
|
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
|
|
//
|
|
|
|
use std::fmt::Write;
|
|
|
|
use toml::Value;
|
|
|
|
use store::Result;
|
|
use store::Header;
|
|
|
|
#[cfg(feature = "early-panic")]
|
|
#[macro_export]
|
|
macro_rules! if_cfg_panic {
|
|
() => { panic!() };
|
|
($msg:expr) => { panic!($msg) };
|
|
($fmt:expr, $($arg:tt)+) => { panic!($fmt, $($arg),+) };
|
|
}
|
|
|
|
#[cfg(not(feature = "early-panic"))]
|
|
#[macro_export]
|
|
macro_rules! if_cfg_panic {
|
|
() => { };
|
|
($msg:expr) => { };
|
|
($fmt:expr, $($arg:tt)+) => { };
|
|
}
|
|
|
|
pub fn entry_buffer_to_header_content(buf: &str) -> Result<(Value, String)> {
|
|
debug!("Building entry from string");
|
|
let mut header = String::new();
|
|
let mut content = String::new();
|
|
let mut header_consumed = false;
|
|
|
|
let mut iter = buf.split("\n").skip(1).peekable(); // the first line is "---"
|
|
|
|
while let Some(line) = iter.next() {
|
|
if line == "---" && !header_consumed {
|
|
header_consumed = true;
|
|
// do not further process the line
|
|
} else {
|
|
if !header_consumed {
|
|
let _ = writeln!(header, "{}", line)?;
|
|
} else {
|
|
if iter.peek().is_some() {
|
|
let _ = writeln!(content, "{}", line)?;
|
|
} else {
|
|
let _ = write!(content, "{}", line)?;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
Ok((Value::parse(&header)?, String::from(content)))
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test {
|
|
use super::entry_buffer_to_header_content;
|
|
|
|
fn mkfile(content: &str) -> String {
|
|
format!(r#"---
|
|
[imag]
|
|
version = '{version}'
|
|
---
|
|
{content}"#, version = env!("CARGO_PKG_VERSION"), content = content)
|
|
}
|
|
|
|
#[test]
|
|
fn test_entry_buffer_to_header_content_1() {
|
|
let content = "Hai";
|
|
let file = format!(r#"---
|
|
[imag]
|
|
version = '{version}'
|
|
---
|
|
{content}"#, version = env!("CARGO_PKG_VERSION"), content = content);
|
|
|
|
let res = entry_buffer_to_header_content(&file);
|
|
|
|
assert!(res.is_ok());
|
|
let (_, res_content) = res.unwrap();
|
|
assert_eq!(res_content, content)
|
|
}
|
|
|
|
#[test]
|
|
fn test_entry_buffer_to_header_content_2() {
|
|
let content = r#"Hai
|
|
"#;
|
|
|
|
let file = mkfile(&content);
|
|
eprintln!("FILE: <<<{}>>>", file);
|
|
let res = entry_buffer_to_header_content(&file);
|
|
|
|
assert!(res.is_ok());
|
|
let (_, res_content) = res.unwrap();
|
|
eprintln!("CONTENT: <<<{}>>>", res_content);
|
|
assert_eq!(res_content, content)
|
|
}
|
|
|
|
#[test]
|
|
fn test_entry_buffer_to_header_content_3() {
|
|
let content = r#"Hai
|
|
|
|
barbar
|
|
|
|
"#;
|
|
|
|
let file = mkfile(&content);
|
|
let res = entry_buffer_to_header_content(&file);
|
|
|
|
assert!(res.is_ok());
|
|
let (_, res_content) = res.unwrap();
|
|
assert_eq!(res_content, content)
|
|
}
|
|
|
|
#[test]
|
|
fn test_entry_buffer_to_header_content_4() {
|
|
let content = r#"Hai
|
|
|
|
---
|
|
barbar
|
|
---
|
|
|
|
"#;
|
|
|
|
let file = mkfile(&content);
|
|
let res = entry_buffer_to_header_content(&file);
|
|
|
|
assert!(res.is_ok());
|
|
let (_, res_content) = res.unwrap();
|
|
assert_eq!(res_content, content)
|
|
}
|
|
|
|
#[test]
|
|
fn test_entry_buffer_to_header_content_5() {
|
|
let content = r#"Hai
|
|
|
|
---
|
|
barbar
|
|
---
|
|
|
|
|
|
"#;
|
|
|
|
let file = mkfile(&content);
|
|
let res = entry_buffer_to_header_content(&file);
|
|
|
|
assert!(res.is_ok());
|
|
let (_, res_content) = res.unwrap();
|
|
assert_eq!(res_content, content)
|
|
}
|
|
|
|
}
|
|
|