Updating woodpecker images to rust 1.80

.woodpecker.yml

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

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "zealot"
 description = "Bit Goblin automated video transcoding service."
-version = "0.2.6"
+version = "0.2.7"
 edition = "2021"
 readme = "README.md"
 license = "BSD 2-Clause"

Dockerfile

@@ -0,0 +1,7 @@
+FROM rust:1.80
+
+WORKDIR /src
+
+RUN apt update
+RUN apt install -y lsof
+

bin/cargo.sh

@@ -0,0 +1 @@
+docker-cargo.sh

bin/docker-cargo.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker run --rm -v $(pwd):/src --name zealot zealot cargo $@
+

bin/docker-image.sh

@@ -0,0 +1,4 @@
+#!/bin/sh
+
+docker build -t zealot .
+

src/transcoder/transcoder.rs

@@ -73,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")
+    let binding = process::Command::new("/usr/bin/ffmpeg");
-      .arg("-i")        .arg(&*ingest_file.to_string_lossy())
+    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("-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("-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()
       .expect("Failed to execute command");