commit 7513b7c91b55136b9b5dc4c4cf29fd862801ecd1 · hauleth.dev/ptsd

+63

src/actions.rs

···

       1
       1
       +
       use tokio::fs;

     

       2
       2
       +
       use tokio::process::Command;

     

       3
       3
       +
       

     

       4
       4
       +
       use std::path::{Path, PathBuf};

     

       5
       5
       +
       

     

       6
       6
       +
       /// Actions available for file

     

       7
       7
       +
       #[derive(Clone, Debug, serde::Deserialize)]

     

       8
       8
       +
       #[serde(rename_all = "snake_case")]

     

       9
       9
       +
       pub enum Action {

     

       10
       10
       +
           /// Run given script with 1st argument. It will be ran in parent directory for given file

     

       11
       11
       +
           Script(Box<Path>),

     

       12
       12
       +
           /// Move given file to new destination

     

       13
       13
       +
           Move(Box<Path>),

     

       14
       14
       +
           /// Print message and do nothing

     

       15
       15
       +
           Echo(String),

     

       16
       16
       +
           /// Move to trash

     

       17
       17
       +
           Trash,

     

       18
       18
       +
       }

     

       19
       19
       +
       

     

       20
       20
       +
       impl Action {

     

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

     

       22
       22
       +
               if execute { self.execute(source).await } else { self.dry_run(source).await }

     

       23
       23
       +
           }

     

       24
       24
       +
       

     

       25
       25
       +
           pub async fn dry_run(self, source: PathBuf) {

     

       26
       26
       +
               match self {

     

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

     

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

     

       29
       29
       +
                   Action::Echo(ref message) => println!("{source:?} - {message}"),

     

       30
       30
       +
                   Action::Trash => println!("Move {source:?} to trash"),

     

       31
       31
       +
               }

     

       32
       32
       +
           }

     

       33
       33
       +
       

     

       34
       34
       +
           pub async fn execute(self, source: PathBuf) {

     

       35
       35
       +
               match self {

     

       36
       36
       +
                   Action::Script(ref script) => {

     

       37
       37
       +
                       Command::new(script.as_ref())

     

       38
       38
       +
                           .arg(&source)

     

       39
       39
       +
                           .current_dir(source.parent().unwrap())

     

       40
       40
       +
                           .spawn()

     

       41
       41
       +
                           .expect("Couldnt spawn process")

     

       42
       42
       +
                           .wait()

     

       43
       43
       +
                           .await

     

       44
       44
       +
                           .expect("Child exited abnormally");

     

       45
       45
       +
                   }

     

       46
       46
       +
       

     

       47
       47
       +
                   Action::Move(ref dest_dir) => {

     

       48
       48
       +
                       let dest = crate::job::normalise_path(dest_dir).join(source.file_name().unwrap());

     

       49
       49
       +
                       if let Err(err) = fs::rename(&source, &dest).await {

     

       50
       50
       +
                           if err.raw_os_error() == Some(libc::EXDEV) {

     

       51
       51
       +
                               panic!("X dev");

     

       52
       52
       +
                           } else {

     

       53
       53
       +
                               panic!("Cannot move {source:?} -> {dest:?}: {err:?}");

     

       54
       54
       +
                           }

     

       55
       55
       +
                       }

     

       56
       56
       +
                   }

     

       57
       57
       +
       

     

       58
       58
       +
                   Action::Echo(ref message) => println!("{source:?} - {message}"),

     

       59
       59
       +
       

     

       60
       60
       +
                   Action::Trash => trash::delete(source).unwrap(),

     

       61
       61
       +
               }

     

       62
       62
       +
           }

     

       63
       63
       +
       }

+6 -59

src/job.rs

···

       3
       3
        
       use std::path::{Path, PathBuf};

     

       4
       4
        
       

     

       5
       5
        
       use tokio::fs;

     

       6
       6
       -
       use tokio::process::Command;

     

       7
       6
        
       use tokio_stream::wrappers::ReadDirStream;

     

       8
       8
       -
       

     

       9
       9
       -
       use futures::prelude::*;

     

       10
       7
        
       

     

       11
       8
        
       use serde::Deserialize;

     

       12
       9
        
       

     

       13
       10
        
       use crate::filters::Filter;

     

       11
       11
       +
       use crate::actions::Action;

     

       14
       12
        
       

     

       15
       13
        
       /// Definition of the job files

     

       16
       14
        
       #[derive(Debug, Deserialize)]

     

       17
       15
        
       pub struct Job {

     

       18
       18
       -
           filters: Vec<Box<dyn Filter>>,

     

       16
       16
       +
           filter: Box<dyn Filter>,

     

       19
       17
        
           location: PathBuf,

     

       20
       18
        
           actions: Vec<Action>,

     

       21
       19
        
       }

     

       22
       20
        
       

     

       23
       21
        
       impl Job {

     

       24
       24
       -
           pub async fn run(&self) -> Result<impl tokio_stream::Stream<Item = (Action, PathBuf)> + '_> {

     

       22
       22
       +
           /// Returns stream of actions that should be executed

     

       23
       23
       +
           pub async fn actions(&self) -> Result<impl tokio_stream::Stream<Item = (Action, PathBuf)> + '_> {

     

       25
       24
        
               let loc = normalise_path(&self.location);

     

       26
       25
        
       

     

       27
       26
        
               let dir = ReadDirStream::new(fs::read_dir(&loc).await?);

     
···

       29
       28
        
               Ok(async_stream::stream! {

     

       30
       29
        
                   for await entry in dir {

     

       31
       30
        
                       let entry = entry.unwrap();

     

       32
       32
       -
                       if self.matches_filters(&entry.path()).await {

     

       31
       31
       +
                       if self.filter.matches(&entry.path()).await {

     

       33
       32
        
                           for action in &self.actions {

     

       34
       33
        
                               yield (action.clone(), entry.path())

     

       35
       34
        
                           }

     
···

       37
       36
        
                   }

     

       38
       37
        
               })

     

       39
       38
        
           }

     

       40
       40
       -
       

     

       41
       41
       -
           async fn matches_filters(&self, path: &Path) -> bool {

     

       42
       42
       -
               stream::iter(&self.filters).all(|f| f.matches(path)).await

     

       43
       43
       -
           }

     

       44
       39
        
       }

     

       45
       40
        
       

     

       46
       46
       -
       /// Actions available for file

     

       47
       47
       -
       #[derive(Clone, Debug, Deserialize)]

     

       48
       48
       -
       #[serde(untagged)]

     

       49
       49
       -
       pub enum Action {

     

       50
       50
       -
           /// Run given script with 1st argument. It will be ran in parent directory for given file

     

       51
       51
       -
           Script { script: Box<Path> },

     

       52
       52
       -
           /// Move given file to new destination

     

       53
       53
       -
           Move { move_to: Box<Path> },

     

       54
       54
       -
           /// Print message and do nothing

     

       55
       55
       -
           Echo { message: String },

     

       56
       56
       -
           /// Move to trash

     

       57
       57
       -
           Trash,

     

       58
       58
       -
       }

     

       59
       59
       -
       

     

       60
       60
       -
       impl Action {

     

       61
       61
       -
           pub async fn execute(self, source: PathBuf) {

     

       62
       62
       -
               match self {

     

       63
       63
       -
                   Action::Script { ref script } => {

     

       64
       64
       -
                       Command::new(script.as_ref())

     

       65
       65
       -
                           .arg(&source)

     

       66
       66
       -
                           .current_dir(source.parent().unwrap())

     

       67
       67
       -
                           .spawn()

     

       68
       68
       -
                           .expect("Couldnt spawn process")

     

       69
       69
       -
                           .wait()

     

       70
       70
       -
                           .await

     

       71
       71
       -
                           .expect("Child exited abnormally");

     

       72
       72
       -
                   }

     

       73
       73
       -
       

     

       74
       74
       -
                   Action::Move {

     

       75
       75
       -
                       move_to: ref dest_dir,

     

       76
       76
       -
                   } => {

     

       77
       77
       -
                       let dest = normalise_path(dest_dir).join(source.file_name().unwrap());

     

       78
       78
       -
                       if let Err(err) = fs::rename(&source, &dest).await {

     

       79
       79
       -
                           if err.raw_os_error() == Some(libc::EXDEV) {

     

       80
       80
       -
                               panic!("X dev");

     

       81
       81
       -
                           } else {

     

       82
       82
       -
                               panic!("Cannot move {source:?} -> {dest:?}: {err:?}");

     

       83
       83
       -
                           }

     

       84
       84
       -
                       }

     

       85
       85
       -
                   }

     

       86
       86
       -
       

     

       87
       87
       -
                   Action::Echo { ref message } => println!("{source:?} - {message}"),

     

       88
       88
       -
       

     

       89
       89
       -
                   Action::Trash => trash::delete(source).unwrap(),

     

       90
       90
       -
               }

     

       91
       91
       -
           }

     

       92
       92
       -
       }

     

       93
       93
       -
       

     

       94
       94
       -
       fn normalise_path(path: &Path) -> PathBuf {

     

       41
       41
       +
       pub(crate) fn normalise_path(path: &Path) -> PathBuf {

     

       95
       42
        
           match path.strip_prefix("~") {

     

       96
       43
        
               Ok(prefix) => std::env::home_dir().unwrap().join(prefix),

     

       97
       44
        
               Err(_) => path.to_owned(),