lan/HMCL
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix uniquing text2speech and its native library. Closes #418

Browse Source
This commit is contained in:
huanghongxun
2018-08-11 09:45:31 +08:00
parent 593ee24429
commit b079940cd9
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
HMCLCore/src/main/java/org/jackhuang/hmcl/download/game/LibrariesUniqueTask.java
View File

@@ -56,11 +56,11 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
String serialized = Constants.GSON.toJson(library); String serialized = Constants.GSON.toJson(library);
if (multimap.containsKey(id)) { if (multimap.containsKey(id)) {
boolean hasEqualRule = false; boolean duplicate = false;
for (Library otherLibrary : multimap.get(id)) { for (Library otherLibrary : multimap.get(id)) {
VersionNumber otherNumber = VersionNumber.asVersion(otherLibrary.getVersion()); VersionNumber otherNumber = VersionNumber.asVersion(otherLibrary.getVersion());
if (CompatibilityRule.equals(library.getRules(), otherLibrary.getRules())) { // rules equal, ignore older version. if (CompatibilityRule.equals(library.getRules(), otherLibrary.getRules())) { // rules equal, ignore older version.
hasEqualRule = true; boolean flag = true;
if (number.compareTo(otherNumber) > 0) { // if this library is newer if (number.compareTo(otherNumber) > 0) { // if this library is newer
multimap.removeValue(otherLibrary); multimap.removeValue(otherLibrary);
multimap.put(id, library); multimap.put(id, library);
@@ -76,12 +76,20 @@ public class LibrariesUniqueTask extends TaskResult<Version> {
multimap.put(id, library); multimap.put(id, library);
break; break;
} }
} else {
// for text2speech, which have same library id as well as version number,
// but its library and native library does not equal
flag = false;
} }
} }
if (flag) {
duplicate = true;
break;
}
} }
} }
if (!hasEqualRule) { if (!duplicate) {
multimap.put(id, library); multimap.put(id, library);
} }
} else { } else {