6 Commits

Author SHA1 Message Date
095e5c2a84 Fixed typo in path
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-01-25 13:48:35 -05:00
0c77a7ab04 Fixed CmdTest
Some checks failed
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline failed
2023-01-25 13:45:02 -05:00
cfb1d09eb7 Version bump to v0.3.7
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
ci/woodpecker/tag/woodpecker Pipeline failed
2023-01-25 13:42:52 -05:00
bd4117df38 Fixed a few housekeeping things to make the linux packages more plug-and-play
Some checks failed
ci/woodpecker/push/woodpecker Pipeline failed
2023-01-25 13:42:36 -05:00
0eaf18822b Version bump to v0.3.6
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
ci/woodpecker/tag/woodpecker Pipeline was successful
2023-01-25 13:27:58 -05:00
7bdd4a5dfb Added log4j2.xml to linux packages to fix the deployment
All checks were successful
ci/woodpecker/push/woodpecker Pipeline was successful
2023-01-25 13:27:16 -05:00
6 changed files with 41 additions and 5 deletions

17
pom.xml
View File

@ -6,7 +6,7 @@
<groupId>tech.bitgoblin</groupId> <groupId>tech.bitgoblin</groupId>
<artifactId>dragoon</artifactId> <artifactId>dragoon</artifactId>
<version>0.3.5</version> <version>0.3.7</version>
<name>Dragoon</name> <name>Dragoon</name>
<url>https://www.bitgoblin.tech</url> <url>https://www.bitgoblin.tech</url>
@ -160,6 +160,10 @@
<source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source> <source>${basedir}/target/dragoon-${project.version}-jar-with-dependencies.jar</source>
<target>/opt/dragoon/dragoon.jar</target> <target>/opt/dragoon/dragoon.jar</target>
</fileSet> </fileSet>
<fileSet>
<source>${basedir}/src/build/opt/log4j2.xml</source>
<target>/opt/dragoon/log4j2.xml</target>
</fileSet>
</fileSets> </fileSets>
</configuration> </configuration>
</plugin> </plugin>
@ -201,6 +205,17 @@
</source> </source>
</sources> </sources>
</mapping> </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/log4j2.xml</location>
</source>
</sources>
</mapping>
<mapping> <mapping>
<directory>/etc/dragoon</directory> <directory>/etc/dragoon</directory>
<configuration>true</configuration> <configuration>true</configuration>

View File

@ -1,6 +1,7 @@
# This example transcodes footage to DNxHD 1080p60 for use in video editors like DaVinci Resolve. # This example transcodes footage to DNxHD 1080p60 for use in video editors like DaVinci Resolve.
[transcoder] [transcoder]
repo_path = '~/videos' # location of the videos to transcode repo_path = '~/videos' # location of the videos to transcode
interval = 30
video_format = 'mov' # video container format video_format = 'mov' # video container format
video_codec = 'dnxhd' # video codec to use 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_parameters = 'scale=1920x1080,fps=60,format=yuv422p' # video extra format parameters flag - this will be broken later into separate attributes

View File

@ -4,7 +4,7 @@ Description=Dragoon video transcoder service
[Service] [Service]
User=dragoon User=dragoon
Group=dragoon Group=dragoon
ExecStart=/usr/bin/java -jar '/opt/dragoon/dragoon.jar' ExecStart=/usr/bin/java -Dlog4j.configurationFile=/opt/dragoon/log4j2.xml -jar '/opt/dragoon/dragoon.jar' -c '/etc/dragoon/config.toml'
SuccessExitStatus=143 SuccessExitStatus=143
[Install] [Install]

View File

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
<Configuration status="info" name="Dragoon" packages="">
<Appenders>
<File name="DragoonLog" fileName="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>

View File

@ -4,7 +4,7 @@ import org.apache.commons.cli.*;
public class Cmd { public class Cmd {
private String configPath = "/etc/dragoon/config.toml"; private String configPath = "~/.config/dragoon.toml";
public Cmd(String[] args) throws ParseException { public Cmd(String[] args) throws ParseException {
Options options = new Options(); Options options = new Options();

View File

@ -9,9 +9,9 @@ import org.apache.commons.cli.ParseException;
public class CmdTest { public class CmdTest {
@Test @Test
public void shouldDefaultToEtc() throws ParseException { public void shouldDefaultToHome() throws ParseException {
Cmd cmd = new Cmd(new String[]{}); Cmd cmd = new Cmd(new String[]{});
assertTrue(cmd.getConfigPath().equals("/etc/dragoon/config.toml")); assertTrue(cmd.getConfigPath().equals("~/.config/dragoon.toml"));
} }
} }