AstralTransRocketries/HMCL
1
0
Fork 0
mirror of https://github.com/HMCL-dev/HMCL.git synced 2025-09-15 23:06:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Force refreshing version list when remove version from disk

Browse Source
This commit is contained in:
huanghongxun 2019-04-25 13:39:07 +08:00
parent c209617ee7
commit 1956ba7a73
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HMCL/src/main/java/org/jackhuang/hmcl/ui/versions/Versions.java
View File

@ -50,9 +50,7 @@ public class Versions {
isMovingToTrashSupported ? i18n("version.manage.remove.confirm.trash", version, version + "_removed") : isMovingToTrashSupported ? i18n("version.manage.remove.confirm.trash", version, version + "_removed") :
i18n("version.manage.remove.confirm", version); i18n("version.manage.remove.confirm", version);
Controllers.confirmDialog(message, i18n("message.confirm"), () -> { Controllers.confirmDialog(message, i18n("message.confirm"), () -> {
if (profile.getRepository().removeVersionFromDisk(version)) { profile.getRepository().removeVersionFromDisk(version);
profile.getRepository().refreshVersionsAsync().start();
}
}, null); }, null);
} }

38
HMCLCore/src/main/java/org/jackhuang/hmcl/game/DefaultGameRepository.java
View File

@ -166,25 +166,29 @@ public class DefaultGameRepository implements GameRepository {
if (!file.renameTo(removedFile)) if (!file.renameTo(removedFile))
return false; return false;
versions.remove(id);
if (FileUtils.isMovingToTrashSupported() && FileUtils.moveToTrash(removedFile)) {
return true;
}
// remove json files first to ensure HMCL will not recognize this folder as a valid version.
List<File> jsons = FileUtils.listFilesByExtension(removedFile, "json");
jsons.forEach(f -> {
if (!f.delete())
LOG.warning("Unable to delete file " + f);
});
// remove the version from version list regardless of whether the directory was removed successfully or not.
try { try {
FileUtils.deleteDirectory(removedFile); versions.remove(id);
} catch (IOException e) {
LOG.log(Level.WARNING, "Unable to remove version folder: " + file, e); if (FileUtils.isMovingToTrashSupported() && FileUtils.moveToTrash(removedFile)) {
return true;
}
// remove json files first to ensure HMCL will not recognize this folder as a valid version.
List<File> jsons = FileUtils.listFilesByExtension(removedFile, "json");
jsons.forEach(f -> {
if (!f.delete())
LOG.warning("Unable to delete file " + f);
});
// remove the version from version list regardless of whether the directory was removed successfully or not.
try {
FileUtils.deleteDirectory(removedFile);
} catch (IOException e) {
LOG.log(Level.WARNING, "Unable to remove version folder: " + file, e);
}
return true;
} finally {
refreshVersionsAsync().start();
} }
return true;
} }
protected void refreshVersionsImpl() { protected void refreshVersionsImpl() {