Compare commits

..

9 Commits

Author SHA1 Message Date
d56f7f2f0f Upping to v0.2.7
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2024-01-18 23:43:10 -05:00
1cc8306fec Upgrading Rust version used in CI
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-18 23:42:39 -05:00
597b64c9c5 Made the video_resolution parameter optional
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2024-01-18 23:27:04 -05:00
e479959ca8 Version bump to v0.2.6
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-04-01 22:57:11 -04:00
ef492f6008 Added version command
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-04-01 22:55:51 -04:00
6371417234 Added log messages to signify a transcoding loop has started/ended
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-03-29 20:25:52 -04:00
a7cc2bc771 Version bump to v0.2.5
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-03-29 00:42:38 -04:00
ed4173f3dc Added file permissions preservation when archiving video file
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-03-29 00:40:33 -04:00
f3552f3af1 Added filetime crate to handle file handle times
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2023-01-25 10:06:05 -05:00
6 changed files with 69 additions and 11 deletions

View File

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

View File

@ -1,15 +1,17 @@
[package]
name = "zealot"
description = "Bit Goblin automated video transcoding service."
version = "0.2.3"
version = "0.2.7"
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"

View File

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

View File

@ -22,8 +22,11 @@ struct Cli {
#[derive(Subcommand)]
enum Commands {
/// displays version info about this program
// Runs the setup command
Setup {},
// Displays version info about the program
Version {},
}
fn main() {
@ -37,6 +40,7 @@ fn main() {
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 => {

View File

@ -1,6 +1,8 @@
use std::fs;
use std::path::Path;
use log::{error, info};
use filetime;
use filetime::FileTime;
pub struct Repository {
pub base_dir: String,
@ -58,6 +60,7 @@ 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);
@ -89,3 +92,16 @@ 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.");
}

View File

@ -31,6 +31,10 @@ 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()) {
@ -47,6 +51,9 @@ 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
@ -66,17 +73,28 @@ impl Transcoder {
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 cmd_output = process::Command::new("/usr/bin/ffmpeg")
.arg("-i") .arg(&*ingest_file.to_string_lossy())
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())
.arg("-y")
.arg("-f") .arg(&video_format)
.arg("-c:v") .arg(&video_codec)
.arg("-s") .arg(&self.config.get_string("transcoder.video_resolution").unwrap())
.arg("-r") .arg(format!("{}", self.config.get_string("transcoder.video_framerate").unwrap()))
.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("-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())
.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())
.output()
.expect("Failed to execute command");