commit c783ad36df30436c7198d96c4ad5ed2ef50a5cd8 · hauleth.dev/ptsd

+2 -1

examples/downloaded-gp-to-guitar.json

···

       4
       4
        
           "filter": {

     

       5
       5
        
             "type": "any",

     

       6
       6
        
             "filters": [

     

       7
       7
       -
               {"type": "name", "wildcard": "*.gp"}

     

       7
       7
       +
               {"type": "name", "wildcard": "*.gp"},

     

       8
       8
       +
               {"type": "name", "wildcard": "*.gp5"}

     

       8
       9
        
             ]

     

       9
       10
        
           },

     

       10
       11
        
           "actions": [

+3 -3

src/actions.rs

···

       21
       21
        
       

     

       22
       22
        
       impl Action {

     

       23
       23
        
           pub async fn run(self, source: PathBuf, execute: bool) {

     

       24
       24
       +
               self.dry_run(&source).await;

     

       25
       25
       +
       

     

       24
       26
        
               if execute {

     

       25
       27
        
                   self.execute(source).await

     

       26
       26
       -
               } else {

     

       27
       27
       -
                   self.dry_run(source).await

     

       28
       28
        
               }

     

       29
       29
        
           }

     

       30
       30
        
       

     

       31
       31
       -
           pub async fn dry_run(self, source: PathBuf) {

     

       31
       31
       +
           pub async fn dry_run(&self, source: &Path) {

     

       32
       32
        
               match self {

     

       33
       33
        
                   Action::Script(ref script) => println!("Execute {script:?} {source:?}"),

     

       34
       34
        
                   Action::Move(ref dest) => println!("Move {source:?} -> {dest:?}"),

+6 -3

src/main.rs

···

       15
       15
        
           /// Run specified commands instead of printing them

     

       16
       16
        
           #[arg(long = "no-dry-run", short = '!')]

     

       17
       17
        
           execute: bool,

     

       18
       18
       +
           #[arg(long)]

     

       19
       19
       +
           stdin: bool,

     

       18
       20
        
       }

     

       19
       21
        
       

     

       20
       22
        
       impl Args {

     

       21
       21
       -
           fn data(&self) -> std::io::Result<Box<dyn Read>> {

     

       23
       23
       +
           fn data(&self) -> Result<Box<dyn Read>> {

     

       22
       24
        
               Ok(match self.spec {

     

       23
       23
       -
                   Some(ref path) => Box::new(std::fs::File::open(path)?),

     

       24
       24
       -
                   None => Box::new(std::io::stdin()),

     

       25
       25
       +
                   Some(ref path) if !self.stdin => Box::new(std::fs::File::open(path)?),

     

       26
       26
       +
                   None if self.stdin => Box::new(std::io::stdin()),

     

       27
       27
       +
                   _ => unimplemented!(),

     

       25
       28
        
               })

     

       26
       29
        
           }

     

       27
       30
        
       }