Version bump to v0.1.3

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "adept"
 description = "Bit Goblin automated video transcoding service."
-version = "0.1.1"
+version = "0.1.3"
 edition = "2021"
 readme = "README.md"
 license = "BSD 2-Clause"

src/main.rs

@@ -1,11 +1,11 @@
 use log4rs;
 use config::Config;
-use repository::Repository;
-use transcoder::Transcoder;
+use transcoder::repository::Repository;
+use transcoder::transcoder::Transcoder;
 
 mod config;
-mod repository;
 mod transcoder;
+mod util;
 
 fn main() {
   // initialize the log4rs logger

src/transcoder/mod.rs

@@ -0,0 +1,2 @@
+pub mod repository;
+pub mod transcoder;

src/transcoder/transcoder.rs

@@ -4,7 +4,8 @@ use std::{thread, time};
 use log::{info};
 
 use crate::config::Config;
-use crate::repository::Repository;
+use crate::util::io;
+use super::repository::Repository;
 
 pub struct Transcoder {
   config: Config,
@@ -31,6 +32,12 @@ impl Transcoder {
         info!("There were no files found in ingest to transcode; skipping run.");
       } else {
         for i in ingest_files {
+          let ingest_path = Path::new(&self.repository.ingest_dir).join(&i);
+          if io::is_file_locked(&ingest_path.to_str().unwrap()) {
+            info!("{} is currently open in another program; skipping it for this run.", &i);
+            continue;
+          }
+
           // copy the file to the archive
           self.repository.archive_file(&i);
 

src/util/io.rs

@@ -0,0 +1,61 @@
+use std::process;
+
+// checks whether a file is currently open in another program (e.g. still being written)
+pub fn is_file_locked(filepath: &str) -> bool {
+  let cmd = process::Command::new("/usr/bin/lsof")
+    .arg(filepath)
+    .output()
+    .expect("Failed to execute command");
+
+  let results = &String::from_utf8_lossy(&cmd.stdout);
+  println!("{}", results);
+  if results.contains(filepath) {
+    return true;
+  }
+
+  return false;
+}
+
+#[cfg(test)]
+mod tests {
+  use std::fs;
+  use std::mem::drop;
+  use std::path::Path;
+
+  use super::*;
+
+  #[test]
+  fn file_should_not_be_locked() {
+    setup("test-not-locked.txt");
+    assert!(!is_file_locked("test-not-locked.txt"));
+    teardown("test-not-locked.txt");
+  }
+
+  #[test]
+  fn file_should_be_locked() {
+    setup("test-locked.txt");
+    let path = Path::new("test-locked.txt");
+    match fs::File::open(&path) {
+      Err(e) => panic!("couldn't open {}: {}", "test-locked.txt", e),
+      Ok(_) => assert!(is_file_locked("test-locked.txt")),
+    };
+    teardown("test-locked.txt");
+  }
+
+  // get things ready for our tests
+  fn setup(test_file: &str) {
+    let f = match fs::File::create(test_file) {
+      Ok(file) => file,
+      Err(e) => panic!("{:?}", e),
+    };
+    drop(f);
+  }
+
+  // clean up after running tests
+  fn teardown(test_file: &str) {
+    match fs::remove_file(test_file) {
+      Ok(_) => {},
+      Err(e) => panic!("{:?}", e),
+    };
+  }
+}

src/util/mod.rs

@@ -0,0 +1 @@
+pub mod io;