Compare commits
10 Commits
Author | SHA1 | Date | |
---|---|---|---|
f3552f3af1 | |||
6da120f632 | |||
a22b59d87c | |||
dfca3b1fd6 | |||
530d83f57d | |||
d836e27305 | |||
8bca6b3b0b | |||
958ffa397c | |||
1671b95128 | |||
3bcbabf1b6 |
@ -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
|
||||||
|
@ -1,7 +1,7 @@
|
|||||||
[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.3"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
readme = "README.md"
|
readme = "README.md"
|
||||||
license = "BSD 2-Clause"
|
license = "BSD 2-Clause"
|
||||||
@ -10,6 +10,7 @@ authors = ["Gregory Ballantine <gballantine@bitgoblin.tech>"]
|
|||||||
[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"
|
||||||
|
@ -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_times(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,14 @@ fn create_directory(path: &str) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn copy_file_times(old_file: &str, new_file: &str) {
|
||||||
|
// grab old file metadata
|
||||||
|
let old_metadata = fs::metadata(old_file).unwrap();
|
||||||
|
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);
|
||||||
|
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::{info};
|
use log::{debug, info};
|
||||||
|
|
||||||
use crate::util::io;
|
use crate::util::io;
|
||||||
use super::repository::Repository;
|
use super::repository::Repository;
|
||||||
@ -57,13 +57,20 @@ 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 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")
|
let cmd_output = process::Command::new("/usr/bin/ffmpeg")
|
||||||
.arg("-i") .arg(&*ingest_file.to_string_lossy())
|
.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("-s") .arg(&self.config.get_string("transcoder.video_resolution").unwrap())
|
||||||
.arg("-r") .arg(format!("{}", self.config.get_string("transcoder.video_framerate").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("-vf") .arg(format!("format={}", &self.config.get_string("transcoder.video_color").unwrap()))
|
||||||
@ -76,6 +83,6 @@ impl Transcoder {
|
|||||||
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);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user