Merge pull request #25 from mdaubie/feat/21/add-formats-enum

Feat/21/add formats enum
mdaubie · May 4, 2023 · e079e33 · e079e33
2 parents 3d59093 + 81a1024
commit e079e33
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 3 deletions.
diff --git a/src/main/java/io/github/mdaubie/subtitlesparser/constants/SUB_FILE_FORMATS.java b/src/main/java/io/github/mdaubie/subtitlesparser/constants/SUB_FILE_FORMATS.java
@@ -0,0 +1,8 @@
+package io.github.mdaubie.subtitlesparser.constants;
+
+import io.github.mdaubie.subtitlesparser.model.Format;
+import io.github.mdaubie.subtitlesparser.model.SubRipFile;
+
+public final class SUB_FILE_FORMATS {
+    public static final Format<SubRipFile> SUB_RIP_FORMAT = new Format<>("SubRip", "srt", SubRipFile.class, TIMESTAMP_FORMATS.ISO_8601_COMA.value);
+}
diff --git a/src/main/java/io/github/mdaubie/subtitlesparser/constants/TIMESTAMP_FORMATS.java b/src/main/java/io/github/mdaubie/subtitlesparser/constants/TIMESTAMP_FORMATS.java
@@ -0,0 +1,15 @@
+package io.github.mdaubie.subtitlesparser.constants;
+
+import java.time.format.DateTimeFormatter;
+
+public enum TIMESTAMP_FORMATS {
+    ISO_8601_COMA(DateTimeFormatter.ofPattern("HH:mm:ss,SSS")),
+    ISO_8601_DOT(DateTimeFormatter.ofPattern("HH:mm:ss.SSS")),
+    ;
+
+    public final DateTimeFormatter value;
+
+    TIMESTAMP_FORMATS(DateTimeFormatter value) {
+        this.value = value;
+    }
+}
diff --git a/src/main/java/io/github/mdaubie/subtitlesparser/model/Format.java b/src/main/java/io/github/mdaubie/subtitlesparser/model/Format.java
@@ -1,11 +1,17 @@
 package io.github.mdaubie.subtitlesparser.model;
 
+import io.github.mdaubie.subtitlesparser.constants.TIMESTAMP_FORMATS;
+
 import java.time.format.DateTimeFormatter;
 
 public record Format<SF extends SubtitlesFile>(String name, String extension,
                                                Class<SF> baseClass,
                                                DateTimeFormatter timestampsFormat) {
 
+    public Format(String name, String extension, Class<SF> baseClass, TIMESTAMP_FORMATS timestampsFormat) {
+        this(name, extension, baseClass, timestampsFormat.value);
+    }
+
     @Override
     public String toString() {
         return String.format("Format %s (.%s)", name, extension);

diff --git a/src/test/java/io/github/mdaubie/subtitlesparser/ParserTest.java b/src/test/java/io/github/mdaubie/subtitlesparser/ParserTest.java
@@ -10,10 +10,11 @@
 import org.junit.jupiter.params.provider.MethodSource;
 
 import java.time.LocalTime;
-import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.stream.Stream;
 
+import static io.github.mdaubie.subtitlesparser.constants.SUB_FILE_FORMATS.*;
+
 
 class ParserTest {
     @ParameterizedTest
@@ -47,9 +48,8 @@ public static Stream<Arguments> parse() {
                     LocalTime.of(0, 0, 58, 266 * 1000000),
                     "(FOOTSTEPS THUDDING)"));
         }};
-        Format<SubRipFile> subRipFormat = new Format<>("SubRip", ".srt", SubRipFile.class, DateTimeFormatter.ofPattern("HH:mm:ss,SSS"));
         return Stream.of(
-                Arguments.of(fileContent, subRipFormat, sf)
+                Arguments.of(fileContent, SUB_RIP_FORMAT, sf)
         );
     }