From 9166278b3136e93b8b0285343292f4fc7ef38781 Mon Sep 17 00:00:00 2001 From: WhiredPlanck Date: Wed, 8 May 2024 05:08:20 +0800 Subject: [PATCH] fix: work with the old synced asset files hierarchy --- app/src/main/java/com/osfans/trime/data/base/DataManager.kt | 4 ++-- app/src/main/java/com/osfans/trime/util/ResourceUtils.kt | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/src/main/java/com/osfans/trime/data/base/DataManager.kt b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt index 3a9db3bfbe..46e493d1b9 100644 --- a/app/src/main/java/com/osfans/trime/data/base/DataManager.kt +++ b/app/src/main/java/com/osfans/trime/data/base/DataManager.kt @@ -113,10 +113,10 @@ object DataManager { when (it) { is DataDiff.CreateFile, is DataDiff.UpdateFile, - -> ResourceUtils.copyFile(it.path, sharedDataDir) + -> ResourceUtils.copyFile(it.path, sharedDataDir, "rime/") is DataDiff.DeleteDir, is DataDiff.DeleteFile, - -> FileUtils.delete(sharedDataDir.resolve(it.path)).getOrThrow() + -> FileUtils.delete(sharedDataDir.resolve(it.path.removePrefix("rime/"))).getOrThrow() } } diff --git a/app/src/main/java/com/osfans/trime/util/ResourceUtils.kt b/app/src/main/java/com/osfans/trime/util/ResourceUtils.kt index 5181bd9b02..b929cfb91c 100644 --- a/app/src/main/java/com/osfans/trime/util/ResourceUtils.kt +++ b/app/src/main/java/com/osfans/trime/util/ResourceUtils.kt @@ -10,9 +10,10 @@ object ResourceUtils { fun copyFile( filename: String, dest: File, + removedPrefix: String = "", ) = runCatching { appContext.assets.open(filename).use { i -> - File(dest, filename) + File(dest, filename.removePrefix(removedPrefix)) .also { it.parentFile?.mkdirs() } .outputStream() .use { o -> i.copyTo(o) }