Compare commits
No commits in common. "master" and "v0.3.1" have entirely different histories.
@ -1,23 +1,15 @@
|
||||
pipeline:
|
||||
test:
|
||||
image: maven:3-eclipse-temurin-17-alpine
|
||||
image: maven:3-jdk-11
|
||||
commands:
|
||||
- apk add lsof
|
||||
- apt update && apt install -y lsof
|
||||
- mvn test
|
||||
|
||||
build:
|
||||
image: maven:3-eclipse-temurin-17-alpine
|
||||
image: maven:3-jdk-11
|
||||
commands:
|
||||
- mvn clean compile assembly:single
|
||||
|
||||
package:
|
||||
image: maven:3-eclipse-temurin-17-alpine
|
||||
commands:
|
||||
- apk add rpm
|
||||
- mvn clean compile package -Dmaven.test.skip
|
||||
when:
|
||||
event: tag
|
||||
|
||||
gitea_release:
|
||||
image: plugins/gitea-release
|
||||
settings:
|
||||
@ -26,54 +18,6 @@ pipeline:
|
||||
base_url: https://git.metaunix.net
|
||||
title: "${CI_COMMIT_TAG}"
|
||||
files:
|
||||
- target/dragoon-*.jar
|
||||
- target/dragoon-*.deb
|
||||
- target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
|
||||
when:
|
||||
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/dragoon/
|
||||
source: target/dragoon-*.deb
|
||||
strip_components: 1
|
||||
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/dragoon/
|
||||
source: target/rpm/dragoon/RPMS/noarch/dragoon-*.rpm
|
||||
strip_components: 5
|
||||
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
|
||||
- target/Dragoon-*.jar
|
||||
when:
|
||||
event: tag
|
||||
|
||||
32
README.md
32
README.md
@ -2,41 +2,19 @@
|
||||
|
||||
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.
|
||||
Currently this project is targeting Java 11 LTS and uses Maven to manage the software lifecycle. Thus, you must have a Java 11 JDK and Maven installed to build this project.
|
||||
|
||||
*NOTE:* The targeted Java version will likely change to 17 LTS soon.
|
||||
|
||||
### Ubuntu
|
||||
|
||||
`sudo apt install openjdk-17-jdk maven`
|
||||
`sudo apt install openjdk-11-jdk maven`
|
||||
|
||||
### Red Hat/Almalinux
|
||||
|
||||
`sudo dnf install java-17-openjdk-devel maven`
|
||||
`sudo dnf install java-11-openjdk-devel maven`
|
||||
|
||||
### Actually Building
|
||||
|
||||
|
||||
314
pom.xml
314
pom.xml
@ -5,48 +5,19 @@
|
||||
<modelVersion>4.0.0</modelVersion>
|
||||
|
||||
<groupId>tech.bitgoblin</groupId>
|
||||
<artifactId>dragoon</artifactId>
|
||||
<version>0.3.12</version>
|
||||
<artifactId>Dragoon</artifactId>
|
||||
<version>0.3.1</version>
|
||||
|
||||
<name>Dragoon</name>
|
||||
<url>https://www.bitgoblin.tech</url>
|
||||
<description>Automated video transcoder service.</description>
|
||||
<inceptionYear>2022</inceptionYear>
|
||||
|
||||
<organization>
|
||||
<name>Bit Goblin</name>
|
||||
<url>https://www.bitgoblin.tech</url>
|
||||
</organization>
|
||||
|
||||
<developers>
|
||||
<developer>
|
||||
<id>gballantine</id>
|
||||
<name>Gregory Ballantine</name>
|
||||
<email>gballantine@bitgoblin.tech</email>
|
||||
</developer>
|
||||
</developers>
|
||||
|
||||
<licenses>
|
||||
<license>
|
||||
<name>BSD</name>
|
||||
<url>https://opensource.org/licenses/BSD-2-Clause</url>
|
||||
<distribution>repo</distribution>
|
||||
<comments>Simplified BSD license.</comments>
|
||||
</license>
|
||||
</licenses>
|
||||
|
||||
<properties>
|
||||
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
|
||||
<maven.compiler.source>17</maven.compiler.source>
|
||||
<maven.compiler.target>17</maven.compiler.target>
|
||||
<maven.compiler.source>11</maven.compiler.source>
|
||||
<maven.compiler.target>11</maven.compiler.target>
|
||||
</properties>
|
||||
|
||||
<dependencies>
|
||||
<dependency>
|
||||
<groupId>commons-cli</groupId>
|
||||
<artifactId>commons-cli</artifactId>
|
||||
<version>1.3.1</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.tomlj</groupId>
|
||||
<artifactId>tomlj</artifactId>
|
||||
@ -55,12 +26,12 @@
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-api</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>2.17.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.apache.logging.log4j</groupId>
|
||||
<artifactId>log4j-core</artifactId>
|
||||
<version>2.19.0</version>
|
||||
<version>2.17.2</version>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>junit</groupId>
|
||||
@ -71,202 +42,81 @@
|
||||
</dependencies>
|
||||
|
||||
<build>
|
||||
<plugins>
|
||||
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
|
||||
<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.22.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<configuration>
|
||||
<!-- DO NOT include log4j.properties file in your Jar -->
|
||||
<excludes>
|
||||
<exclude>**/log4j.properties</exclude>
|
||||
</excludes>
|
||||
<archive>
|
||||
<manifest>
|
||||
<!-- Jar file entry point -->
|
||||
<mainClass>tech.bitgoblin.App</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>tech.bitgoblin.App</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>com.aerse.maven</groupId>
|
||||
<artifactId>deb-maven-plugin</artifactId>
|
||||
<version>1.16</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>package</id>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>package</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<unixUserId>dragoon</unixUserId>
|
||||
<unixGroupId>dragoon</unixGroupId>
|
||||
<debBaseDir>${project.basedir}/src/build/deb</debBaseDir>
|
||||
<installDir>/opt</installDir>
|
||||
<osDependencies>
|
||||
<openjdk-17-jre></openjdk-17-jre>
|
||||
<ffmpeg></ffmpeg>
|
||||
</osDependencies>
|
||||
<javaServiceWrapper>false</javaServiceWrapper>
|
||||
<generateVersion>false</generateVersion>
|
||||
<fileSets>
|
||||
<fileSet>
|
||||
<source>${basedir}/src/build/deb</source>
|
||||
<target>/</target>
|
||||
</fileSet>
|
||||
<fileSet>
|
||||
<source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
|
||||
<target>/opt/dragoon/dragoon.jar</target>
|
||||
</fileSet>
|
||||
</fileSets>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<groupId>org.codehaus.mojo</groupId>
|
||||
<artifactId>rpm-maven-plugin</artifactId>
|
||||
<version>2.2.0</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>generate-rpm</id>
|
||||
<goals>
|
||||
<goal>rpm</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<license>BSD 2-Clause</license>
|
||||
<group>Applications/Multimedia</group>
|
||||
<icon>src/main/resources/icon.gif</icon>
|
||||
<packager>Bit Goblin</packager>
|
||||
<prefix>/opt</prefix>
|
||||
<changelogFile>${project.basedir}/src/build/changelog.txt</changelogFile>
|
||||
<targetOs>linux</targetOs>
|
||||
<mappings>
|
||||
<mapping>
|
||||
<directory>/opt/dragoon</directory>
|
||||
<filemode>755</filemode>
|
||||
<username>dragoon</username>
|
||||
<groupname>dragoon</groupname>
|
||||
</mapping>
|
||||
<mapping>
|
||||
<directory>/opt/dragoon/dragoon.jar</directory>
|
||||
<filemode>755</filemode>
|
||||
<username>dragoon</username>
|
||||
<groupname>dragoon</groupname>
|
||||
<sources>
|
||||
<source>
|
||||
<location>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</location>
|
||||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
<mapping>
|
||||
<directory>/opt/dragoon/log4j2.xml</directory>
|
||||
<filemode>755</filemode>
|
||||
<username>dragoon</username>
|
||||
<groupname>dragoon</groupname>
|
||||
<sources>
|
||||
<source>
|
||||
<location>${basedir}/src/build/deb/opt/dragoon/log4j2.xml</location>
|
||||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
<mapping>
|
||||
<directory>/etc/dragoon</directory>
|
||||
<configuration>true</configuration>
|
||||
<filemode>755</filemode>
|
||||
<username>dragoon</username>
|
||||
<groupname>dragoon</groupname>
|
||||
<sources>
|
||||
<source>
|
||||
<location>${project.basedir}/src/build/deb/etc/dragoon</location>
|
||||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
<mapping>
|
||||
<directory>/etc/systemd/system/dragoon.service</directory>
|
||||
<filemode>644</filemode>
|
||||
<username>root</username>
|
||||
<groupname>root</groupname>
|
||||
<sources>
|
||||
<source>
|
||||
<location>${project.basedir}/src/build/deb/etc/systemd/system/dragoon.service</location>
|
||||
</source>
|
||||
</sources>
|
||||
</mapping>
|
||||
</mappings>
|
||||
<requires>
|
||||
<require>java-17-openjdk</require>
|
||||
<require>ffmpeg-free</require>
|
||||
</requires>
|
||||
<preinstallScriptlet>
|
||||
<script>echo "installing ${project.name} now"</script>
|
||||
</preinstallScriptlet>
|
||||
<postinstallScriptlet>
|
||||
<scriptFile>src/build/scripts/postinstall.sh</scriptFile>
|
||||
<fileEncoding>utf-8</fileEncoding>
|
||||
<filter>true</filter>
|
||||
</postinstallScriptlet>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
</plugin>
|
||||
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
|
||||
<plugin>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.7.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
<pluginManagement><!-- lock down plugins versions to avoid using Maven defaults (may be moved to parent pom) -->
|
||||
<plugins>
|
||||
<!-- clean lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#clean_Lifecycle -->
|
||||
<plugin>
|
||||
<artifactId>maven-clean-plugin</artifactId>
|
||||
<version>3.1.0</version>
|
||||
</plugin>
|
||||
<!-- default lifecycle, jar packaging: see https://maven.apache.org/ref/current/maven-core/default-bindings.html#Plugin_bindings_for_jar_packaging -->
|
||||
<plugin>
|
||||
<artifactId>maven-resources-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-compiler-plugin</artifactId>
|
||||
<version>3.8.0</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-surefire-plugin</artifactId>
|
||||
<version>2.22.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-jar-plugin</artifactId>
|
||||
<version>3.0.2</version>
|
||||
<configuration>
|
||||
<!-- DO NOT include log4j.properties file in your Jar -->
|
||||
<excludes>
|
||||
<exclude>**/log4j.properties</exclude>
|
||||
</excludes>
|
||||
<archive>
|
||||
<manifest>
|
||||
<!-- Jar file entry point -->
|
||||
<mainClass>tech.bitgoblin.App</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-assembly-plugin</artifactId>
|
||||
<executions>
|
||||
<execution>
|
||||
<phase>package</phase>
|
||||
<goals>
|
||||
<goal>single</goal>
|
||||
</goals>
|
||||
</execution>
|
||||
</executions>
|
||||
<configuration>
|
||||
<archive>
|
||||
<manifest>
|
||||
<mainClass>tech.bitgoblin.App</mainClass>
|
||||
</manifest>
|
||||
</archive>
|
||||
<descriptorRefs>
|
||||
<descriptorRef>jar-with-dependencies</descriptorRef>
|
||||
</descriptorRefs>
|
||||
</configuration>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-install-plugin</artifactId>
|
||||
<version>2.5.2</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-deploy-plugin</artifactId>
|
||||
<version>2.8.2</version>
|
||||
</plugin>
|
||||
<!-- site lifecycle, see https://maven.apache.org/ref/current/maven-core/lifecycles.html#site_Lifecycle -->
|
||||
<plugin>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.7.1</version>
|
||||
</plugin>
|
||||
<plugin>
|
||||
<artifactId>maven-project-info-reports-plugin</artifactId>
|
||||
<version>3.0.0</version>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</pluginManagement>
|
||||
</build>
|
||||
</project>
|
||||
|
||||
@ -1 +0,0 @@
|
||||
# Check https://git.metaunix.net/bitgoblin/dragoon/releases for the current changelog
|
||||
@ -1,9 +0,0 @@
|
||||
# This example transcodes footage to DNxHD 1080p60 for use in video editors like DaVinci Resolve.
|
||||
[transcoder]
|
||||
repo_path = '~/videos' # location of the videos to transcode
|
||||
interval = 30
|
||||
video_format = 'mov' # video container format
|
||||
video_codec = 'dnxhd' # video codec to use
|
||||
video_parameters = 'scale=1920x1080,fps=60,format=yuv422p' # video extra format parameters flag - this will be broken later into separate attributes
|
||||
video_profile = 'dnxhr_hq' # DNxHD has multiple presets for various video qualities
|
||||
audio_codec = 'pcm_s16le' # audio codec to use
|
||||
@ -1,11 +0,0 @@
|
||||
[Unit]
|
||||
Description=Dragoon video transcoder service
|
||||
|
||||
[Service]
|
||||
User=dragoon
|
||||
Group=dragoon
|
||||
ExecStart=/usr/bin/java -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml -jar '/opt/dragoon/dragoon.jar' -c '/etc/dragoon/config.toml'
|
||||
SuccessExitStatus=143
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
@ -1,20 +0,0 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Configuration status="info" name="Dragoon" packages="">
|
||||
<Appenders>
|
||||
<File name="DragoonLog" fileName="/opt/dragoon/logs/dragoon.log">
|
||||
<PatternLayout>
|
||||
<Pattern>%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n</Pattern>
|
||||
</PatternLayout>
|
||||
</File>
|
||||
<Console name="Console" target="SYSTEM_OUT">
|
||||
<PatternLayout
|
||||
pattern="%highlight{%d [%t] %-5level: %msg%n%throwable}" />
|
||||
</Console>
|
||||
</Appenders>
|
||||
<Loggers>
|
||||
<Root level="info">
|
||||
<AppenderRef ref="DragoonLog"/>
|
||||
<AppenderRef ref="Console"/>
|
||||
</Root>
|
||||
</Loggers>
|
||||
</Configuration>
|
||||
@ -1,23 +0,0 @@
|
||||
#!/bin/sh
|
||||
|
||||
GETENT_USER=$(getent passwd dragoon)
|
||||
GETENT_GROUP=$(getent group dragoon)
|
||||
|
||||
# Create the dragoon user if it doesn't already exist
|
||||
if [ "$GETENT_USER" = "" ]; then
|
||||
useradd -r dragoon
|
||||
else
|
||||
echo "The 'dragoon' user already exists, skipping creation."
|
||||
fi
|
||||
|
||||
# Create the dragoon group if it doesn't already exist
|
||||
if [ "$GETENT_GROUP" = "" ]; then
|
||||
groupadd dragoon
|
||||
usermod -aG dragoon dragoon
|
||||
else
|
||||
echo "The 'dragoon' group already exists, skipping creation."
|
||||
fi
|
||||
|
||||
# Change the directory ownership of /opt and /etc
|
||||
chown -R dragoon:dragoon /etc/dragoon
|
||||
chown -R dragoon:dragoon /opt/dragoon
|
||||
@ -1,7 +1,5 @@
|
||||
package tech.bitgoblin;
|
||||
|
||||
import org.apache.commons.cli.ParseException;
|
||||
import tech.bitgoblin.config.Cmd;
|
||||
import tech.bitgoblin.config.Config;
|
||||
import tech.bitgoblin.transcoder.RunTranscoderTask;
|
||||
import tech.bitgoblin.transcoder.Transcoder;
|
||||
@ -14,15 +12,13 @@ import java.util.Timer;
|
||||
*/
|
||||
public class App {
|
||||
|
||||
private static final String configFile = "~/.config/dragoon.toml";
|
||||
|
||||
private static final int msToMinutes = 60 * 1000;
|
||||
|
||||
public static void main(String[] args) throws ParseException {
|
||||
// parse command-line options
|
||||
Cmd cmd = new Cmd(args);
|
||||
|
||||
public static void main(String[] args) {
|
||||
// read our config file
|
||||
Config c = new Config(cmd.getConfigPath());
|
||||
|
||||
Config c = new Config(configFile);
|
||||
// create new Transcoder object and start the service
|
||||
Transcoder t = new Transcoder(c);
|
||||
Timer timer = new Timer();
|
||||
|
||||
@ -4,6 +4,6 @@ import org.apache.logging.log4j.LogManager;
|
||||
|
||||
public class Logger {
|
||||
|
||||
public static org.apache.logging.log4j.Logger logger = LogManager.getRootLogger();
|
||||
public static org.apache.logging.log4j.Logger logger = LogManager.getLogger();
|
||||
|
||||
}
|
||||
|
||||
@ -1,30 +0,0 @@
|
||||
package tech.bitgoblin.config;
|
||||
|
||||
import org.apache.commons.cli.*;
|
||||
|
||||
public class Cmd {
|
||||
|
||||
private String configPath = "~/.config/dragoon.toml";
|
||||
|
||||
public Cmd(String[] args) throws ParseException {
|
||||
Options options = new Options();
|
||||
|
||||
Option configPath = new Option("c", "configPath", true, "configuration file path (defaults to /etc/dragoon/config.toml)");
|
||||
configPath.setRequired(false);
|
||||
options.addOption(configPath);
|
||||
|
||||
CommandLineParser parser = new DefaultParser();
|
||||
HelpFormatter formatter = new HelpFormatter();
|
||||
CommandLine cmd = parser.parse(options, args);
|
||||
|
||||
// set the configPath variable if the option was passed to the program
|
||||
if (cmd.hasOption("configPath")) {
|
||||
this.configPath = cmd.getOptionValue("configPath");
|
||||
}
|
||||
}
|
||||
|
||||
public String getConfigPath() {
|
||||
return this.configPath;
|
||||
}
|
||||
|
||||
}
|
||||
@ -1,5 +1,6 @@
|
||||
package tech.bitgoblin.config;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
|
||||
@ -1,5 +1,7 @@
|
||||
package tech.bitgoblin.io;
|
||||
|
||||
import tech.bitgoblin.Logger;
|
||||
|
||||
import java.io.*;
|
||||
|
||||
public class IOUtils {
|
||||
|
||||
@ -4,7 +4,11 @@ import java.io.File;
|
||||
import java.io.IOException;
|
||||
import java.lang.InterruptedException;
|
||||
import java.lang.Process;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.Path;
|
||||
import java.nio.file.Paths;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Timer;
|
||||
|
||||
import tech.bitgoblin.Logger;
|
||||
import tech.bitgoblin.config.Config;
|
||||
@ -63,28 +67,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();
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
@ -1,17 +0,0 @@
|
||||
package tech.bitgoblin.config;
|
||||
|
||||
import static org.junit.Assert.assertTrue;
|
||||
|
||||
import org.junit.Test;
|
||||
|
||||
import org.apache.commons.cli.ParseException;
|
||||
|
||||
public class CmdTest {
|
||||
|
||||
@Test
|
||||
public void shouldDefaultToHome() throws ParseException {
|
||||
Cmd cmd = new Cmd(new String[]{});
|
||||
assertTrue(cmd.getConfigPath().equals("~/.config/dragoon.toml"));
|
||||
}
|
||||
|
||||
}
|
||||
@ -8,6 +8,7 @@ import org.junit.BeforeClass;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.io.File;
|
||||
import java.io.FileNotFoundException;
|
||||
import java.io.IOException;
|
||||
import java.io.RandomAccessFile;
|
||||
|
||||
@ -37,7 +38,6 @@ public class IOUtilsTest {
|
||||
public void fileShouldBeLocked() throws IOException {
|
||||
RandomAccessFile raf = new RandomAccessFile(testFile, "rw");
|
||||
assertTrue(IOUtils.isFileLocked(new File(testFile)));
|
||||
raf.close();
|
||||
}
|
||||
|
||||
@Test
|
||||
|
||||
Loading…
Reference in New Issue
Block a user