From 439ebe322ba5e4fdc067dee5703362be8ced1458 Mon Sep 17 00:00:00 2001 From: Reinhard Pointner Date: Thu, 24 Mar 2016 15:21:36 +0000 Subject: [PATCH] Refactor --- source/net/filebot/cli/CmdlineOperations.java | 2 +- source/net/filebot/format/MediaBindingBean.java | 2 +- source/net/filebot/media/MediaDetection.java | 4 ++-- source/net/filebot/media/ReleaseInfo.java | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/source/net/filebot/cli/CmdlineOperations.java b/source/net/filebot/cli/CmdlineOperations.java index 384fecf0..59336ea0 100644 --- a/source/net/filebot/cli/CmdlineOperations.java +++ b/source/net/filebot/cli/CmdlineOperations.java @@ -778,7 +778,7 @@ public class CmdlineOperations implements CmdlineInterface { private final String languageCode = Language.getStandardLanguageCode(getLanguage(languageName).getName()); public boolean matchesLanguageCode(File f) { - Locale languageSuffix = MediaDetection.releaseInfo.getLanguageTag(FileUtilities.getName(f)); + Locale languageSuffix = MediaDetection.releaseInfo.getSubtitleLanguageTag(FileUtilities.getName(f)); Language language = Language.getLanguage(languageSuffix); if (language != null) { return language.getISO3().equalsIgnoreCase(languageCode); diff --git a/source/net/filebot/format/MediaBindingBean.java b/source/net/filebot/format/MediaBindingBean.java index 1c594fa6..fe62e76c 100644 --- a/source/net/filebot/format/MediaBindingBean.java +++ b/source/net/filebot/format/MediaBindingBean.java @@ -539,7 +539,7 @@ public class MediaBindingBean { @Define("lang") public Language getLanguageTag() throws Exception { - Locale languageSuffix = releaseInfo.getLanguageTag(FileUtilities.getName(getMediaFile()), getOriginalFileName(getMediaFile())); + Locale languageSuffix = releaseInfo.getSubtitleLanguageTag(FileUtilities.getName(getMediaFile()), getOriginalFileName(getMediaFile())); if (languageSuffix != null) { return Language.getLanguage(languageSuffix); } diff --git a/source/net/filebot/media/MediaDetection.java b/source/net/filebot/media/MediaDetection.java index 67f67f75..56e2ee86 100644 --- a/source/net/filebot/media/MediaDetection.java +++ b/source/net/filebot/media/MediaDetection.java @@ -111,7 +111,7 @@ public class MediaDetection { } public static Locale guessLanguageFromSuffix(File file) { - return releaseInfo.getLanguageTag(getName(file)); + return releaseInfo.getSubtitleLanguageTag(getName(file)); } private static final SeasonEpisodeMatcher seasonEpisodeMatcherStrict = new SmartSeasonEpisodeMatcher(SeasonEpisodeMatcher.DEFAULT_SANITY, true); @@ -1089,7 +1089,7 @@ public class MediaDetection { // allow extended extensions for subtitles files, for example name.eng.srt => map by en.srt if (key != null && SUBTITLE_FILES.accept(file)) { - Locale locale = releaseInfo.getLanguageTag(getName(file)); + Locale locale = releaseInfo.getSubtitleLanguageTag(getName(file)); if (locale != null) { key = locale.getLanguage() + '.' + key; } diff --git a/source/net/filebot/media/ReleaseInfo.java b/source/net/filebot/media/ReleaseInfo.java index a3a5ab42..21e66104 100644 --- a/source/net/filebot/media/ReleaseInfo.java +++ b/source/net/filebot/media/ReleaseInfo.java @@ -112,7 +112,7 @@ public class ReleaseInfo { private Pattern languageTag; - public Locale getLanguageTag(CharSequence... name) { + public Locale getSubtitleLanguageTag(CharSequence... name) { // match locale identifier and lookup Locale object if (languageTag == null) { languageTag = getSubtitleLanguageTagPattern(getDefaultLanguageMap().keySet());