Skip to content

Commit 46cd745

Browse files
committed
fix: work with the old synced asset files hierarchy
1 parent e84a7ae commit 46cd745

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

app/src/main/java/com/osfans/trime/data/base/DataManager.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,10 @@ object DataManager {
113113
when (it) {
114114
is DataDiff.CreateFile,
115115
is DataDiff.UpdateFile,
116-
-> ResourceUtils.copyFile(it.path, sharedDataDir)
116+
-> ResourceUtils.copyFile(it.path, sharedDataDir, "rime/")
117117
is DataDiff.DeleteDir,
118118
is DataDiff.DeleteFile,
119-
-> FileUtils.delete(sharedDataDir.resolve(it.path)).getOrThrow()
119+
-> FileUtils.delete(sharedDataDir.resolve(it.path.removePrefix("rime/"))).getOrThrow()
120120
}
121121
}
122122

app/src/main/java/com/osfans/trime/util/ResourceUtils.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,10 @@ object ResourceUtils {
1010
fun copyFile(
1111
filename: String,
1212
dest: File,
13+
removedPrefix: String = "",
1314
) = runCatching {
1415
appContext.assets.open(filename).use { i ->
15-
File(dest, filename)
16+
File(dest, filename.removePrefix(removedPrefix))
1617
.also { it.parentFile?.mkdirs() }
1718
.outputStream()
1819
.use { o -> i.copyTo(o) }

0 commit comments

Comments
 (0)