From 542cd03bdc048226f567b5c4d22767a8ac9b7e51 Mon Sep 17 00:00:00 2001
From: EpicKnarvik97 <kristian.knarvik@knett.no>
Date: Tue, 9 Aug 2022 16:07:37 +0200
Subject: [PATCH] Fixes an inconsistency where "," is always used as separator
 for unsigned books

---
 .../command/CommandDecrypt.java                   |  6 ++++--
 .../bookswithoutborders/command/CommandSave.java  |  5 +++--
 .../utility/EncryptionHelper.java                 | 15 +++++++++------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDecrypt.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDecrypt.java
index 3c063a9..9297a50 100644
--- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDecrypt.java
+++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandDecrypt.java
@@ -44,14 +44,16 @@ public class CommandDecrypt implements TabExecutor {
             return false;
         }
 
+        String authorSeparator = BooksWithoutBordersConfig.getTitleAuthorSeparator();
+
         //Warning: admin decrypt only allows decrypting files created by the same player. Not sure if intended
         if (args.length == 0 && BooksWithoutBordersConfig.getAdminDecrypt() && player.hasPermission("bookswithoutborders.admin")) {
             String path = getBookFolder() + "Encrypted" + getSlash();
             String fileName;
             if (bookMetadata.hasTitle()) {
-                fileName = bookMetadata.getTitle() + BooksWithoutBordersConfig.getTitleAuthorSeparator() + bookMetadata.getAuthor();
+                fileName = bookMetadata.getTitle() + authorSeparator + bookMetadata.getAuthor();
             } else {
-                fileName = "Untitled," + player.getName();
+                fileName = "Untitled" + authorSeparator + player.getName();
             }
 
             File encryptedDirectory = new File(path);
diff --git a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandSave.java b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandSave.java
index e98796f..bf964de 100644
--- a/src/main/java/net/knarcraft/bookswithoutborders/command/CommandSave.java
+++ b/src/main/java/net/knarcraft/bookswithoutborders/command/CommandSave.java
@@ -85,11 +85,12 @@ public class CommandSave implements TabExecutor {
         }
 
         //Generate book filename
+        String authorSeparator = BooksWithoutBordersConfig.getTitleAuthorSeparator();
         String fileName;
         if (!book.hasTitle()) {
-            fileName = "Untitled," + player.getName();
+            fileName = "Untitled" + authorSeparator + player.getName();
         } else {
-            fileName = book.getTitle() + BooksWithoutBordersConfig.getTitleAuthorSeparator() + book.getAuthor();
+            fileName = book.getTitle() + authorSeparator + book.getAuthor();
         }
         fileName = cleanString(fileName);
         fileName = fixName(fileName, false);
diff --git a/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionHelper.java b/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionHelper.java
index b08a42e..cf613db 100644
--- a/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionHelper.java
+++ b/src/main/java/net/knarcraft/bookswithoutborders/utility/EncryptionHelper.java
@@ -198,8 +198,9 @@ public final class EncryptionHelper {
             return null;
         }
 
-        String fileName = (!bookMetadata.hasTitle()) ? "Untitled," + player.getName() : bookMetadata.getTitle() +
-                BooksWithoutBordersConfig.getTitleAuthorSeparator() + bookMetadata.getAuthor();
+        String authorSeparator = BooksWithoutBordersConfig.getTitleAuthorSeparator();
+        String fileName = (!bookMetadata.hasTitle()) ? "Untitled" + authorSeparator + player.getName() :
+                bookMetadata.getTitle() + authorSeparator + bookMetadata.getAuthor();
         fileName = "[" + key + "]" + fileName;
         fileName = cleanString(fileName);
         fileName = fixName(fileName, false);
@@ -264,8 +265,9 @@ public final class EncryptionHelper {
             }
         }
         //Creates file
-        String fileName = (!bookMetadata.hasTitle()) ? "Untitled," + player.getName() :
-                bookMetadata.getTitle() + BooksWithoutBordersConfig.getTitleAuthorSeparator() + bookMetadata.getAuthor();
+        String authorSeparator = BooksWithoutBordersConfig.getTitleAuthorSeparator();
+        String fileName = (!bookMetadata.hasTitle()) ? "Untitled" + authorSeparator + player.getName() :
+                bookMetadata.getTitle() + authorSeparator + bookMetadata.getAuthor();
 
         fileName = cleanString(fileName);
         fileName = fixName(fileName, false);
@@ -305,8 +307,9 @@ public final class EncryptionHelper {
      */
     private static Boolean saveEncryptedBook(Player player, BookMeta bookMetaData, String key) {
         String path = getBookFolder() + "Encrypted" + getSlash();
-        String fileName = (!bookMetaData.hasTitle()) ? "Untitled," + player.getName() :
-                bookMetaData.getTitle() + BooksWithoutBordersConfig.getTitleAuthorSeparator() + bookMetaData.getAuthor();
+        String authorSeparator = BooksWithoutBordersConfig.getTitleAuthorSeparator();
+        String fileName = (!bookMetaData.hasTitle()) ? "Untitled" + authorSeparator + player.getName() :
+                bookMetaData.getTitle() + authorSeparator + bookMetaData.getAuthor();
 
         fileName = "[" + key + "]" + fileName;
         fileName = cleanString(fileName);