Merge pull request #226 from yermak/development

Bug fixes

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

@@ -15,11 +15,13 @@ public class AppProperties {
     final static Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
     public static final File APP_DIR = new File(System.getProperty("APP_HOME"));
     public static final File PROP_FILE = new File(APP_DIR, Version.getVersionString() + ".properties");
+    private static final Properties applicationProps = new Properties();
 
-    private static Properties getAppProperties() {
-        //TODO:add default props here
-        Properties defaultProperties = new Properties();
-        Properties applicationProps = new Properties(defaultProperties);
+    static {
+        loadAppProperties();
+    }
+
+    private static synchronized Properties loadAppProperties() {
         if (PROP_FILE.exists()) {
             try (FileInputStream in = new FileInputStream(PROP_FILE)) {
                 applicationProps.load(in);
@@ -31,13 +33,11 @@ public class AppProperties {
     }
 
     public static String getProperty(String key) {
-        Properties applicationProps = getAppProperties();
         return applicationProps.getProperty(key);
     }
 
     public static Properties getProperties(String group) {
         Properties properties = new Properties();
-        Properties applicationProps = getAppProperties();
         Enumeration<Object> keys = applicationProps.keys();
         while (keys.hasMoreElements()) {
             String propName = (String) keys.nextElement();
@@ -49,8 +49,7 @@ public class AppProperties {
         return properties;
     }
 
-    public static void setProperty(String key, String value) {
-        Properties applicationProps = getAppProperties();
+    public static synchronized void setProperty(String key, String value) {
         applicationProps.put(key, value);
         File appDir = APP_DIR;
         if (appDir.exists() || appDir.mkdir()) {

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

@@ -44,22 +44,6 @@ public class Utils {
         }
     }
 
-    public static String formatChapter(int partNumber, Chapter chapter) {
-        String chapterFormat = AppProperties.getProperty("chapter_format");
-        if (chapterFormat == null) {
-            chapterFormat = "<if(BOOK_NUMBER)> Book <BOOK_NUMBER>. <endif>Chapter <CHAPTER_NUMBER><if(CHAPTER_TITLE)>- <CHAPTER_TITLE><endif> - <DURATION>";
-            AppProperties.setProperty("chapter_format", chapterFormat);
-        }
-
-        ST chapterTemplate = new ST(chapterFormat);
-        chapterTemplate.add("BOOK_NUMBER", partNumber == 0 ? null : partNumber);
-        chapterTemplate.add("CHAPTER_NUMBER", chapter.getNumber() == 0 ? null : chapter.getNumber());
-        chapterTemplate.add("CHAPTER_TITLE", StringUtils.isEmpty(chapter.getDetails()) ? chapter.getTitle() : chapter.getDetails());
-        chapterTemplate.add("DURATION", Utils.formatTime(chapter.getDuration()));
-        return chapterTemplate.render();
-
-    }
-
     public static String renderChapter(Chapter chapter, Map<String, Function<Chapter, Object>> context) {
         String chapterFormat = AppProperties.getProperty("chapter_format");
         if (chapterFormat == null) {
@@ -91,11 +75,15 @@ public class Utils {
     public static String getOuputFilenameSuggestion(AudioBookInfo bookInfo) {
         String filenameFormat = AppProperties.getProperty("filename_format");
         if (filenameFormat == null) {
-            filenameFormat = "<WRITER> <if(SERIES)>- [<SERIES><if(BOOK_NUMBER)> -<BOOK_NUMBER><endif>] <endif>- <TITLE><if(NARRATOR)> (<NARRATOR>)<endif>";
+            filenameFormat = "<WRITER> <if(SERIES)> - [<SERIES><if(BOOK_NUMBER)> - <BOOK_NUMBER; format=\"%,02d\"><endif>] <endif> - <TITLE><if(NARRATOR)> (<NARRATOR>)<endif>";
             AppProperties.setProperty("filename_format", filenameFormat);
         }
 
-        ST filenameTemplate = new ST(filenameFormat);
+        STGroup g = new STGroupString("");
+        g.registerRenderer(Number.class, new NumberRenderer());
+        g.registerRenderer(Duration.class, new DurationRender());
+
+        ST filenameTemplate = new ST(g, filenameFormat);
         filenameTemplate.add("WRITER", bookInfo.writer().trimToNull());
         filenameTemplate.add("TITLE", bookInfo.title().trimToNull());
         filenameTemplate.add("SERIES", bookInfo.series().trimToNull());
@@ -146,12 +134,6 @@ public class Utils {
                 TimeUnit.MILLISECONDS.toSeconds(millis) % TimeUnit.MINUTES.toSeconds(1));
     }
 
-    public static String formatTimeForFilename(long millis) {
-        return String.format("%02d-%02d-%02d", TimeUnit.MILLISECONDS.toHours(millis),
-                TimeUnit.MILLISECONDS.toMinutes(millis) % TimeUnit.HOURS.toMinutes(1),
-                TimeUnit.MILLISECONDS.toSeconds(millis) % TimeUnit.MINUTES.toSeconds(1));
-    }
-
     public static String formatSize(long bytes) {
         if (bytes == -1L) {
             return "---";