Compare commits
No commits in common. "master" and "v0.2.1" have entirely different histories.
@ -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"
|
||||||
@ -30,49 +30,3 @@ 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
|
|
||||||
|
@ -1,17 +1,15 @@
|
|||||||
[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.1"
|
||||||
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"
|
||||||
|
@ -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!("===================================================================================");
|
|
||||||
}
|
|
||||||
|
@ -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 => {
|
||||||
|
@ -1,8 +1,6 @@
|
|||||||
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,
|
||||||
@ -60,7 +58,6 @@ 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);
|
||||||
@ -92,16 +89,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.");
|
|
||||||
}
|
|
||||||
|
@ -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::{debug, info};
|
use log::{info};
|
||||||
|
|
||||||
use crate::util::io;
|
use crate::util::io;
|
||||||
use super::repository::Repository;
|
use super::repository::Repository;
|
||||||
@ -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
|
||||||
@ -64,43 +57,25 @@ 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 video_format = &self.config.get_string("transcoder.video_format").unwrap();
|
let output_file = Path::new(&self.repository.output_dir).join(file);
|
||||||
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 video_codec = &self.config.get_string("transcoder.video_codec").unwrap();
|
let cmd_output = process::Command::new("/usr/bin/ffmpeg")
|
||||||
info!("Transcoding {} to {} with the {} encoder.", ingest_file.display(), output_file.display(), video_codec);
|
.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("-y")
|
||||||
.arg("-f") .arg(&video_format)
|
.arg("-f") .arg(&self.config.get_string("transcoder.video_format").unwrap())
|
||||||
.arg("-c:v") .arg(&video_codec);
|
.arg("-c:v") .arg(&self.config.get_string("transcoder.video_codec").unwrap())
|
||||||
|
.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");
|
||||||
|
|
||||||
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);
|
||||||
debug!("{}", results_raw);
|
info!("{}", results_raw);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user