.woodpecker.yml

@@ -1,13 +1,13 @@
 pipeline:
   tests:
-    image: rust:1.75
+    image: rust:1.63
     commands:
       - "apt update"
       - "apt install -y lsof"
       - "cargo test"
 
   build_release:
-    image: rust:1.75
+    image: rust:1.63
     commands:
       - "cargo install cargo-deb cargo-generate-rpm"
       - "cargo build --release"
@@ -30,49 +30,3 @@ pipeline:
       title: "${CI_COMMIT_TAG}"
     when:
       event: tag
-
-  copy_deb_package:
-    image: appleboy/drone-scp
-    settings:
-      host: "repo.int.metaunix.net"
-      username:
-        from_secret: repo_admin
-      password:
-        from_secret: repo_password
-      port: 22
-      target: /srv/repo/apt/zealot/
-      source: target/debian/zealot*.deb
-      strip_components: 2
-    when:
-      event: tag
-
-  copy_rpm_package:
-    image: appleboy/drone-scp
-    settings:
-      host: "repo.int.metaunix.net"
-      username:
-        from_secret: repo_admin
-      password:
-        from_secret: repo_password
-      port: 22
-      target: /srv/repo/dnf/zealot/
-      source: target/generate-rpm/zealot*.rpm
-      strip_components: 2
-    when:
-      event: tag
-
-  update_repos:
-    image: appleboy/drone-ssh
-    settings:
-      host:
-        - repo.int.metaunix.net
-      username:
-        from_secret: repo_admin
-      password:
-        from_secret: repo_password
-      port: 22
-      command_timeout: 2m
-      script:
-        - "sudo /home/xadmin/scripts/update_repo.sh"
-    when:
-      event: tag

Cargo.toml

@@ -1,17 +1,14 @@
 [package]
 name = "zealot"
 description = "Bit Goblin automated video transcoding service."
-version = "0.2.7"
+version = "0.2.0"
 edition = "2021"
 readme = "README.md"
 license = "BSD 2-Clause"
 authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
-repository = "https://git.metaunix.net/BitGoblin/zealot"
 
 [dependencies]
-clap = { version = "3.2", features = ['derive'] }
 config = { version = "0.13", features = ['toml'] }
-filetime = "0.2"
 log = "0.4"
 log4rs = "1.1"
 toml = "0.5"
@@ -27,7 +24,6 @@ section = "video"
 assets = [
 	["target/release/zealot", "usr/bin/zealot", "755"],
 	["build/etc/example.toml", "etc/zealot/example.toml", "644"],
-	["build/etc/log4rs.yaml", "etc/zealot/log4rs.yaml", "755"],
 	["README.md", "usr/share/doc/zealot/README", "644"]
 ]
 [package.metadata.deb.systemd-units]

build/debian/service/adept.service

@@ -4,7 +4,7 @@ Description=Zealot video transcoder service
 [Service]
 User=zealot
 Group=zealot
-ExecStart=/usr/bin/zealot -l /etc/zealot/log4rs.yaml
+ExecStart=/usr/bin/zealot
 SuccessExitStatus=143
 
 [Install]

build/etc/log4rs.yaml

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

build/scripts/postinst

@@ -5,7 +5,6 @@ GETENT_GROUP=$(getent group zealot)
 
 # Create the zealot user if it doesn't already exist
 if [ "$GETENT_USER" = "" ]; then
-	echo "Creating the 'zealot' user."
 	useradd -r zealot
 else
 	echo "The 'zealot' user already exists, skipping creation."
@@ -13,7 +12,6 @@ fi
 
 # Create the zealot group if it doesn't already exist
 if [ "$GETENT_GROUP" = "" ]; then
-	echo "Creating the 'zealot' group."
 	groupadd zealot
 	usermod -aG zealot zealot
 else
@@ -23,15 +21,6 @@ fi
 # Change the directory ownership of /etc
 chown -R zealot:zealot /etc/zealot
 
-# Create the log directory under /var/log
-if [ ! -d /var/log/zealot ]; then
-	echo "Creating /var/log/zealot to store log files."
-	mkdir /var/log/zealot
-	chown zealot:zealot /var/log/zealot
-else
-	echo "/var/log/zealot already exists, skipping creation."
-fi
-
 #DEBHELPER#
 
 exit 0

example.config

@@ -1,10 +0,0 @@
-[transcoder]
-repo_path = '~/zealot'
-interval = 15
-video_format = 'mov'
-video_codec = 'dnxhd'
-video_profile = 'dnxhr_hq'
-video_resolution = '1920x1080'
-video_framerate = '60'
-video_color = 'yuv422p'
-audio_codec = 'pcm_s16le'

src/cmd/core.rs

@@ -1,38 +0,0 @@
-use config::Config;
-use crate::settings;
-use crate::transcoder::repository::Repository;
-
-pub fn setup_command() {
-  // load configuration
-  let c: Config = settings::load_config();
-
-  // resolve repository path
-  let repository_dir_raw: &str = &c.get_string("transcoder.repository").unwrap();
-  let repository_dir: &str = &shellexpand::tilde(repository_dir_raw);
-
-  // alert the user to what's happening
-  println!("Initializing video repository at {}...", repository_dir);
-
-  // create and initialize our repository object
-  let r: Repository = Repository::new(repository_dir);
-  // initialize the video repository
-  r.initialize();
-}
-
-pub fn version_command() {
-  println!("===================================================================================");
-
-  // output the program and version
-  println!("Zealot version v{}", env!("CARGO_PKG_VERSION"));
-
-  // output project description
-  println!("{}", env!("CARGO_PKG_DESCRIPTION"));
-
-  // display license info
-  println!("\nThis code is licensed under the {} license.", env!("CARGO_PKG_LICENSE"));
-
-  // output the project source URL
-  println!("View the source code or file issues at {}.", env!("CARGO_PKG_REPOSITORY"));
-
-  println!("===================================================================================");
-}

src/cmd/mod.rs

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

src/main.rs

@@ -1,49 +1,16 @@
-use clap::{Parser, Subcommand};
 use log4rs;
 use config::Config;
 use transcoder::repository::Repository;
 use transcoder::transcoder::Transcoder;
 
-mod cmd;
 mod settings;
 mod transcoder;
 mod util;
 
-#[derive(Parser)]
-#[clap(author, version, about, long_about = None)]
-struct Cli {
-  /// Number of times to greet
-  #[clap(short = 'l', long, default_value_t = String::from("./log4rs.yaml"))]
-  log_config: String,
-
-  #[clap(subcommand)]
-  command: Option<Commands>,
-}
-
-#[derive(Subcommand)]
-enum Commands {
-  // Runs the setup command
-  Setup {},
-
-  // Displays version info about the program
-  Version {},
-}
-
 fn main() {
-  // initialize the clap CLI
-  let cli = Cli::parse();
+  // initialize the log4rs logger
+  log4rs::init_file("./log4rs.yaml", Default::default()).unwrap();
 
-  // grab the log4rs config file path, then initialize log4rs
-  let log4rs_config: String = cli.log_config;
-  log4rs::init_file(&log4rs_config, Default::default()).unwrap();
-
-  match &cli.command {
-    // sub-commands will be handled here
-    Some(Commands::Setup {}) => cmd::core::setup_command(),
-    Some(Commands::Version {}) => cmd::core::version_command(),
-
-    // run the main program without any commands
-    None => {
   // create and initialize our config and repository objects
   let c: Config = settings::load_config();
   let r: Repository = Repository::new(&shellexpand::tilde(&c.get_string("transcoder.repository").unwrap()));
@@ -51,6 +18,4 @@ fn main() {
   // create and start the video transcoder object
   let t: Transcoder = Transcoder::new(c, r);
   t.start();
-    },
-  }
 }

src/settings.rs

@@ -1,33 +1,12 @@
 use config::Config;
 
 pub fn load_config() -> Config {
-  let global_config_path: String = find_global_config_path();
-  let home_config_path: String = find_home_config_path();
-
   let settings = Config::builder()
     // Add in `./Settings.toml`
-    .add_source(config::File::with_name(&global_config_path).required(false))
-    .add_source(config::File::with_name(&home_config_path).required(false))
+    .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;
 }
-
-fn find_global_config_path() -> String {
-  if cfg!(windows) {
-    return String::from("C:\\Program Files\\Zealot\\config.toml");
-  }
-
-  return String::from("/etc/zealot/config.toml");
-}
-
-fn find_home_config_path() -> String {
-  let home_path: &str = &shellexpand::tilde("~/.config/zealot.toml");
-
-  if cfg!(windows) {
-    return String::from(home_path.replace("/", "\\"));
-  }
-
-  return String::from(home_path);
-}

src/transcoder/repository.rs

@@ -1,8 +1,6 @@
 use std::fs;
 use std::path::Path;
 use log::{error, info};
-use filetime;
-use filetime::FileTime;
 
 pub struct Repository {
   pub base_dir: String,
@@ -13,9 +11,16 @@ pub struct Repository {
 
 impl Repository {
   pub fn new(base_path: &str) -> Repository {
+    // create the base directory path
+    create_directory(base_path);
+
+    // create the needed sub-directories
     let ingest_path = Path::new(base_path).join("ingest");
+    create_directory(ingest_path.to_str().unwrap());
     let archive_path = Path::new(base_path).join("archive");
+    create_directory(archive_path.to_str().unwrap());
     let output_path = Path::new(base_path).join("output");
+    create_directory(output_path.to_str().unwrap());
 
     return Repository {
       base_dir: String::from(base_path),
@@ -25,16 +30,6 @@ impl Repository {
     };
   }
 
-  pub fn initialize(&self) {
-    // create the base directory path
-    create_directory(&self.base_dir);
-
-    // create the needed sub-directories
-    create_directory(&self.ingest_dir.as_str());
-    create_directory(&self.archive_dir.as_str());
-    create_directory(&self.output_dir.as_str());
-  }
-
   pub fn search_ingest(&self) -> Vec<String> {
     // read file entries from ingest
     let files = fs::read_dir(&self.ingest_dir).unwrap();
@@ -60,7 +55,6 @@ impl Repository {
     match fs::copy(&ingest_file, &archive_file) {
       Ok(_) => {
         info!("Archiving video file {}.", ingest_file.to_str().unwrap());
-        copy_file_metadata(ingest_file.to_str().unwrap(), archive_file.to_str().unwrap());
       },
       Err(e) => {
         error!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e);
@@ -92,16 +86,3 @@ fn create_directory(path: &str) {
     }
   }
 }
-
-fn copy_file_metadata(old_file: &str, new_file: &str) {
-  // grab old file metadata
-  let old_metadata = fs::metadata(old_file).unwrap();
-  let old_permissions = old_metadata.permissions();
-  let mtime = FileTime::from_last_modification_time(&old_metadata);
-  let atime = FileTime::from_last_access_time(&old_metadata);
-
-  // set metadata on the new file
-  let new_path = Path::new(new_file);
-  fs::set_permissions(new_file, old_permissions).expect("Failed to set new file permissions.");
-  filetime::set_file_times(new_path, atime, mtime).expect("Failed to set atime and mtime.");
-}

src/transcoder/transcoder.rs

@@ -2,7 +2,7 @@ use config::Config;
 use std::path::Path;
 use std::process;
 use std::{thread, time};
-use log::{debug, info};
+use log::{info};
 
 use crate::util::io;
 use super::repository::Repository;
@@ -31,10 +31,6 @@ impl Transcoder {
       if ingest_files.len() < 1 {
         info!("There were no files found in ingest to transcode; skipping run.");
       } else {
-        // log that the transcoder is starting up
-        info!("Found {} files in ingest to transcode. Standby...", ingest_files.len());
-
-        // loop through each file found in ingest
         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()) {
@@ -51,9 +47,6 @@ impl Transcoder {
           // remove the source file
           self.repository.cleanup_file(&i);
         }
-
-        // let the user know the transcode has finished
-        info!("Finished transcoding. Sleeping...");
       }
 
       // put the loop to sleep for X minutes
@@ -64,43 +57,25 @@ impl Transcoder {
 
   fn transcode(&self, file: &str) {
     let ingest_file = Path::new(&self.repository.ingest_dir).join(file);
-    let video_format = &self.config.get_string("transcoder.video_format").unwrap();
-    let output_stem = Path::new(file).file_stem().unwrap();
-    let output_bits = vec![output_stem.to_str().unwrap(), &video_format];
-    let output_name = output_bits.join(".");
-    let output_file = Path::new(&self.repository.output_dir).join(output_name);
+    let output_file = Path::new(&self.repository.output_dir).join(file);
 
-    let video_codec = &self.config.get_string("transcoder.video_codec").unwrap();
-    info!("Transcoding {} to {} with the {} encoder.", ingest_file.display(), output_file.display(), video_codec);
-
-    let binding = process::Command::new("/usr/bin/ffmpeg");
-    let mut cmd = binding;
-
-    // start building the command
-    cmd.arg("-i")        .arg(&*ingest_file.to_string_lossy())
+    let cmd_output = process::Command::new("/usr/bin/ffmpeg")
+      .arg("-i")        .arg(&*ingest_file.to_string_lossy())
       .arg("-y")
-      .arg("-f")        .arg(&video_format)
-      .arg("-c:v")      .arg(&video_codec);
-
-    // add video resolution if it's available
-    if self.config.get_string("transcoder.video_resolution").is_ok() {
-        cmd.arg("-s").arg(&self.config.get_string("transcoder.video_resolution").unwrap());
-    };
-
-    // finish out command
-    cmd.arg("-r").arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
+      .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());
-
-    // finish the command and run it
-    let cmd_output = cmd.arg(&*output_file.to_string_lossy())
+      .arg("-c:a")      .arg(&self.config.get_string("transcoder.audio_codec").unwrap())
+      .arg(&*output_file.to_string_lossy())
       .output()
       .expect("Failed to execute command");
 
     assert!(cmd_output.status.success());
 
     let results_raw = &String::from_utf8_lossy(&cmd_output.stderr);
-    debug!("{}", results_raw);
+    info!("{}", results_raw);
   }
 }