6 Commits

Author SHA1 Message Date
70e2b29121 Added logging functionality via log4rs crate
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-09-01 16:16:27 -04:00
23288ac043 Added DEBHELPER token to postinst script
All checks were successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2022-09-01 15:52:21 -04:00
e7fe6fbcec Updated post install script 2022-09-01 15:44:28 -04:00
e43ce790cc Version bump to v0.1.1 2022-09-01 15:30:38 -04:00
5f9a2829f0 Fixed a couple small errors in the Linux packaging config 2022-09-01 15:30:23 -04:00
e14795c493 Added a simple program loop to repeatedly check for new video files 2022-09-01 15:29:24 -04:00
7 changed files with 168 additions and 132 deletions

View File

@ -1,13 +1,15 @@
[package] [package]
name = "adept" name = "adept"
description = "Bit Goblin automated video transcoding service." description = "Bit Goblin automated video transcoding service."
version = "0.1.0" version = "0.1.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>"]
[dependencies] [dependencies]
log = "0.4"
log4rs = "1.1"
toml = "0.5" toml = "0.5"
serde = "1.0" serde = "1.0"
serde_derive = "1.0" serde_derive = "1.0"
@ -15,7 +17,7 @@ shellexpand = "2.1"
[package.metadata.deb] [package.metadata.deb]
license-file = "LICENSE" license-file = "LICENSE"
maintainer-scripts = "build/debian/scripts" maintainer-scripts = "build/scripts"
depends = "ffmpeg (>= 4)" depends = "ffmpeg (>= 4)"
section = "video" section = "video"
assets = [ assets = [
@ -35,6 +37,6 @@ assets = [
{ source = "build/etc/example.toml", dest = "/etc/adept/example.toml", mode = "755"}, { source = "build/etc/example.toml", dest = "/etc/adept/example.toml", mode = "755"},
{ source = "README.md", dest = "/usr/share/doc/adept/README", mode = "644"} { source = "README.md", dest = "/usr/share/doc/adept/README", mode = "644"}
] ]
post_install_script = "build/script/postinst" post_install_script = "build/scripts/postinst"
[package.metadata.generate-rpm.requires] [package.metadata.generate-rpm.requires]
ffmpeg = ">= 4" ffmpeg = ">= 4"

View File

@ -20,3 +20,7 @@ fi
# Change the directory ownership of /etc # Change the directory ownership of /etc
chown -R adept:adept /etc/adept chown -R adept:adept /etc/adept
#DEBHELPER#
exit 0

12
log4rs.yaml Normal file
View File

@ -0,0 +1,12 @@
appenders:
stdout:
kind: console
encoder:
pattern: "{d(%+)(utc)} {h({l})}: {m}{n}"
filters:
- kind: threshold
level: info
root:
level: info
appenders:
- stdout

View File

@ -1,3 +1,4 @@
use log4rs;
use config::Config; use config::Config;
use repository::Repository; use repository::Repository;
use transcoder::Transcoder; use transcoder::Transcoder;
@ -7,6 +8,9 @@ mod repository;
mod transcoder; mod transcoder;
fn main() { fn main() {
// initialize the log4rs logger
log4rs::init_file("./log4rs.yaml", Default::default()).unwrap();
// create and initialize our config and repository objects // create and initialize our config and repository objects
let c: Config = Config::new("~/.config/adept.toml"); let c: Config = Config::new("~/.config/adept.toml");
let r: Repository = Repository::new(&c.get_repository()); let r: Repository = Repository::new(&c.get_repository());

View File

@ -1,5 +1,6 @@
use std::fs; use std::fs;
use std::path::Path; use std::path::Path;
use log::{error, info};
pub struct Repository { pub struct Repository {
pub base_dir: String, pub base_dir: String,
@ -53,10 +54,10 @@ impl Repository {
match fs::copy(&ingest_file, &archive_file) { match fs::copy(&ingest_file, &archive_file) {
Ok(_) => { Ok(_) => {
println!("Archiving video file {}.", ingest_file.to_str().unwrap()); info!("Archiving video file {}.", ingest_file.to_str().unwrap());
}, },
Err(e) => { Err(e) => {
eprintln!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e); error!("Error archiving file {}: {}", ingest_file.to_str().unwrap(), e);
std::process::exit(1); std::process::exit(1);
} }
} }
@ -72,14 +73,14 @@ impl Repository {
fn create_directory(path: &str) { fn create_directory(path: &str) {
let d = Path::new(path); let d = Path::new(path);
if d.is_dir() { if d.is_dir() {
println!("Directory {} already exists.", path); info!("Directory {} already exists.", path);
} else { } else {
match fs::create_dir(path) { match fs::create_dir(path) {
Ok(_) => { Ok(_) => {
println!("Creating directory {}.", path); info!("Creating directory {}.", path);
}, },
Err(e) => { Err(e) => {
eprintln!("Error creating {}: {}", path, e); error!("Error creating {}: {}", path, e);
std::process::exit(1); std::process::exit(1);
} }
} }

View File

@ -1,5 +1,7 @@
use std::path::Path; use std::path::Path;
use std::process; use std::process;
use std::{thread, time};
use log::{info};
use crate::config::Config; use crate::config::Config;
use crate::repository::Repository; use crate::repository::Repository;
@ -18,11 +20,16 @@ impl Transcoder {
} }
pub fn start(self) { pub fn start(self) {
println!("Starting transcoder..."); info!("Starting transcoder...");
loop {
// search for files in ingest // search for files in ingest
let ingest_files = self.repository.search_ingest(); let ingest_files = self.repository.search_ingest();
// check if we found any files to transcode
if ingest_files.len() < 1 {
info!("There were no files found in ingest to transcode; skipping run.");
} else {
for i in ingest_files { for i in ingest_files {
// copy the file to the archive // copy the file to the archive
self.repository.archive_file(&i); self.repository.archive_file(&i);
@ -35,6 +42,12 @@ impl Transcoder {
} }
} }
// put the loop to sleep for X minutes
let sleep_minutes = time::Duration::from_secs((self.config.transcoder.interval * 60).into());
thread::sleep(sleep_minutes);
}
}
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 output_file = Path::new(&self.repository.output_dir).join(file);
@ -56,6 +69,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);
println!("{}", results_raw); info!("{}", results_raw);
} }
} }