Version 6 initial release

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

@@ -36,12 +36,27 @@ public class AppSetting {
     public static final String GENRE_TITLE = "title";
     public static final String GENRE_CREATED = "created";
     public static final String SETTINGS = "Settings";
+    public static final String PRESET_SPEED = "speed";
+    public static final String PRESET_FORCE = "force";
+    public static final String PRESET_SPLIT_CHAPTERS = "split_chapters";
     private static Map<String, String> cache = new ConcurrentHashMap<>();
 
+    public static final String VERSION = "version";
+
+    static {
+        try (jetbrains.exodus.env.Environment env = Environments.newInstance(APP_DIR.getPath())) {
+            env.executeInTransaction(txn -> {
+                final Store store = env.openStore(SETTINGS, StoreConfig.WITHOUT_DUPLICATES, txn);
+                store.put(txn, StringBinding.stringToEntry(VERSION), StringBinding.stringToEntry(Version.getVersionString()));
+            });
+        }
+
+    }
 
     public static synchronized String getProperty(String key) {
         String result = cache.get(key);
         if (result != null) return result;
+        logger.debug("Settings cache is missed for property: " + key);
         try (jetbrains.exodus.env.Environment env = Environments.newInstance(APP_DIR.getPath())) {
             result = env.computeInReadonlyTransaction(txn -> {
                 final Store store = env.openStore(SETTINGS, StoreConfig.WITHOUT_DUPLICATES, txn);
@@ -52,13 +67,16 @@ public static synchronized String getProperty(String key) {
                     return null;
                 }
             });
-            cache.put(key, result);
+            if (result != null) {
+                cache.put(key, result);
+            }
         }
         return result;
     }
 
     public static synchronized void setProperty(String key, String value) {
         cache.put(key, value);
+        logger.debug("Updating settings cache and database with key: [" + key + "] and value: [" + value + "]");
         try (jetbrains.exodus.env.Environment env = Environments.newInstance(APP_DIR.getPath())) {
             env.executeInTransaction(txn -> {
                 final Store store = env.openStore(SETTINGS, StoreConfig.WITHOUT_DUPLICATES, txn);
@@ -128,7 +146,10 @@ private static Preset bindPreset(Entity entity) {
         Integer cutoff = (Integer) entity.getProperty(PRESET_CUTOFF);
         Boolean cbr = (Boolean) entity.getProperty(PRESET_CBR);
         Integer quality = (Integer) entity.getProperty(PRESET_QUALITY);
-        Preset preset = new Preset(name, new OutputParameters(Format.instance(format), bitrate, frequency, channels, cutoff, cbr, quality));
+        Double speed = (Double) entity.getProperty(PRESET_SPEED);
+        OutputParameters.Force force = OutputParameters.Force.valueOf((String) entity.getProperty(PRESET_FORCE));
+        Boolean splitChapters = (Boolean) entity.getProperty(PRESET_SPLIT_CHAPTERS);
+        Preset preset = new Preset(name, new OutputParameters(Format.instance(format), bitrate, frequency, channels, cutoff, cbr, quality, speed, force, splitChapters));
         return preset;
     }
 
@@ -143,13 +164,16 @@ public static synchronized void savePreset(Preset preset) {
                     entity = entities.getFirst();
                 }
                 entity.setProperty(PRESET_NAME, preset.getName());
-                entity.setProperty(PRESET_FORMAT, preset.getFormat().format);
+                entity.setProperty(PRESET_FORMAT, preset.getFormat().extension);
                 entity.setProperty(PRESET_BITRATE, preset.getBitRate());
                 entity.setProperty(PRESET_FREQUENCY, preset.getFrequency());
                 entity.setProperty(PRESET_CHANNELS, preset.getChannels());
                 entity.setProperty(PRESET_CUTOFF, preset.getCutoff());
                 entity.setProperty(PRESET_CBR, preset.isCbr());
                 entity.setProperty(PRESET_QUALITY, preset.getVbrQuality());
+                entity.setProperty(PRESET_SPEED, preset.getSpeed());
+                entity.setProperty(PRESET_FORCE, preset.getForce().toString());
+                entity.setProperty(PRESET_SPLIT_CHAPTERS, preset.isSplitChapters());
             });
         }
     }

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

@@ -133,8 +133,9 @@ public void launch(ListView<ProgressComponent> progressQueue, ProgressComponent
 //        String extension = FilenameUtils.getExtension(outputDestination);
         this.getOutputParameters().setupFormat(format);
 
+
         if (this.getOutputParameters().isSplitChapters()) {
-            List<Chapter> chapters = parts.stream().flatMap(p -> p.getChapters().stream()).collect(Collectors.toList());
+            List<Chapter> chapters = parts.stream().flatMap(p -> p.getChapters().stream()).toList();
             logger.debug("Found {} chapters in the book", chapters.size());
             for (int i = 0; i < chapters.size(); i++) {
                 Chapter chapter = chapters.get(i);

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

@@ -58,7 +58,7 @@ public List<String> getReencodingOptions(MediaInfo mediaInfo, String progressUri
                 options.add("-t");
                 options.add(toFFMpegTime(mediaInfo.getDuration()));
             }
-            if (outputParameters.getCutoff() != null) {
+            if (outputParameters.getCutoff() != 0) {
                 options.add("-cutoff");
                 options.add(Integer.toString(outputParameters.getCutoff()));
             }
@@ -236,7 +236,7 @@ public List<String> getReencodingOptions(MediaInfo mediaInfo, String progressUri
                 options.add("-t");
                 options.add(toFFMpegTime(mediaInfo.getDuration()));
             }
-            if (outputParameters.getCutoff() != null) {
+            if (outputParameters.getCutoff() != 0) {
                 options.add("-cutoff");
                 options.add(Integer.toString(outputParameters.getCutoff()));
             }

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

@@ -16,41 +16,42 @@ public class OutputParameters {
     protected Integer vbrQuality = format.defaultVbrQuality();
     protected boolean cbr = format.defaultCBR();
     protected Integer cutoff = format.defaultCutoff();
-    protected transient SimpleObjectProperty<Double> speed = new SimpleObjectProperty(1.0);
+    protected transient SimpleObjectProperty<Double> speed = new SimpleObjectProperty<>(format.defaultSpeed());
 
     public enum Force {Auto, Always, Avoid}
 
-    ;
-
     protected Force force = Force.Auto;
 
     private boolean splitChapters = false;
 
 
-    public OutputParameters(OutputParameters parameters) {
-        this.bitRate = parameters.getBitRate();
-        this.frequency = parameters.getFrequency();
-        this.channels = parameters.getChannels();
-        this.vbrQuality = parameters.getVbrQuality();
-        this.cbr = parameters.isCbr();
-        this.cutoff = parameters.getCutoff();
-        this.format = parameters.getFormat();
-        this.splitChapters = parameters.isSplitChapters();
-        this.speed = new SimpleObjectProperty<>(parameters.getSpeed());
-        this.force = parameters.force;
-    }
-
     OutputParameters() {
     }
 
-    OutputParameters(Format format, int bitRate, int frequency, int channels, int cutoff, boolean cbr, int quality) {
+    OutputParameters(Format format, int bitRate, int frequency, int channels, int cutoff, boolean cbr, int quality, double speed, Force force, boolean splitChapters) {
         this.format = format;
         this.bitRate = bitRate;
         this.frequency = frequency;
         this.channels = channels;
         this.vbrQuality = quality;
         this.cbr = cbr;
         this.cutoff = cutoff;
+        this.speed.set(speed);
+        this.force = force;
+        this.splitChapters = splitChapters;
+    }
+
+    public OutputParameters(OutputParameters parameters) {
+        this(parameters. getFormat(),
+                parameters.getBitRate(),
+                parameters.getFrequency(),
+                parameters.getChannels(),
+                parameters.getCutoff(), parameters.isCbr(),
+                parameters.getVbrQuality(),
+                parameters.getSpeed(),
+                parameters.getForce(),
+                parameters.isSplitChapters()
+        );
     }
 
 
@@ -157,5 +158,9 @@ protected void initSpeed() {
     public void setForce(Force force) {
         this.force = force;
     }
+
+    public Force getForce() {
+        return force;
+    }
 }
 

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

@@ -15,12 +15,12 @@ public String toString() {
 
 
     static List<Preset> defaultValues = List.of(
-            new Preset("ipod nano", new OutputParameters(Format.M4B, 64, 44100, 1, 10000, false, 2)),
-            new Preset("ipod classic", new OutputParameters(Format.M4B, 96, 44100, 2, 12000, true, 3)),
-            new Preset("iphone", new OutputParameters(Format.M4B, 128, 44100, 2, 12000, true, 4)),
-            new Preset("android 5+", new OutputParameters(Format.OGG, 64, 44100, 2, 12000, false, 3)),
-            new Preset("android old", new OutputParameters(Format.M4B, 96, 44100, 2, 10000, true, 3)),
-            new Preset("legacy", new OutputParameters(Format.MP3, 128, 44100, 2, 12000, true, 3))
+            new Preset("ipod nano", new OutputParameters(Format.M4B, 64, 44100, 1, 10000, false, 2, 1.0, Force.Auto, false)),
+            new Preset("ipod classic", new OutputParameters(Format.M4B, 96, 44100, 2, 12000, true, 3, 1.0, Force.Auto, false)),
+            new Preset("iphone", new OutputParameters(Format.M4B, 128, 44100, 2, 12000, true, 4, 1.0, Force.Auto, false)),
+            new Preset("android 5+", new OutputParameters(Format.OGG, 64, 44100, 2, 12000, false, 3, 1.0, Force.Auto, false)),
+            new Preset("android old", new OutputParameters(Format.M4B, 96, 44100, 2, 10000, true, 3, 1.0, Force.Auto, false)),
+            new Preset("legacy", new OutputParameters(Format.MP3, 128, 44100, 2, 12000, true, 3, 1.0, Force.Auto, true))
     );
 
     public static final Preset DEFAULT_OUTPUT_PARAMETERS = new Preset(Preset.DEFAULT);
@@ -37,18 +37,10 @@ public static List<Preset> loadPresets() {
 
     }
 
-//    private final OutputParameters save;
-
-    Preset(String name, OutputParameters preset) {
+    public Preset(String name, OutputParameters preset) {
+        super(preset.getFormat(), preset.getBitRate(), preset.getFrequency(), preset.getChannels(), preset.getCutoff(), preset.isCbr(), preset.getVbrQuality(),
+                preset.getSpeed(), preset.getForce(), preset.isSplitChapters());
         this.name = name;
-        this.bitRate = preset.getBitRate();
-        this.frequency = preset.getFrequency();
-        this.channels = preset.getChannels();
-        this.vbrQuality = preset.getVbrQuality();
-        this.cbr = preset.isCbr();
-        this.cutoff = preset.getCutoff();
-        this.format = preset.getFormat();
-//        savePreset();
     }
 
 
@@ -67,65 +59,15 @@ public static Preset instance(String presetName) {
         return new Preset(presetName, new OutputParameters());
     }
 
-    private void savePreset() {
-        AppSetting.savePreset(this);
-    }
-
-
-    @Override
-    public void setupFormat(Format format) {
-        super.setupFormat(format);
-        savePreset();
-    }
-
-
-    @Override
-    public void setBitRate(Integer bitRate) {
-        super.setBitRate(bitRate);
-        savePreset();
-    }
-
-    @Override
-    public void setFrequency(Integer frequency) {
-        super.setFrequency(frequency);
-        savePreset();
-    }
-
-
-    @Override
-    public void setChannels(Integer channels) {
-        super.setChannels(channels);
-        savePreset();
-    }
-
-    @Override
-    public void setVbrQuality(Integer vbrQuality) {
-        super.setVbrQuality(vbrQuality);
-        savePreset();
-    }
-
-    @Override
-    public void setCbr(Boolean cbr) {
-        super.setCbr(cbr);
-        savePreset();
-    }
-
     @Override
     public void updateAuto(List<MediaInfo> media) {
         if (!defaultValues.contains(this)) {
             super.updateAuto(media);
-            savePreset();
         } else {
             //Ignoring auto-update and save for all other preset
         }
     }
 
-    @Override
-    public void setCutoff(Integer cutoff) {
-        super.setCutoff(cutoff);
-        savePreset();
-    }
-
     public String getName() {
         return name;
     }

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

@@ -160,10 +160,6 @@ public void addSpeedChangeListener(ChangeListener<Double> changeListener) {
         outputParameters.get().getSpeedObservable().addListener(changeListener);
     }
 
-    public void setSpeed(Double speed) {
-        this.outputParameters.get().setSpeed(speed);
-    }
-
     public void setBook(Book book) {
         this.book.set(book);
     }