From 024e4b2e1c0ce3f8dc3b4a7a658e80c7454bdc4a Mon Sep 17 00:00:00 2001
From: Gregory Ballantine <gballantine@metaunix.net>
Date: Thu, 15 Sep 2022 18:10:42 -0400
Subject: [PATCH] Used the config-rs crate to allow reading from a config file
 from /etc/zealot/config.toml and from the home directory

---
 Cargo.toml                   |  1 +
 src/config.rs                | 34 ----------------------------------
 src/main.rs                  |  6 +++---
 src/settings.rs              | 12 ++++++++++++
 src/transcoder/transcoder.rs | 18 +++++++++---------
 5 files changed, 25 insertions(+), 46 deletions(-)
 delete mode 100644 src/config.rs
 create mode 100644 src/settings.rs

diff --git a/Cargo.toml b/Cargo.toml
index e911260..f9ff02c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -8,6 +8,7 @@ license = "BSD 2-Clause"
 authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
 
 [dependencies]
+config = { version = "0.13", features = ['toml'] }
 log = "0.4"
 log4rs = "1.1"
 toml = "0.5"
diff --git a/src/config.rs b/src/config.rs
deleted file mode 100644
index 8c7441e..0000000
--- a/src/config.rs
+++ /dev/null
@@ -1,34 +0,0 @@
-use serde_derive::Deserialize;
-use std::fs;
-
-#[derive(Deserialize)]
-pub struct Config {
-  pub transcoder: Transcoder,
-}
-
-impl Config {
-  pub fn new(config_path: &str) -> Config {
-    let resolved_path = shellexpand::tilde(config_path);
-    let config_text = fs::read_to_string(&*resolved_path).unwrap();
-    let c: Config = toml::from_str(&config_text).unwrap();
-    return c;
-  }
-
-  pub fn get_repository(&self) -> String {
-    let resolved_path = shellexpand::tilde(&self.transcoder.repository);
-    return String::from(&*resolved_path);
-  }
-}
-
-#[derive(Deserialize)]
-pub struct Transcoder {
-  pub repository:       String,
-  pub interval:         u16,
-  pub video_format:     String,
-  pub video_codec:      String,
-  pub video_profile:    String,
-  pub video_resolution: String,
-  pub video_framerate:  u8,
-  pub video_color:      String,
-  pub audio_codec:      String,
-}
diff --git a/src/main.rs b/src/main.rs
index 3a4225e..a544455 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,7 +3,7 @@ use config::Config;
 use transcoder::repository::Repository;
 use transcoder::transcoder::Transcoder;
 
-mod config;
+mod settings;
 mod transcoder;
 mod util;
 
@@ -12,8 +12,8 @@ fn main() {
   log4rs::init_file("./log4rs.yaml", Default::default()).unwrap();
 
   // create and initialize our config and repository objects
-  let c: Config = Config::new("~/.config/zealot.toml");
-  let r: Repository = Repository::new(&c.get_repository());
+  let c: Config = settings::load_config();
+  let r: Repository = Repository::new(&shellexpand::tilde(&c.get_string("transcoder.repository").unwrap()));
 
   // create and start the video transcoder object
   let t: Transcoder = Transcoder::new(c, r);
diff --git a/src/settings.rs b/src/settings.rs
new file mode 100644
index 0000000..8ed06dc
--- /dev/null
+++ b/src/settings.rs
@@ -0,0 +1,12 @@
+use config::Config;
+
+pub fn load_config() -> Config {
+  let settings = Config::builder()
+    // Add in `./Settings.toml`
+    .add_source(config::File::with_name("/etc/zealot/config.toml").required(false))
+    .add_source(config::File::with_name(&shellexpand::tilde("~/.config/zealot.toml")).required(false))
+    .build()
+    .unwrap();
+
+  return settings;
+}
diff --git a/src/transcoder/transcoder.rs b/src/transcoder/transcoder.rs
index 2a2fbbc..30414ab 100644
--- a/src/transcoder/transcoder.rs
+++ b/src/transcoder/transcoder.rs
@@ -1,9 +1,9 @@
+use config::Config;
 use std::path::Path;
 use std::process;
 use std::{thread, time};
 use log::{info};
 
-use crate::config::Config;
 use crate::util::io;
 use super::repository::Repository;
 
@@ -50,7 +50,7 @@ impl Transcoder {
       }
 
       // put the loop to sleep for X minutes
-      let sleep_minutes = time::Duration::from_secs((self.config.transcoder.interval * 60).into());
+      let sleep_minutes = time::Duration::from_secs((self.config.get_int("transcoder.interval").unwrap() as u64 * 60).into());
       thread::sleep(sleep_minutes);
     }
   }
@@ -62,13 +62,13 @@ impl Transcoder {
     let cmd_output = process::Command::new("/usr/bin/ffmpeg")
       .arg("-i")        .arg(&*ingest_file.to_string_lossy())
       .arg("-y")
-      .arg("-f")        .arg(&self.config.transcoder.video_format)
-      .arg("-c:v")      .arg(&self.config.transcoder.video_codec)
-      .arg("-s")        .arg(&self.config.transcoder.video_resolution)
-      .arg("-r")        .arg(format!("{}", self.config.transcoder.video_framerate))
-      .arg("-vf")       .arg(format!("format={}", &self.config.transcoder.video_color))
-      .arg("-profile:v").arg(&self.config.transcoder.video_profile)
-      .arg("-c:a")      .arg(&self.config.transcoder.audio_codec)
+      .arg("-f")        .arg(&self.config.get_string("transcoder.video_format").unwrap())
+      .arg("-c:v")      .arg(&self.config.get_string("transcoder.video_codec").unwrap())
+      .arg("-s")        .arg(&self.config.get_string("transcoder.video_resolution").unwrap())
+      .arg("-r")        .arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
+      .arg("-vf")       .arg(format!("format={}", &self.config.get_string("transcoder.video_color").unwrap()))
+      .arg("-profile:v").arg(&self.config.get_string("transcoder.video_profile").unwrap())
+      .arg("-c:a")      .arg(&self.config.get_string("transcoder.audio_codec").unwrap())
       .arg(&*output_file.to_string_lossy())
       .output()
       .expect("Failed to execute command");