Version bump to v0.3.0

.gitignore

@@ -3,3 +3,4 @@
 .settings/
 target/
 .idea/
+logs/

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.bitgoblin</groupId>
     <artifactId>Dragoon</artifactId>
-    <version>0.2.0</version>
+    <version>0.3.0</version>
 
     <name>Dragoon</name>
     <url>https://www.bitgoblin.tech</url>
@@ -23,6 +23,16 @@
             <artifactId>tomlj</artifactId>
             <version>1.0.0</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-api</artifactId>
+            <version>2.17.2</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-core</artifactId>
+            <version>2.17.2</version>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>

src/main/java/tech/bitgoblin/App.java

@@ -14,13 +14,16 @@ public class App {
 
   private static final String configFile = "~/.config/dragoon.toml";
 
+  private static final int msToMinutes = 60 * 1000;
+
   public static void main(String[] args) {
     // read our config file
     Config c = new Config(configFile);
     // create new Transcoder object and start the service
     Transcoder t = new Transcoder(c);
     Timer timer = new Timer();
-    timer.scheduleAtFixedRate(new RunTranscoderTask(t), 2500, 120 * 1000);
+    timer.scheduleAtFixedRate(new RunTranscoderTask(t), 2500, ((long) c.getInt("transcoder.interval") * msToMinutes));
+    Logger.logger.info(String.format("Starting transcoder, running in %d minute intervals.", c.getInt("transcoder.interval")));
   }
 
 }

src/main/java/tech/bitgoblin/Logger.java

@@ -0,0 +1,9 @@
+package tech.bitgoblin;
+
+import org.apache.logging.log4j.LogManager;
+
+public class Logger {
+
+  public static org.apache.logging.log4j.Logger logger = LogManager.getLogger();
+
+}

src/main/java/tech/bitgoblin/config/Config.java

@@ -8,6 +8,7 @@ import java.util.Objects;
 
 import org.tomlj.Toml;
 import org.tomlj.TomlParseResult;
+import tech.bitgoblin.Logger;
 import tech.bitgoblin.io.IOUtils;
 
 public class Config {
@@ -21,7 +22,7 @@ public class Config {
     try {
       this.parseConfig();
     } catch (IOException e) {
-      System.out.println("Unable to read config file; please check that " + this.configPath + " is available.");
+      Logger.logger.info("Unable to read config file; please check that " + this.configPath + " is available.");
       System.exit(1);
     }
   }
@@ -31,7 +32,7 @@ public class Config {
   }
 
   public int getInt(String key) {
-    return Objects.requireNonNull(this.result.getDouble(key)).intValue();
+    return Objects.requireNonNull(this.result.getLong(key)).intValue();
   }
 
   public boolean contains(String key) {

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

@@ -0,0 +1,74 @@
+package tech.bitgoblin.transcoder;
+
+import tech.bitgoblin.Logger;
+import tech.bitgoblin.io.IOUtils;
+
+import java.io.File;
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.nio.file.StandardCopyOption;
+
+public class Repository {
+
+  private String repoPath;
+  private String ingestPath;
+  private String outputPath;
+  private String archivePath;
+
+  public Repository(String repoPath) {
+    this.repoPath = IOUtils.resolveTilda(repoPath);
+    this.ingestPath = Paths.get(this.repoPath, "ingest").toString();
+    this.outputPath = Paths.get(this.repoPath, "output").toString();
+    this.archivePath = Paths.get(this.repoPath, "archive").toString();
+  }
+
+  // initializes the video repository
+  public void init() {
+    String[] dirs = {this.repoPath, this.ingestPath, this.outputPath, this.archivePath};
+    for (String p : dirs) {
+      IOUtils.createDirectory(p);
+    }
+  }
+
+  // searches this ingest directory for video files
+  public File[] searchIngest() {
+    Logger.logger.info("Searching for files to transcode in " + this.ingestPath);
+    File repo = new File(this.ingestPath);
+    return repo.listFiles();
+  }
+
+  // archives files in the ingest directory
+  public void archiveIngest(File[] sourceFiles) {
+    for (File f : sourceFiles) {
+      Path filePath = Path.of(f.toString());
+      String filename = filePath.getFileName().toString();
+      String archivePath = Paths.get(this.archivePath, filename).toString();
+
+      try {
+        Files.copy(filePath, Paths.get(archivePath), StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
+      } catch (IOException e) {
+        throw new RuntimeException(e);
+      }
+    }
+  }
+
+  // clean up the ingest directory once we're done
+  public void cleanupIngest(File[] sourceFiles) {
+    for (File f : sourceFiles) {
+      f.delete();
+    }
+  }
+
+  // returns the repository's path
+  public String getPath() {
+    return this.repoPath;
+  }
+
+  // return the repository's output path
+  public String getOutputPath() {
+    return this.outputPath;
+  }
+
+}

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

@@ -13,11 +13,7 @@ public class RunTranscoderTask extends TimerTask {
   @Override
   public void run() {
     // archive the files
-    transcoder.archive();
-    // run the transcoder
-    transcoder.transcode();
-    // clean up ingest
-    transcoder.cleanup();
+    transcoder.run();
   }
 
 }

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

@@ -10,49 +10,53 @@ import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 import java.util.Timer;
 
+import tech.bitgoblin.Logger;
 import tech.bitgoblin.config.Config;
 import tech.bitgoblin.io.IOUtils;
 
 public class Transcoder {
 
-  private String repo_dir;
+  private Repository repo;
   private Config config;
   private String ffmpeg_path = "/usr/bin/ffmpeg";
 
   // only define the working directory; use default FFMPEG path
   public Transcoder(Config config) {
     this.config = config;
-    this.repo_dir = IOUtils.resolveTilda(this.config.getString("transcoder.repo_path"));
+    this.repo = new Repository(this.config.getString("transcoder.repo_path"));
     if (this.config.contains("transcoder.ffmpeg_path")) {
       this.ffmpeg_path = this.config.getString("transcoder.ffmpeg_path");
     }
-    this.initDirectory();
+    this.repo.init();
   }
 
   // create a periodic timer task and start it
-  public void start() {
-    Timer timer = new Timer();
-    timer.scheduleAtFixedRate(new RunTranscoderTask(this), 10000, this.config.getInt("transcoder.interval") * 60 * 1000);
+  public void run() {
+    // pull list of files to transcode
+    File[] sourceFiles = this.repo.searchIngest();
+
+    // archive files
+    this.repo.archiveIngest(sourceFiles);
+    // transcode files
+    this.transcode(sourceFiles);
+    // cleanup old files
+    this.repo.cleanupIngest(sourceFiles);
   }
 
   // transcode files in the working directory
-  public void transcode() {
-    // search for files
-    System.out.println("Searching for files to transcode in " + this.repo_dir);
-    File repo = new File(Paths.get(this.repo_dir, "ingest").toString());
-    File[] sourceFiles = repo.listFiles();
-
+  public void transcode(File[] sourceFiles) {
+    // check if the ingest directory is empty
     if (sourceFiles.length == 0) {
-      System.out.println("There is nothing to transcode in " + this.repo_dir + "/ingest.");
+      Logger.logger.info("There is nothing to transcode in ingest.");
       return;
     }
 
     // transcode
-    System.out.println("Transcoding files in " + this.repo_dir + "/ingest...");
+    Logger.logger.info("Transcoding video files ingest...");
     for (File f : sourceFiles) {
       String filePath = f.toString().substring(0, f.toString().lastIndexOf("."));
       String filename = Paths.get(filePath).getFileName().toString();
-      String outputPath = Paths.get(this.repo_dir, "output", String.format("%s.mov", filename)).toString();
+      String outputPath = Paths.get(this.repo.getOutputPath(), String.format("%s.mov", filename)).toString();
 
       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
@@ -70,55 +74,16 @@ public class Transcoder {
       try {
         Process process = pb.start();
         int ret = process.waitFor();
-        System.out.printf("Program exited with code: %d\n", ret);
-        System.out.println(String.join(" ", pb.command()));
-        System.out.println();
+        Logger.logger.info("Program exited with code: %d", ret);
+        Logger.logger.info("");
       } catch (IOException | InterruptedException e) {
         throw new RuntimeException(e);
       }
     }
 
     // end output
-    System.out.println("------------ End of transcoding ------------");
-    System.out.println();
-  }
-
-  // copies sources files to the archive directory
-  public void archive() {
-    File repo = new File(Paths.get(this.repo_dir, "ingest").toString());
-    File[] sourceFiles = repo.listFiles();
-
-    for (File f : sourceFiles) {
-      Path filePath = Path.of(f.toString());
-      String filename = filePath.getFileName().toString();
-      String archivePath = Paths.get(this.repo_dir, "archive", filename).toString();
-
-      try {
-        Files.copy(filePath, Paths.get(archivePath), StandardCopyOption.COPY_ATTRIBUTES, StandardCopyOption.REPLACE_EXISTING);
-      } catch (IOException e) {
-        throw new RuntimeException(e);
-      }
-    }
-  }
-
-  // clean up the ingest directory once we're done
-  public void cleanup() {
-    File repo = new File(Paths.get(this.repo_dir, "ingest").toString());
-    File[] sourceFiles = repo.listFiles();
-
-    for (File f : sourceFiles) {
-      f.delete();
-    }
-  }
-
-  // ensures the transcoder's working directory is available
-  private void initDirectory() {
-    // create transcoder directory
-    IOUtils.createDirectory(this.repo_dir);
-    // create the sub-directories
-    IOUtils.createDirectory(Paths.get(this.repo_dir, "ingest").toString());
-    IOUtils.createDirectory(Paths.get(this.repo_dir, "archive").toString());
-    IOUtils.createDirectory(Paths.get(this.repo_dir, "output").toString());
+    Logger.logger.info("------------ End of transcoding ------------");
+    Logger.logger.info("");
   }
 
 }

src/main/resources/log4j2.xml

@@ -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>