From 1034488e9489ed04438ca6e90c98fe65ca8e9a61 Mon Sep 17 00:00:00 2001
From: 0xb00bface <0xboobface@gmail.com>
Date: Mon, 24 Aug 2020 15:15:34 +0200
Subject: [PATCH] Make RecorderServlet and RemoteRecorder compatible to new
 recording fields

---
 common/src/main/java/ctbrec/recorder/RemoteRecorder.java   | 7 ++++++-
 .../main/java/ctbrec/recorder/postprocessing/Renamer.java  | 4 ++--
 .../main/java/ctbrec/recorder/server/RecorderServlet.java  | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
index 5cec3296..37dcb6ec 100644
--- a/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
+++ b/common/src/main/java/ctbrec/recorder/RemoteRecorder.java
@@ -27,6 +27,7 @@ import ctbrec.event.EventBusHolder;
 import ctbrec.event.NoSpaceLeftEvent;
 import ctbrec.event.RecordingStateChangedEvent;
 import ctbrec.io.BandwidthMeter;
+import ctbrec.io.FileJsonAdapter;
 import ctbrec.io.HttpClient;
 import ctbrec.io.HttpException;
 import ctbrec.io.InstantJsonAdapter;
@@ -45,7 +46,11 @@ public class RemoteRecorder implements Recorder {
     private static final Logger LOG = LoggerFactory.getLogger(RemoteRecorder.class);
 
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
-    private Moshi moshi = new Moshi.Builder().add(Instant.class, new InstantJsonAdapter()).add(Model.class, new ModelJsonAdapter()).build();
+    private Moshi moshi = new Moshi.Builder()
+            .add(Instant.class, new InstantJsonAdapter())
+            .add(Model.class, new ModelJsonAdapter())
+            .add(File.class, new FileJsonAdapter())
+            .build();
     private JsonAdapter<ModelListResponse> modelListResponseAdapter = moshi.adapter(ModelListResponse.class);
     private JsonAdapter<RecordingListResponse> recordingListResponseAdapter = moshi.adapter(RecordingListResponse.class);
     private JsonAdapter<ModelRequest> modelRequestAdapter = moshi.adapter(ModelRequest.class);
diff --git a/common/src/main/java/ctbrec/recorder/postprocessing/Renamer.java b/common/src/main/java/ctbrec/recorder/postprocessing/Renamer.java
index af98ad55..291cecce 100644
--- a/common/src/main/java/ctbrec/recorder/postprocessing/Renamer.java
+++ b/common/src/main/java/ctbrec/recorder/postprocessing/Renamer.java
@@ -32,7 +32,7 @@ public class Renamer extends AbstractPostProcessor {
             "${siteSanitizedName}",
             "${utcDateTime}",
             "${localDateTime}",
-            "${epochSeconds}",
+            "${epochSecond}",
             "${fileSuffix}",
             "${modelNotes}"
     };
@@ -52,7 +52,7 @@ public class Renamer extends AbstractPostProcessor {
                 .replace("${siteName}", rec.getModel().getSite().getName())
                 .replace("${siteSanitizedName}", getSanitizedSiteName(rec))
                 .replace("${fileSuffix}", getFileSuffix(rec))
-                .replace("${epochSeconds}", Long.toString(rec.getStartDate().getEpochSecond()))
+                .replace("${epochSecond}", Long.toString(rec.getStartDate().getEpochSecond()))
                 ;
 
         filename = replaceUtcDateTime(rec, filename);
diff --git a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
index d42478bd..a7919586 100644
--- a/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
+++ b/server/src/main/java/ctbrec/recorder/server/RecorderServlet.java
@@ -2,6 +2,7 @@ package ctbrec.recorder.server;
 
 import static javax.servlet.http.HttpServletResponse.*;
 
+import java.io.File;
 import java.io.IOException;
 import java.security.InvalidKeyException;
 import java.security.NoSuchAlgorithmException;
@@ -25,6 +26,7 @@ import ctbrec.Config;
 import ctbrec.Model;
 import ctbrec.Recording;
 import ctbrec.io.BandwidthMeter;
+import ctbrec.io.FileJsonAdapter;
 import ctbrec.io.InstantJsonAdapter;
 import ctbrec.io.ModelJsonAdapter;
 import ctbrec.recorder.Recorder;
@@ -63,6 +65,7 @@ public class RecorderServlet extends AbstractCtbrecServlet {
             Moshi moshi = new Moshi.Builder()
                     .add(Instant.class, new InstantJsonAdapter())
                     .add(Model.class, new ModelJsonAdapter(sites))
+                    .add(File.class, new FileJsonAdapter())
                     .build();
             JsonAdapter<Request> requestAdapter = moshi.adapter(Request.class);
             Request request = requestAdapter.fromJson(json);