moparisthebest/filebot
1
0
Fork 0
mirror of https://github.com/mitb-archive/filebot synced 2024-12-23 16:28:51 -05:00
Code Issues Releases Wiki Activity

* fix "Chinese" language subtitle upload issues

Browse Source
This commit is contained in:
Reinhard Pointner 2015-09-30 17:51:13 +00:00
parent 9baf29c2f1
commit e24c381afe
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
source/net/filebot/web/OpenSubtitlesClient.java
View File

@ -118,7 +118,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
// singleton array with or empty array // singleton array with or empty array
int imdbid = ((Movie) searchResult).getImdbId(); int imdbid = ((Movie) searchResult).getImdbId();
String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName) } : new String[0]; String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName, true) } : new String[0];
// require login // require login
login(); login();
@ -159,7 +159,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
public synchronized Map<File, List<SubtitleDescriptor>> getSubtitleListByHash(File[] files, String languageName) throws Exception { public synchronized Map<File, List<SubtitleDescriptor>> getSubtitleListByHash(File[] files, String languageName) throws Exception {
// singleton array with or empty array // singleton array with or empty array
String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName) } : new String[0]; String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName, true) } : new String[0];
// remember hash for each file // remember hash for each file
Map<Query, File> hashMap = new HashMap<Query, File>(files.length); Map<Query, File> hashMap = new HashMap<Query, File>(files.length);
@ -222,7 +222,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
public synchronized Map<File, List<SubtitleDescriptor>> getSubtitleListByTag(File[] files, String languageName) throws Exception { public synchronized Map<File, List<SubtitleDescriptor>> getSubtitleListByTag(File[] files, String languageName) throws Exception {
// singleton array with or empty array // singleton array with or empty array
String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName) } : new String[0]; String[] languageFilter = languageName != null ? new String[] { getSubLanguageID(languageName, true) } : new String[0];
// remember tag for each file // remember tag for each file
Map<Query, File> tagMap = new HashMap<Query, File>(files.length); Map<Query, File> tagMap = new HashMap<Query, File>(files.length);
@ -329,7 +329,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
} }
int imdbid = ((Movie) identity).getImdbId(); int imdbid = ((Movie) identity).getImdbId();
String languageName = getSubLanguageID(language.getDisplayName(Locale.ENGLISH)); String languageName = getSubLanguageID(language.getDisplayName(Locale.ENGLISH), false);
// subhash (md5 of subtitles), subfilename, moviehash, moviebytesize, moviefilename // subhash (md5 of subtitles), subfilename, moviehash, moviebytesize, moviefilename
SubFile sub = new SubFile(); SubFile sub = new SubFile();
@ -474,7 +474,7 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
if (languageName != null) { if (languageName != null) {
try { try {
sublanguageid = getSubLanguageID(languageName); sublanguageid = getSubLanguageID(languageName, true);
} catch (Exception e) { } catch (Exception e) {
Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e); Logger.getLogger(getClass().getName()).log(Level.WARNING, e.getMessage(), e);
} }
@ -593,11 +593,14 @@ public class OpenSubtitlesClient implements SubtitleProvider, VideoHashSubtitleS
return subLanguageMap; return subLanguageMap;
} }
protected String getSubLanguageID(String languageName) throws Exception { protected String getSubLanguageID(String languageName, boolean allowMultiLanguageID) throws Exception {
String subLanguageID = getSubLanguageMap().get(languageName.toLowerCase()); String subLanguageID = getSubLanguageMap().get(languageName.toLowerCase());
if (subLanguageID == null) { if (subLanguageID == null) {
throw new IllegalArgumentException(String.format("SubLanguageID for '%s' not found", languageName)); throw new IllegalArgumentException(String.format("SubLanguageID for '%s' not found", languageName));
} }
if (!allowMultiLanguageID && subLanguageID.contains(",")) {
subLanguageID = subLanguageID.substring(0, subLanguageID.indexOf(","));
}
return subLanguageID; return subLanguageID;
} }