renamed properties into settings

src/main/java/uk/yermak/audiobookconverter/AppProperties.java → src/main/java/uk/yermak/audiobookconverter/AppSetting.java

@@ -2,7 +2,6 @@
 
 import javafx.collections.FXCollections;
 import javafx.collections.ObservableList;
-import jetbrains.exodus.ByteIterable;
 import jetbrains.exodus.bindings.StringBinding;
 import jetbrains.exodus.entitystore.Entity;
 import jetbrains.exodus.entitystore.EntityIterable;
@@ -19,7 +18,7 @@
 import java.util.*;
 import java.util.stream.StreamSupport;
 
-public class AppProperties {
+public class AppSetting {
     final static Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     public static final File APP_DIR = new File(System.getProperty("APP_HOME"));
     public static final String PRESET_ENTITY = "Preset";

src/main/java/uk/yermak/audiobookconverter/Preset.java

@@ -1,7 +1,5 @@
 package uk.yermak.audiobookconverter;
 
-import com.google.gson.Gson;
-
 import java.util.*;
 
 public class Preset extends OutputParameters {
@@ -29,13 +27,13 @@ public String toString() {
 
 
     public static List<Preset> loadPresets() {
-        List<Preset> presets = AppProperties.loadPresets();
+        List<Preset> presets = AppSetting.loadPresets();
         ArrayList<Preset> toStore = new ArrayList<>(defaultValues);
         toStore.removeAll(presets);
         for (Preset preset : toStore) {
-            AppProperties.savePreset(preset);
+            AppSetting.savePreset(preset);
         }
-        return AppProperties.loadPresets();
+        return AppSetting.loadPresets();
 
     }
 
@@ -63,14 +61,14 @@ public static Preset copy(String presetName, Preset copy) {
     }
 
     public static Preset instance(String presetName) {
-        Preset preset = AppProperties.loadPreset(presetName);
+        Preset preset = AppSetting.loadPreset(presetName);
         if (preset != null) return preset;
 
         return new Preset(presetName, new OutputParameters());
     }
 
     private void savePreset() {
-        AppProperties.savePreset(this);
+        AppSetting.savePreset(this);
     }
 
 

src/main/java/uk/yermak/audiobookconverter/Utils.java

@@ -45,7 +45,7 @@ public static void closeSilently(Process process) {
     }
 
     public static String renderChapter(Chapter chapter, Map<String, Function<Chapter, Object>> context) {
-        String chapterFormat = AppProperties.getProperty("chapter_format");
+        String chapterFormat = AppSetting.getProperty("chapter_format");
         if (chapterFormat == null) {
             chapterFormat = "<if(BOOK_NUMBER)><BOOK_NUMBER>. <endif>" +
                     "<if(BOOK_TITLE)><BOOK_TITLE>. <endif>" +
@@ -54,7 +54,7 @@ public static String renderChapter(Chapter chapter, Map<String, Function<Chapter
                     "<if(TAG)><TAG> <endif>" +
                     "<if(CUSTOM_TITLE)><CUSTOM_TITLE> <endif>" +
                     "<if(DURATION)> - <DURATION; format=\"%02d:%02d:%02d\"><endif>";
-            AppProperties.setProperty("chapter_format", chapterFormat);
+            AppSetting.setProperty("chapter_format", chapterFormat);
         }
         STGroup g = new STGroupString("");
         g.registerRenderer(Number.class, new NumberRenderer());
@@ -73,10 +73,10 @@ public static String renderChapter(Chapter chapter, Map<String, Function<Chapter
 
 
     public static String getOuputFilenameSuggestion(AudioBookInfo bookInfo) {
-        String filenameFormat = AppProperties.getProperty("filename_format");
+        String filenameFormat = AppSetting.getProperty("filename_format");
         if (filenameFormat == null) {
             filenameFormat = "<WRITER> <if(SERIES)> - [<SERIES><if(BOOK_NUMBER)> - <BOOK_NUMBER; format=\"%,02d\"><endif>] <endif> - <TITLE><if(NARRATOR)> (<NARRATOR>)<endif>";
-            AppProperties.setProperty("filename_format", filenameFormat);
+            AppSetting.setProperty("filename_format", filenameFormat);
         }
 
         STGroup g = new STGroupString("");
@@ -146,15 +146,15 @@ public static String tempCopy(String fileName) {
     }
 
     public static String renderPart(Part part, Map<String, Function<Part, Object>> context) {
-        String partFormat = AppProperties.getProperty("part_format");
+        String partFormat = AppSetting.getProperty("part_format");
         if (partFormat == null) {
             partFormat = "<if(WRITER)><WRITER> <endif>" +
                     "<if(SERIES)>- [<SERIES><if(BOOK_NUMBER)> -<BOOK_NUMBER><endif>] - <endif>" +
                     "<if(TITLE)><TITLE><endif>" +
                     "<if(NARRATOR)> (<NARRATOR>)<endif>" +
                     "<if(YEAR)>-<YEAR><endif>" +
                     "<if(PART)>, Part <PART; format=\"%,03d\"><endif>";
-            AppProperties.setProperty("part_format", partFormat);
+            AppSetting.setProperty("part_format", partFormat);
         }
 
         STGroup g = new STGroupString("");

src/main/java/uk/yermak/audiobookconverter/fx/ArtWorkController.java

@@ -44,7 +44,7 @@ private void initialize() {
     @FXML
     private void addImage(ActionEvent actionEvent) {
         FileChooser fileChooser = new FileChooser();
-        String sourceFolder = AppProperties.getProperty("source.folder");
+        String sourceFolder = AppSetting.getProperty("source.folder");
         fileChooser.setInitialDirectory(Platform.getInitialDirecotory(sourceFolder));
         fileChooser.setTitle("Select JPG or PNG file");
         fileChooser.getExtensionFilters().addAll(

src/main/java/uk/yermak/audiobookconverter/fx/BookInfoController.java

@@ -1,8 +1,6 @@
 package uk.yermak.audiobookconverter.fx;
 
 import javafx.application.Platform;
-import javafx.beans.InvalidationListener;
-import javafx.beans.Observable;
 import javafx.collections.ListChangeListener;
 import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
@@ -13,7 +11,7 @@
 import javafx.scene.control.MenuItem;
 import javafx.scene.control.TextField;
 import org.apache.commons.lang3.StringUtils;
-import uk.yermak.audiobookconverter.AppProperties;
+import uk.yermak.audiobookconverter.AppSetting;
 import uk.yermak.audiobookconverter.AudioBookInfo;
 import uk.yermak.audiobookconverter.AudiobookConverter;
 import uk.yermak.audiobookconverter.MediaInfo;
@@ -48,13 +46,13 @@ private void initialize() {
 
         MenuItem menuItem = new MenuItem("Remove");
 
-        genre.setItems(AppProperties.loadGenres());
+        genre.setItems(AppSetting.loadGenres());
         menuItem.setOnAction(event -> {
             String remove = genre.getItems().get(genre.getSelectionModel().getSelectedIndex());
-            AppProperties.removeGenre(remove);
-            genre.setItems(AppProperties.loadGenres());
+            AppSetting.removeGenre(remove);
+            genre.setItems(AppSetting.loadGenres());
         });
-        AudiobookConverter.getContext().addContextDetachListener(observable -> genre.setItems(AppProperties.loadGenres()));
+        AudiobookConverter.getContext().addContextDetachListener(observable -> genre.setItems(AppSetting.loadGenres()));
 
         ContextMenu contextMenu = new ContextMenu(menuItem);
 

src/main/java/uk/yermak/audiobookconverter/fx/ConversionContext.java

@@ -93,7 +93,7 @@ public ConversionGroup detach() {
         conversionGroup.setBookInfo(bookInfo.get());
         conversionGroup.setOutputParameters(new OutputParameters(outputParameters.get()));
         conversionGroup.setDetached(true);
-        AppProperties.saveGenres(bookInfo.get().genre().get());
+        AppSetting.saveGenres(bookInfo.get().genre().get());
 
         ConversionGroup newConversionGroup = new ConversionGroup();
         conversionGroupHolder.set(newConversionGroup);

src/main/java/uk/yermak/audiobookconverter/fx/DialogHelper.java

@@ -32,7 +32,7 @@ static String selectOutputFile(AudioBookInfo audioBookInfo) {
         JfxEnv env = AudiobookConverter.getEnv();
 
         final FileChooser fileChooser = new FileChooser();
-        String outputFolder = AppProperties.getProperty("output.folder");
+        String outputFolder = AppSetting.getProperty("output.folder");
         fileChooser.setInitialDirectory(Platform.getInitialDirecotory(outputFolder));
         fileChooser.setInitialFileName(Utils.getOuputFilenameSuggestion(audioBookInfo));
         fileChooser.setTitle("Save AudioBook");
@@ -42,14 +42,14 @@ static String selectOutputFile(AudioBookInfo audioBookInfo) {
         File file = fileChooser.showSaveDialog(env.getWindow());
         if (file == null) return null;
         File parentFolder = file.getParentFile();
-        AppProperties.setProperty("output.folder", parentFolder.getAbsolutePath());
+        AppSetting.setProperty("output.folder", parentFolder.getAbsolutePath());
         return file.getPath();
     }
 
     public static List<String> selectFilesDialog() {
         Window window = AudiobookConverter.getEnv().getWindow();
         final FileChooser fileChooser = new FileChooser();
-        String sourceFolder = AppProperties.getProperty("source.folder");
+        String sourceFolder = AppSetting.getProperty("source.folder");
         fileChooser.setInitialDirectory(Platform.getInitialDirecotory(sourceFolder));
         StringJoiner filetypes = new StringJoiner("/");
 
@@ -65,15 +65,15 @@ public static List<String> selectFilesDialog() {
         if (!files.isEmpty()) {
             File firstFile = files.get(0);
             File parentFile = firstFile.getParentFile();
-            AppProperties.setProperty("source.folder", parentFile.getAbsolutePath());
+            AppSetting.setProperty("source.folder", parentFile.getAbsolutePath());
         }
         return collectFiles(files);
     }
 
     public static List<String> selectFolderDialog() {
         Window window = AudiobookConverter.getEnv().getWindow();
         DirectoryChooser directoryChooser = new DirectoryChooser();
-        String sourceFolder = AppProperties.getProperty("source.folder");
+        String sourceFolder = AppSetting.getProperty("source.folder");
         directoryChooser.setInitialDirectory(Platform.getInitialDirecotory(sourceFolder));
 
         StringJoiner filetypes = new StringJoiner("/");
@@ -84,7 +84,7 @@ public static List<String> selectFolderDialog() {
         File selectedDirectory = directoryChooser.showDialog(window);
 
         if (selectedDirectory == null) return null;
-        AppProperties.setProperty("source.folder", selectedDirectory.getAbsolutePath());
+        AppSetting.setProperty("source.folder", selectedDirectory.getAbsolutePath());
 
         return collectFiles(Collections.singleton(selectedDirectory));
     }

src/main/java/uk/yermak/audiobookconverter/fx/OutputController.java

@@ -2,8 +2,6 @@
 
 import javafx.application.Platform;
 import javafx.beans.InvalidationListener;
-import javafx.beans.value.ChangeListener;
-import javafx.beans.value.ObservableValue;
 import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
@@ -119,11 +117,11 @@ private void initialize() {
             if (!presetBox.getItems().contains(newValue)) {
                 presetBox.getItems().add(newValue);
                 Preset preset = Preset.copy(newValue, Preset.instance(oldValue));
-                AppProperties.savePreset(preset);
+                AppSetting.savePreset(preset);
                 AudiobookConverter.getContext().setOutputParameters(preset);
             } else {
                 Preset preset = Preset.instance(newValue);
-                AppProperties.savePreset(preset);
+                AppSetting.savePreset(preset);
                 AudiobookConverter.getContext().setOutputParameters(preset);
             }
         });