mirrors/pict-rs
1
0
Fork 0
mirror of https://git.asonix.dog/asonix/pict-rs.git synced 2024-12-01 05:51:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove recursion

Browse source
This commit is contained in:
Aode (Lion) 2021-10-20 20:36:10 -05:00
parent d69d261999
commit 1767942e31
1 changed files with 15 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/processor.rs
View file

@ -174,40 +174,28 @@ pub(crate) fn build_chain(args: &[(String, String)], filename: String) -> (PathB
} }
macro_rules! parse { macro_rules! parse {
($inner:expr, $args:expr, $filename:expr, $x:ident, $k:expr, $v:expr) => {{ ($inner:expr, $x:ident, $k:expr, $v:expr) => {{
if let Some(processor) = parse::<$x>($k, $v) { if let Some(processor) = parse::<$x>($k, $v) {
return build( return (processor.path($inner.0), processor.command($inner.1));
(processor.path($inner.0), processor.command($inner.1)), };
&$args[1..],
$filename,
);
}
}}; }};
} }
fn build( let (path, args) =
inner: (PathBuf, Vec<String>), args.into_iter()
args: &[(String, String)], .fold((PathBuf::default(), vec![]), |inner, (name, value)| {
filename: String, parse!(inner, Identity, name, value);
) -> (PathBuf, Vec<String>) { parse!(inner, Thumbnail, name, value);
if args.len() == 0 { parse!(inner, Resize, name, value);
return inner; parse!(inner, Crop, name, value);
} parse!(inner, Blur, name, value);
let (name, value) = &args[0];
parse!(inner, args, filename, Identity, name, value);
parse!(inner, args, filename, Thumbnail, name, value);
parse!(inner, args, filename, Resize, name, value);
parse!(inner, args, filename, Crop, name, value);
parse!(inner, args, filename, Blur, name, value);
debug!("Skipping {}: {}, invalid", name, value); debug!("Skipping {}: {}, invalid", name, value);
build(inner, &args[1..], filename) inner
} });
build((PathBuf::default(), vec![]), args, filename) (path.join(filename), args)
} }
fn is_motion(s: &str) -> bool { fn is_motion(s: &str) -> bool {