moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2025-03-09 13:59:49 -04:00
Code Issues Releases Wiki Activity

Fix dateutil methods in case groovy extension methods dont work

Browse Source
This commit is contained in:
Reinhard Pointner 2018-12-03 03:19:54 +07:00
parent 789ee97212
commit 1710681ff6
2 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
source/META-INF/groovy/org.codehaus.groovy.runtime.ExtensionModule
View File

@ -1,4 +1,3 @@
moduleName=filebot-format moduleName=filebot-format
moduleVersion=2.5.0 moduleVersion=2.5.4
extensionClasses=net.filebot.cli.ScriptShellMethods,net.filebot.format.ExpressionFormatMethods,org.apache.groovy.dateutil.extensions.DateUtilExtensions extensionClasses=net.filebot.cli.ScriptShellMethods,net.filebot.format.ExpressionFormatMethods
staticExtensionClasses=org.apache.groovy.dateutil.extensions.DateUtilStaticExtensions

11
source/net/filebot/format/ExpressionFormatMethods.java
View File

@ -15,6 +15,8 @@ import java.nio.file.Files;
import java.nio.file.attribute.BasicFileAttributeView; import java.nio.file.attribute.BasicFileAttributeView;
import java.nio.file.attribute.BasicFileAttributes; import java.nio.file.attribute.BasicFileAttributes;
import java.text.Normalizer; import java.text.Normalizer;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.time.Instant; import java.time.Instant;
import java.time.LocalDateTime; import java.time.LocalDateTime;
import java.time.LocalTime; import java.time.LocalTime;
@ -24,6 +26,7 @@ import java.time.temporal.Temporal;
import java.time.temporal.TemporalAmount; import java.time.temporal.TemporalAmount;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
import java.util.Date;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
@ -577,6 +580,14 @@ public class ExpressionFormatMethods {
return DateTimeFormatter.ofPattern(pattern, Locale.ENGLISH).format(LocalTime.MIDNIGHT.plus(self)); 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) * Episode utilities (EXPERIMENTAL)
*/ */