README.md

@@ -2,30 +2,6 @@
 
 The Bit Goblin video transcoder.
 
-## Installing from RPM
-
-Installing from the Bit Goblin repository is easy! Add the following repo file to `/etc/yum.repos.d/bitgoblin.repo`:
-
-```
-[bitgoblin]
-name=Bit Goblin repository
-baseurl=http://repo.metaunix.net/dnf
-enabled=1
-gpgcheck=0
-```
-
-Update your package sources just to make sure all was added properly:
-
-```
-dnf updateinfo
-```
-
-Then install dragoon! Use the command below if you DON'T want DNF to install a bunch of unnecessary stuff to meet OpenJDK's weak dependencies; otherwise a regular `dnf install dragoon` is fine:
-
-```
-dnf --setopt=install_weak_deps=False --best install dragoon
-```
-
 ## Building
 
 Currently this project is targeting Java 17 LTS and uses Maven to manage the software lifecycle. Thus, you must have a Java 17 JDK and Maven installed to build this project.

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.bitgoblin</groupId>
     <artifactId>dragoon</artifactId>
-    <version>0.3.12</version>
+    <version>0.3.8</version>
 
     <name>Dragoon</name>
     <url>https://www.bitgoblin.tech</url>
@@ -238,7 +238,7 @@
                     </mappings>
                     <requires>
                         <require>java-17-openjdk</require>
-                        <require>ffmpeg-free</require>
+                        <require>ffmpeg</require>
                     </requires>
                     <preinstallScriptlet>
                         <script>echo "installing ${project.name} now"</script>

src/build/deb/opt/dragoon/log4j2.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Configuration status="info" name="Dragoon" packages="">
     <Appenders>
-        <File name="DragoonLog" fileName="/opt/dragoon/logs/dragoon.log">
+        <File name="DragoonLog" fileName="logs/dragoon.log">
             <PatternLayout>
                 <Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
             </PatternLayout>

src/main/java/tech/bitgoblin/transcoder/Transcoder.java

@@ -63,28 +63,18 @@ public class Transcoder {
     String filename = Paths.get(filePath).getFileName().toString();
     String outputPath = Paths.get(this.repo.getOutputPath(), String.format("%s.mov", filename)).toString();
 
-    // build the custom video parameters string
-    String videoParameters = String.format("scale=%s,fps=%s,format=%s",
-        this.config.getString("transcoder.video_resolution"), // video resolution
-        this.config.getString("transcoder.video_framerate"), // video frame rate
-        this.config.getString("transcoder.video_color") // video color format
-    );
-
-    String cmd = String.format("%s -i INPUT_FILE -y -f %s -c:v %s -vf %s -profile:v %s -c:a %s OUTPUT_FILE",
+    String cmd = String.format("%s -i %s -y -f %s -c:v %s -vf %s -profile:v %s -c:a %s %s",
       this.ffmpeg_path, // FFMPEG binary path
+      sourceFile.toString(), // input file
       this.config.getString("transcoder.video_format"), // video container format
       this.config.getString("transcoder.video_codec"), // video codec
-      videoParameters, // custom video parameters
+      this.config.getString("transcoder.video_parameters"), // video format
       this.config.getString("transcoder.video_profile"), // video profile
-      this.config.getString("transcoder.audio_codec") // audio codec
+      this.config.getString("transcoder.audio_codec"), // audio codec
+      outputPath // output file path
     );
 
-    String[] cmdArr = cmd.split("\\s+");
-    cmdArr[2] = sourceFile.toString();
-    cmdArr[cmdArr.length - 1] = outputPath;
-    System.out.println(String.join(" ", cmdArr));
-
-    ProcessBuilder pb = new ProcessBuilder(cmdArr);
+    ProcessBuilder pb = new ProcessBuilder(cmd.split("\\s+"));
     pb.inheritIO(); // use the java processes' input and output streams
     try {
       Process process = pb.start();