diff --git a/source/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule b/source/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule index b89d8824..579abc68 100644 --- a/source/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule +++ b/source/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule @@ -1,4 +1,3 @@ moduleName=filebot-format -moduleVersion=2.5.0 -extensionClasses=net.filebot.cli.ScriptShellMethods,net.filebot.format.ExpressionFormatMethods,org.apache.groovy.dateutil.extensions.DateUtilExtensions -staticExtensionClasses=org.apache.groovy.dateutil.extensions.DateUtilStaticExtensions +moduleVersion=2.5.4 +extensionClasses=net.filebot.cli.ScriptShellMethods,net.filebot.format.ExpressionFormatMethods diff --git a/source/net/filebot/format/ExpressionFormatMethods.java b/source/net/filebot/format/ExpressionFormatMethods.java index f73dd51e..65613d22 100644 --- a/source/net/filebot/format/ExpressionFormatMethods.java +++ b/source/net/filebot/format/ExpressionFormatMethods.java @@ -15,6 +15,8 @@ import java.nio.file.Files; import java.nio.file.attribute.BasicFileAttributeView; import java.nio.file.attribute.BasicFileAttributes; import java.text.Normalizer; +import java.text.ParseException; +import java.text.SimpleDateFormat; import java.time.Instant; import java.time.LocalDateTime; import java.time.LocalTime; @@ -24,6 +26,7 @@ import java.time.temporal.Temporal; import java.time.temporal.TemporalAmount; import java.util.ArrayList; import java.util.Collection; +import java.util.Date; import java.util.List; import java.util.Locale; import java.util.Map; @@ -577,6 +580,14 @@ public class ExpressionFormatMethods { return DateTimeFormatter.ofPattern(pattern, Locale.ENGLISH).format(LocalTime.MIDNIGHT.plus(self)); } + public static String format(Date self, String format) { + return new SimpleDateFormat(format).format(self); + } + + public static Date toDate(String self, String format) throws ParseException { + return new SimpleDateFormat(format).parse(self); + } + /** * Episode utilities (EXPERIMENTAL) */