fix: work with the old synced asset files hierarchy

osfans · May 10, 2024 · 46cd745 · 46cd745
1 parent e84a7ae
commit 46cd745
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 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
@@ -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
@@ -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) }