Compare commits

..

18 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
6da120f632 Version bump to v0.2.3
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-26 20:13:29 -04:00
a22b59d87c Updated woodpecker config to put compiled packages into proper directories for organization
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-26 20:13:04 -04:00
dfca3b1fd6 Updated woodpecker config for pushing to Linux package repos
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-10-26 16:59:42 -04:00
530d83f57d Updated woodpecker config for pushing to Linux package repos
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-10-26 16:35:49 -04:00
d836e27305 Updated woodpecker config for pushing to Linux package repos
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/tag/woodpecker Pipeline failed
2022-10-26 16:25:35 -04:00
8bca6b3b0b Updated woodpecker config for pushing to Linux package repos
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-10-26 15:42:19 -04:00
958ffa397c Version bump to v0.2.2
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-10-26 12:21:01 -04:00
1671b95128 Changed the FFMPEG command output to get logged under debug to clean up log file
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-26 12:20:22 -04:00
3bcbabf1b6 Fixed output file naming; adding debug line so user knows that transcoding is taking place
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2022-10-26 12:15:39 -04:00
6 changed files with 126 additions and 15 deletions

View File

@ -1,13 +1,13 @@
pipeline: pipeline:
tests: tests:
image: rust:1.63 image: rust:1.75
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.63 image: rust:1.75
commands: commands:
- "cargo install cargo-deb cargo-generate-rpm" - "cargo install cargo-deb cargo-generate-rpm"
- "cargo build --release" - "cargo build --release"
@ -30,3 +30,49 @@ pipeline:
title: "${CI_COMMIT_TAG}" title: "${CI_COMMIT_TAG}"
when: when:
event: tag 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

View File

@ -1,15 +1,17 @@
[package] [package]
name = "zealot" name = "zealot"
description = "Bit Goblin automated video transcoding service." description = "Bit Goblin automated video transcoding service."
version = "0.2.1" version = "0.2.7"
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'] }
config = { version = "0.13", features = ['toml'] } config = { version = "0.13", features = ['toml'] }
filetime = "0.2"
log = "0.4" log = "0.4"
log4rs = "1.1" log4rs = "1.1"
toml = "0.5" toml = "0.5"

View File

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

@ -1,6 +1,8 @@
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use log::{error, info}; use log::{error, info};
use filetime;
use filetime::FileTime;
pub struct Repository { pub struct Repository {
pub base_dir: String, pub base_dir: String,
@ -58,6 +60,7 @@ impl Repository {
match fs::copy(&ingest_file, &archive_file) { match fs::copy(&ingest_file, &archive_file) {
Ok(_) => { Ok(_) => {
info!("Archiving video file {}.", ingest_file.to_str().unwrap()); info!("Archiving video file {}.", ingest_file.to_str().unwrap());
copy_file_metadata(ingest_file.to_str().unwrap(), archive_file.to_str().unwrap());
}, },
Err(e) => { Err(e) => {
error!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), 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

@ -2,7 +2,7 @@ use config::Config;
use std::path::Path; use std::path::Path;
use std::process; use std::process;
use std::{thread, time}; use std::{thread, time};
use log::{info}; use log::{debug, info};
use crate::util::io; use crate::util::io;
use super::repository::Repository; use super::repository::Repository;
@ -31,6 +31,10 @@ 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()) {
@ -47,6 +51,9 @@ 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
@ -57,25 +64,43 @@ impl Transcoder {
fn transcode(&self, file: &str) { fn transcode(&self, file: &str) {
let ingest_file = Path::new(&self.repository.ingest_dir).join(file); let ingest_file = Path::new(&self.repository.ingest_dir).join(file);
let output_file = Path::new(&self.repository.output_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 cmd_output = process::Command::new("/usr/bin/ffmpeg") let video_codec = &self.config.get_string("transcoder.video_codec").unwrap();
.arg("-i") .arg(&*ingest_file.to_string_lossy()) 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())
.arg("-y") .arg("-y")
.arg("-f") .arg(&self.config.get_string("transcoder.video_format").unwrap()) .arg("-f") .arg(&video_format)
.arg("-c:v") .arg(&self.config.get_string("transcoder.video_codec").unwrap()) .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())) // 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("-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");
assert!(cmd_output.status.success()); assert!(cmd_output.status.success());
let results_raw = &String::from_utf8_lossy(&cmd_output.stderr); let results_raw = &String::from_utf8_lossy(&cmd_output.stderr);
info!("{}", results_raw); debug!("{}", results_raw);
} }
} }