From 858fd17f3e320e7774cab686fb4884e07ee3f4da Mon Sep 17 00:00:00 2001 From: comp500 Date: Mon, 23 May 2022 20:32:22 +0100 Subject: [PATCH] Fix optional and sided mod filtering properly --- .../kotlin/link/infra/packwiz/installer/DownloadTask.kt | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/kotlin/link/infra/packwiz/installer/DownloadTask.kt b/src/main/kotlin/link/infra/packwiz/installer/DownloadTask.kt index 5dd022f..002961a 100644 --- a/src/main/kotlin/link/infra/packwiz/installer/DownloadTask.kt +++ b/src/main/kotlin/link/infra/packwiz/installer/DownloadTask.kt @@ -180,17 +180,19 @@ internal class DownloadTask private constructor(val metadata: IndexFile.File, de fun download(packFolder: String, indexUri: SpaceSafeURI) { if (err != null) return - // Ensure wrong-side or optional false files are removed + // Exclude wrong-side and optional false files cachedFile?.let { if ((it.isOptional && !it.optionValue) || !correctSide()) { if (it.cachedLocation != null) { + // Ensure wrong-side or optional false files are removed try { Files.deleteIfExists(Paths.get(packFolder, it.cachedLocation)) } catch (e: IOException) { - Log.warn("Failed to delete file before downloading", e) + Log.warn("Failed to delete file", e) } } it.cachedLocation = null + return } } if (alreadyUpToDate) return