CloudNebulaProject/ips
1
0
Fork 0
mirror of https://codeberg.org/Toasterson/ips.git synced 2026-04-10 13:20:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Unify functions

Browse source
This commit is contained in:
Till Wegmueller 2020-05-19 10:39:06 +02:00
parent 4486b05c81
commit 6cfcff39b6
1 changed files with 41 additions and 72 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

113
src/actions/mod.rs
View file

@ -77,42 +77,7 @@ pub fn parse_manifest_file(filename: String) -> Result<Manifest, Error> {
let file = BufReader::new(&f);
for (line_nr, line_read) in file.lines().enumerate() {
let line = line_read?;
match determine_action_kind(&line) {
ActionKind::Attr => {
m.attributes.push(parse_attr_action(String::from(line))?);
}
ActionKind::Dir => {
}
ActionKind::File => {
}
ActionKind::Dependency => {
}
ActionKind::User => {
}
ActionKind::Group => {
}
ActionKind::Driver => {
}
ActionKind::License => {
}
ActionKind::Link => {
}
ActionKind::Legacy => {
}
ActionKind::Unknown{action} => {
Err(ManifestError::UnknownAction {action, line: line_nr})?;
}
}
handle_manifest_line(&mut m, line_read?.trim_start(), line_nr)?;
}
return Ok(m);
@ -121,46 +86,50 @@ pub fn parse_manifest_file(filename: String) -> Result<Manifest, Error> {
pub fn parse_manifest_string(manifest: String) -> Result<Manifest, Error> {
let mut m = Manifest::new();
for (line_nr, line) in manifest.lines().enumerate() {
match determine_action_kind(&line) {
ActionKind::Attr => {
let attr = parse_attr_action(String::from(line))?;
m.attributes.push(attr)
}
ActionKind::Dir => {
}
ActionKind::File => {
}
ActionKind::Dependency => {
}
ActionKind::User => {
}
ActionKind::Group => {
}
ActionKind::Driver => {
}
ActionKind::License => {
}
ActionKind::Link => {
}
ActionKind::Legacy => {
}
ActionKind::Unknown{action} => {
Err(ManifestError::UnknownAction {action, line: line_nr})?;
}
}
handle_manifest_line(&mut m, line.trim_start(), line_nr)?;
}
return Ok(m);
}
fn handle_manifest_line(manifest: &mut Manifest, line: &str, line_nr: usize) -> Result<(), Error> {
match determine_action_kind(&line) {
ActionKind::Attr => {
manifest.attributes.push(parse_attr_action(String::from(line))?);
}
ActionKind::Dir => {
}
ActionKind::File => {
}
ActionKind::Dependency => {
}
ActionKind::User => {
}
ActionKind::Group => {
}
ActionKind::Driver => {
}
ActionKind::License => {
}
ActionKind::Link => {
}
ActionKind::Legacy => {
}
ActionKind::Unknown{action} => {
Err(ManifestError::UnknownAction {action, line: line_nr})?;
}
}
Ok(())
}
fn determine_action_kind(line: &str) -> ActionKind {
let mut act = String::new();
for c in line.trim_start().chars() {