Compare commits

..

No commits in common. "master" and "v0.2.5" have entirely different histories.

5 changed files with 11 additions and 52 deletions

View File

@ -1,13 +1,13 @@
pipeline: pipeline:
tests: tests:
image: rust:1.75 image: rust:1.63
commands: commands:
- "apt update" - "apt update"
- "apt install -y lsof" - "apt install -y lsof"
- "cargo test" - "cargo test"
build_release: build_release:
image: rust:1.75 image: rust:1.63
commands: commands:
- "cargo install cargo-deb cargo-generate-rpm" - "cargo install cargo-deb cargo-generate-rpm"
- "cargo build --release" - "cargo build --release"

View File

@ -1,12 +1,11 @@
[package] [package]
name = "zealot" name = "zealot"
description = "Bit Goblin automated video transcoding service." description = "Bit Goblin automated video transcoding service."
version = "0.2.7" version = "0.2.5"
edition = "2021" edition = "2021"
readme = "README.md" readme = "README.md"
license = "BSD 2-Clause" license = "BSD 2-Clause"
authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"] authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
repository = "https://git.metaunix.net/BitGoblin/zealot"
[dependencies] [dependencies]
clap = { version = "3.2", features = ['derive'] } clap = { version = "3.2", features = ['derive'] }

View File

@ -18,21 +18,3 @@ pub fn setup_command() {
// initialize the video repository // initialize the video repository
r.initialize(); 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!("===================================================================================");
}

View File

@ -22,11 +22,8 @@ struct Cli {
#[derive(Subcommand)] #[derive(Subcommand)]
enum Commands { enum Commands {
// Runs the setup command /// displays version info about this program
Setup {}, Setup {},
// Displays version info about the program
Version {},
} }
fn main() { fn main() {
@ -40,7 +37,6 @@ fn main() {
match &cli.command { match &cli.command {
// sub-commands will be handled here // sub-commands will be handled here
Some(Commands::Setup {}) => cmd::core::setup_command(), Some(Commands::Setup {}) => cmd::core::setup_command(),
Some(Commands::Version {}) => cmd::core::version_command(),
// run the main program without any commands // run the main program without any commands
None => { None => {

View File

@ -31,10 +31,6 @@ impl Transcoder {
if ingest_files.len() < 1 { if ingest_files.len() < 1 {
info!("There were no files found in ingest to transcode; skipping run."); info!("There were no files found in ingest to transcode; skipping run.");
} else { } 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 { for i in ingest_files {
let ingest_path = Path::new(&self.repository.ingest_dir).join(&i); let ingest_path = Path::new(&self.repository.ingest_dir).join(&i);
if io::is_file_locked(&ingest_path.to_str().unwrap()) { if io::is_file_locked(&ingest_path.to_str().unwrap()) {
@ -51,9 +47,6 @@ impl Transcoder {
// remove the source file // remove the source file
self.repository.cleanup_file(&i); 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 // put the loop to sleep for X minutes
@ -73,28 +66,17 @@ impl Transcoder {
let video_codec = &self.config.get_string("transcoder.video_codec").unwrap(); 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); info!("Transcoding {} to {} with the {} encoder.", ingest_file.display(), output_file.display(), video_codec);
let binding = process::Command::new("/usr/bin/ffmpeg"); let cmd_output = process::Command::new("/usr/bin/ffmpeg")
let mut cmd = binding; .arg("-i") .arg(&*ingest_file.to_string_lossy())
// start building the command
cmd.arg("-i") .arg(&*ingest_file.to_string_lossy())
.arg("-y") .arg("-y")
.arg("-f") .arg(&video_format) .arg("-f") .arg(&video_format)
.arg("-c:v") .arg(&video_codec); .arg("-c:v") .arg(&video_codec)
.arg("-s") .arg(&self.config.get_string("transcoder.video_resolution").unwrap())
// add video resolution if it's available .arg("-r") .arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
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("-vf") .arg(format!("format={}", &self.config.get_string("transcoder.video_color").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("-profile:v").arg(&self.config.get_string("transcoder.video_profile").unwrap())
.arg("-c:a") .arg(&self.config.get_string("transcoder.audio_codec").unwrap()); .arg("-c:a") .arg(&self.config.get_string("transcoder.audio_codec").unwrap())
.arg(&*output_file.to_string_lossy())
// finish the command and run it
let cmd_output = cmd.arg(&*output_file.to_string_lossy())
.output() .output()
.expect("Failed to execute command"); .expect("Failed to execute command");