From c5bf89fb4d2121063b1e4a09daf66b8fb17bcc41 Mon Sep 17 00:00:00 2001 From: xeviff Date: Tue, 22 Nov 2022 18:33:02 +0100 Subject: [PATCH] bugfixing --- .gitignore | 3 ++- src/main/java/tv/mangrana/utils/Output.java | 7 ++++++- src/main/java/tv/mangrana/utils/StringCaptor.java | 14 +++++++++----- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index d04752f..a5b5e8f 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ /.idea/ /target/ -.DS_Store \ No newline at end of file +.DS_Store +/MangranaCommons.iml diff --git a/src/main/java/tv/mangrana/utils/Output.java b/src/main/java/tv/mangrana/utils/Output.java index 9c5766a..9b3c255 100644 --- a/src/main/java/tv/mangrana/utils/Output.java +++ b/src/main/java/tv/mangrana/utils/Output.java @@ -3,6 +3,7 @@ package tv.mangrana.utils; import java.text.DateFormat; import java.text.MessageFormat; import java.text.SimpleDateFormat; +import java.util.Arrays; import java.util.Date; public class Output { @@ -14,7 +15,11 @@ public class Output { System.out.println(msg); } public static void log (String msg, Object... params) { - log(msg(msg, params)); + try { + log(msg(msg, params)); + } catch (Exception e) { + log("error trying to log with msg="+msg+" and params "+Arrays.toString(params)); + } } public static void logWithDate(String msg) { diff --git a/src/main/java/tv/mangrana/utils/StringCaptor.java b/src/main/java/tv/mangrana/utils/StringCaptor.java index 41c12e9..8ad830c 100644 --- a/src/main/java/tv/mangrana/utils/StringCaptor.java +++ b/src/main/java/tv/mangrana/utils/StringCaptor.java @@ -15,11 +15,15 @@ public class StringCaptor { } public static String getSeasonFolderNameFromSeason(String seasonFolderName) throws IncorrectWorkingReferencesException { - String season = Optional.ofNullable( - StringCaptor.getMatchingSubstring(seasonFolderName, "(S\\d{2})")) - .orElseThrow(() -> - new IncorrectWorkingReferencesException("Couldn't determinate the season from: "+seasonFolderName)); - return season.replaceFirst("S", "Temporada "); + Optional typicalFormat = Optional.ofNullable(StringCaptor.getMatchingSubstring(seasonFolderName, "(S\\d{2})")); + if (typicalFormat.isPresent()) { + return typicalFormat.get().replaceFirst("S", "Temporada "); + } + Optional weirdFormat = Optional.ofNullable(StringCaptor.getMatchingSubstring(seasonFolderName, "(T\\d{1,2})")); + if (weirdFormat.isPresent()) { + return weirdFormat.get().replaceFirst("T", "Temporada "); + } + throw new IncorrectWorkingReferencesException("Couldn't determinate the season from: "+seasonFolderName); } public static String getSeasonFolderNameFromEpisode(String episodeFileName) throws IncorrectWorkingReferencesException {