isagalaev/nfp - Change 5GJRHBKCSWISBPJOAXWMXY3LMMD5GFOEHM3AEUKI5J7D4M3XM5GQC

Read processors from config

Created by isagalaev on October 3, 2021

5GJRHBKCSWISBPJOAXWMXY3LMMD5GFOEHM3AEUKI5J7D4M3XM5GQC

Dependencies

In channels

main

Change contents

Insertion in src/main.rs at line 7 [3.48]
[3.175]
[3.176]
```
use std::io::Read;
```

Insertion in src/main.rs at line 10 [3.48]

[3.224]


#[derive(serde::Deserialize)]
struct Processor {
    path: String,
    command: String,
    args: Vec<String>,
}

Replacement in src/main.rs at line 18 [3.48]

B:BD[3.225] → [2.84:174]

struct Processor<'a> {
    path: &'a Path,
    command: &'a str,
    args: &'a [&'a str],

[3.225]

[2.174]

#[derive(serde::Deserialize)]
struct Config {
    processors: Vec<Processor>,

Replacement in src/main.rs at line 23 [3.48]

B:BD[2.177] → [2.177:267]

fn process(filename: &Path, command: &str, args: &[&str]) -> Result<(), Box<dyn Error>> {

[2.177]

[3.285]

fn process(filename: &Path, command: &str, args: &[String]) -> Result<(), Box<dyn Error>> {

Replacement in src/main.rs at line 38 [3.48]

B:BD[3.748] → [2.378:467]

fn register_processor<'a>(
    processors: &mut HashMap<WatchDescriptor, Processor<'a>>,

[3.748]

[2.467]

fn register_processor(
    processors: &mut HashMap<WatchDescriptor, Processor>,

Replacement in src/main.rs at line 41 [3.48]

B:BD[2.494] → [2.494:561]

    path: &'a Path,
    command: &'a str,
    args: &'a [&'a str],

[2.494]

[2.561]

    processor: Processor,

Replacement in src/main.rs at line 45 [3.48]

B:BD[2.645] → [2.645:717]

        path.to_string_lossy(),
        command,
        args.join(" ")

[2.645]

[2.717]

        processor.path,
        processor.command,
        processor.args.join(" ")

Replacement in src/main.rs at line 49 [3.48]

B:BD[2.724] → [2.724:879]

    let descriptor = inotify.add_watch(path, WatchMask::CLOSE_WRITE)?;
    let processor = Processor {
        path,
        command,
        args,
    };

[2.724]

[2.879]

    let descriptor = inotify.add_watch(&processor.path, WatchMask::CLOSE_WRITE)?;

Insertion in src/main.rs at line 55 [3.48]

[3.790]

[2.940]

    let mut config_str = String::new();
    fs::File::open("/home/maniac/.config/nfp/config.toml")?.read_to_string(&mut config_str)?;
    let config: Config = toml::from_str(&config_str)?;

Replacement in src/main.rs at line 60 [3.48]

B:BD[3.871] → [2.982:1243]

    register_processor(
        &mut processors,
        &mut inotify,
        Path::new("/tmp/flickr"),
        "/home/maniac/.cache/pypoetry/virtualenvs/flickr-upload-AGKUL9KW-py3.9/bin/python",
        &["/home/maniac/code/flickr-upload/upload.py"],
    )?;

[3.871]

[3.926]

    for processor in config.processors {
        register_processor(&mut processors, &mut inotify, processor)?;
    }

Replacement in src/main.rs at line 66 [3.48]
B:BD[3.970] → [2.1244:1277]
```
        println!("Watching...");
```
[3.970]
[3.1030]
```
        println!("Waiting...");
```

Replacement in src/main.rs at line 70 [3.48]

B:BD[2.1330] → [2.1330:1399]

            let filename = processor.path.join(event.name.unwrap());

[2.1330]

[2.1399]

            let filename = Path::new(&processor.path).join(event.name.unwrap());

Replacement in src/main.rs at line 72 [3.48]

B:BD[2.1450] → [2.1450:1525]

            let _ = process(&filename, processor.command, processor.args);

[2.1450]

[3.1286]

            let _ = process(&filename, &processor.command, processor.args.as_slice());

Insertion in Cargo.toml at line 10 [3.1340]

[3.1531]

toml = "0.5.8"
serde = { version = "1.0.130", features = ["derive"] }