From 0b9852c4d4ccd3958f70897b0e7f1f8d65c65c91 Mon Sep 17 00:00:00 2001
From: kohlerpop1 <kohlerpop1@gmail.com>
Date: Tue, 18 Jun 2024 15:21:05 -0400
Subject: [PATCH] Moved ActionResult#message to top of toJson() for easier
 reading Change Recording settings to accept an output file instead of
 directory and filename

---
 .../jwdeveloper/tiktok/common/ActionResult.java  |  2 +-
 .../recorder/impl/RecorderListener.java          | 16 +++++++---------
 .../recorder/impl/data/RecorderSettings.java     |  4 ++--
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java
index 46bdb5d..25cb954 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/common/ActionResult.java
@@ -100,8 +100,8 @@ public class ActionResult<T> {
 	public JsonObject toJson() {
 		JsonObject map = new JsonObject();
 		map.addProperty("success", success);
-		map.add("content", gson.toJsonTree(content));
 		map.addProperty("message", message);
+		map.add("content", gson.toJsonTree(content));
 		map.add("previous", hasPrevious() ? previous.toJson() : null);
 		return map;
 	}
diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java
index 7d0de49..8f245fd 100644
--- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java
+++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/RecorderListener.java
@@ -87,14 +87,13 @@ public class RecorderListener implements LiveRecorder {
                     connection.setRequestProperty(entry.getKey(), entry.getValue());
                 }
 
-                var path = settings.getOutputPath() + File.separator + settings.getOutputFileName();
-                var file = new File(path);
+                var file = settings.getOutputFile();
                 file.getParentFile().mkdirs();
                 file.createNewFile();
 
                 try (
-                        var in = connection.getInputStream();
-                        var fos = new FileOutputStream(file)
+                    var in = connection.getInputStream();
+                    var fos = new FileOutputStream(file)
                 ) {
                     byte[] dataBuffer = new byte[1024];
                     int bytesRead;
@@ -113,11 +112,10 @@ public class RecorderListener implements LiveRecorder {
 
         var recordingStartedEvent = new TikTokLiveRecorderStartedEvent(downloadData);
         liveClient.publishEvent(recordingStartedEvent);
-        if (recordingStartedEvent.isCanceled()) {
-            liveClient.getLogger().info("Recording cancelled");
-            return;
-        }
-        liveDownloadThread.start();
+        if (recordingStartedEvent.isCanceled())
+			liveClient.getLogger().info("Recording cancelled");
+		else
+            liveDownloadThread.start();
     }
 
     @TikTokEventObserver
diff --git a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java
index 2b04f01..2440225 100644
--- a/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java
+++ b/extension-recorder/src/main/java/io/github/jwdeveloper/tiktok/extension/recorder/impl/data/RecorderSettings.java
@@ -27,6 +27,7 @@ import io.github.jwdeveloper.tiktok.extension.recorder.impl.enums.LiveFormat;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.io.File;
 import java.util.function.Function;
 
 @Getter
@@ -36,8 +37,7 @@ public class RecorderSettings {
     private String ffmpegPath;
     private String quality;
     private String format;
-    private String outputPath;
-    private String outputFileName;
+    private File outputFile;
     private Function<String,DownloadData> prepareDownloadData;
     private boolean startOnConnected;
     private boolean stopOnDisconnect = true;