Version bump to v0.1.3

Cargo.toml

@@ -1,13 +1,15 @@
 [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"
 authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
 
 [dependencies]
+log = "0.4"
+log4rs = "1.1"
 toml = "0.5"
 serde = "1.0"
 serde_derive = "1.0"

log4rs.yaml

@@ -0,0 +1,12 @@
+appenders:
+  stdout:
+    kind: console
+    encoder:
+      pattern: "{d(%+)(utc)} {h({l})}: {m}{n}"
+    filters:
+      - kind: threshold
+        level: info
+root:
+  level: info
+  appenders:
+    - stdout

src/main.rs

@@ -1,12 +1,16 @@
+use log4rs;
 use config::Config;
-use repository::Repository;
+use transcoder::repository::Repository;
-use transcoder::Transcoder;
+use transcoder::transcoder::Transcoder;
 
 mod config;
-mod repository;
 mod transcoder;
+mod util;
 
 fn main() {
+  // initialize the log4rs logger
+  log4rs::init_file("./log4rs.yaml", Default::default()).unwrap();
+
   // create and initialize our config and repository objects
   let c: Config = Config::new("~/.config/adept.toml");
   let r: Repository = Repository::new(&c.get_repository());

src/transcoder/mod.rs

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

src/transcoder/repository.rs

@@ -1,5 +1,6 @@
 use std::fs;
 use std::path::Path;
+use log::{error, info};
 
 pub struct Repository {
   pub base_dir: String,
@@ -53,10 +54,10 @@ impl Repository {
 
     match fs::copy(&ingest_file, &archive_file) {
       Ok(_) => {
-        println!("Archiving video file {}.", ingest_file.to_str().unwrap());
+        info!("Archiving video file {}.", ingest_file.to_str().unwrap());
       },
       Err(e) => {
-        eprintln!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e);
+        error!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e);
         std::process::exit(1);
       }
     }
@@ -72,14 +73,14 @@ impl Repository {
 fn create_directory(path: &str) {
   let d = Path::new(path);
   if d.is_dir() {
-    println!("Directory {} already exists.", path);
+    info!("Directory {} already exists.", path);
   } else {
     match fs::create_dir(path) {
       Ok(_) => {
-        println!("Creating directory {}.", path);
+        info!("Creating directory {}.", path);
       },
       Err(e) => {
-        eprintln!("Error creating {}: {}", path, e);
+        error!("Error creating {}: {}", path, e);
         std::process::exit(1);
       }
     }

src/transcoder/transcoder.rs

@@ -1,9 +1,11 @@
 use std::path::Path;
 use std::process;
 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,
@@ -19,7 +21,7 @@ impl Transcoder {
   }
 
   pub fn start(self) {
-    println!("Starting transcoder...");
+    info!("Starting transcoder...");
 
     loop {
       // search for files in ingest
@@ -27,9 +29,15 @@ impl Transcoder {
 
       // check if we found any files to transcode
       if ingest_files.len() < 1 {
-        println!("There were no files found in ingest to transcode; skipping run.");
+        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);
 
@@ -68,6 +76,6 @@ impl Transcoder {
     assert!(cmd_output.status.success());
 
     let results_raw = &String::from_utf8_lossy(&cmd_output.stderr);
-    println!("{}", results_raw);
+    info!("{}", results_raw);
   }
 }

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;