From ff741299740815bf4cbab344b5f2d800397e4665 Mon Sep 17 00:00:00 2001
From: Karlatemp <kar@kasukusakura.com>
Date: Tue, 9 Aug 2022 21:51:54 +0800
Subject: [PATCH] [core] Fix cache directory resolving
---
.../src/commonMain/kotlin/utils/BotConfigurationExt.kt | 5 +++++
.../src/jvmBaseMain/kotlin/utils/BotConfigurationExt.kt | 2 +-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/mirai-core/src/commonMain/kotlin/utils/BotConfigurationExt.kt b/mirai-core/src/commonMain/kotlin/utils/BotConfigurationExt.kt
index 0d08e112f..62f01efbd 100644
--- a/mirai-core/src/commonMain/kotlin/utils/BotConfigurationExt.kt
+++ b/mirai-core/src/commonMain/kotlin/utils/BotConfigurationExt.kt
@@ -20,6 +20,11 @@ import kotlin.jvm.JvmName
internal expect val BotConfiguration.workingDirPath: String
+/*
+Note: Required the written path,
+ NOT the resolved (absolute) path.
+ See: #2160
+*/
internal expect val BotConfiguration.cacheDirPath: String
internal fun BotConfiguration.actualCacheDir(): MiraiFile = MiraiFile.create(workingDirPath).resolveMkdir(cacheDirPath)
diff --git a/mirai-core/src/jvmBaseMain/kotlin/utils/BotConfigurationExt.kt b/mirai-core/src/jvmBaseMain/kotlin/utils/BotConfigurationExt.kt
index f102e6ca4..e1ee3377d 100644
--- a/mirai-core/src/jvmBaseMain/kotlin/utils/BotConfigurationExt.kt
+++ b/mirai-core/src/jvmBaseMain/kotlin/utils/BotConfigurationExt.kt
@@ -15,4 +15,4 @@ internal actual val BotConfiguration.workingDirPath: String
get() = workingDir.absolutePath
internal actual val BotConfiguration.cacheDirPath: String
- get() = cacheDir.absolutePath
\ No newline at end of file
+ get() = cacheDir.path
\ No newline at end of file