From aa656e075c082a77c0c9fff16e84938f0567a0f2 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Mon, 1 Jan 2018 23:37:42 +0100 Subject: [PATCH] Support for DVR-MS files @see https://www.filebot.net/forums/viewtopic.php?f=10&t=5582 --- source/net/filebot/MediaTypes.properties | 2 +- source/net/filebot/util/FileUtilities.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/net/filebot/MediaTypes.properties b/source/net/filebot/MediaTypes.properties index 21edbe78..832a0d04 100644 --- a/source/net/filebot/MediaTypes.properties +++ b/source/net/filebot/MediaTypes.properties @@ -31,7 +31,7 @@ video/mp4: mp4 m4v 3gp video/mov: mov video/divx: divx video/mpeg: mpg mpeg vob ts tp m2ts rec -video/wmv: wmv asf wtv +video/wmv: wmv asf wtv dvr-ms video/WebM: webm video/flash: flv video/realmedia: rm rmvb rmp4 diff --git a/source/net/filebot/util/FileUtilities.java b/source/net/filebot/util/FileUtilities.java index 3ca92c1d..cbaec6d9 100644 --- a/source/net/filebot/util/FileUtilities.java +++ b/source/net/filebot/util/FileUtilities.java @@ -301,7 +301,7 @@ public final class FileUtilities { * * e.g. "file.txt" -> match "txt", ".hidden" -> no match */ - public static final Pattern EXTENSION = Pattern.compile("(?<=.[.])\\p{Alnum}+$"); + public static final Pattern EXTENSION = Pattern.compile("(?<=.[.])[\\p{Alnum}-]+$"); public static final String UNC_PREFIX = "\\\\"; public static String getExtension(File file) {