From 4a2ac63d251735b7e3e40b86acf45f4259b40886 Mon Sep 17 00:00:00 2001 From: huangyuhui Date: Mon, 28 Mar 2016 20:57:01 +0800 Subject: [PATCH] Added removal of installers for Issue #55 --- .../install/MinecraftInstallerService.java | 10 +++-- .../util/tasks/DeleteFileTask.java | 44 +++++++++++++++++++ 2 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java index 4cdcccada..b9cd7f89c 100755 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/core/install/MinecraftInstallerService.java @@ -29,6 +29,7 @@ import org.jackhuang.hellominecraft.launcher.core.install.optifine.vanilla.OptiF import org.jackhuang.hellominecraft.util.tasks.Task; import org.jackhuang.hellominecraft.util.tasks.download.FileDownloadTask; import org.jackhuang.hellominecraft.util.system.IOUtils; +import org.jackhuang.hellominecraft.util.tasks.DeleteFileTask; /** * @@ -61,7 +62,8 @@ public final class MinecraftInstallerService extends IMinecraftInstallerService return null; else return new FileDownloadTask(service.getDownloadType().getProvider().getParsedDownloadURL(v.installer), filepath).setTag("forge") - .after(new ForgeInstaller(service, filepath)); + .after(new ForgeInstaller(service, filepath)) + .after(new DeleteFileTask(filepath)); } @Override @@ -71,13 +73,15 @@ public final class MinecraftInstallerService extends IMinecraftInstallerService return null; OptiFineDownloadFormatter task = new OptiFineDownloadFormatter(v.installer); return task.after(new FileDownloadTask(filepath).registerPreviousResult(task).setTag("optifine")) - .after(new OptiFineInstaller(service, installId, v, filepath)); + .after(new OptiFineInstaller(service, installId, v, filepath)) + .after(new DeleteFileTask(filepath)); } @Override public Task downloadLiteLoader(String installId, InstallerVersion v) { File filepath = IOUtils.tryGetCanonicalFile(IOUtils.currentDirWithSeparator() + "liteloader-universal.jar"); FileDownloadTask task = (FileDownloadTask) new FileDownloadTask(v.universal, filepath).setTag("LiteLoader"); - return task.after(new LiteLoaderInstaller(service, installId, (LiteLoaderVersionList.LiteLoaderInstallerVersion) v).registerPreviousResult(task)); + return task.after(new LiteLoaderInstaller(service, installId, (LiteLoaderVersionList.LiteLoaderInstallerVersion) v).registerPreviousResult(task)) + .after(new DeleteFileTask(filepath)); } } diff --git a/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java new file mode 100644 index 000000000..b9422c766 --- /dev/null +++ b/HMCLAPI/src/main/java/org/jackhuang/hellominecraft/util/tasks/DeleteFileTask.java @@ -0,0 +1,44 @@ +/* + * Hello Minecraft! Launcher. + * Copyright (C) 2013 huangyuhui + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see {http://www.gnu.org/licenses/}. + */ +package org.jackhuang.hellominecraft.util.tasks; + +import java.io.File; + +/** + * + * @author huangyuhui + */ +public class DeleteFileTask extends Task { + + File f; + + public DeleteFileTask(File f) { + this.f = f; + } + + @Override + public void executeTask() throws Throwable { + f.delete(); + } + + @Override + public String getInfo() { + return "Delete: " + f.getAbsolutePath(); + } + +}