fix(core,data): build opencc dictionaries in the user data dir

osfans · Jan 10, 2023 · e17d5d0 · e17d5d0
1 parent 11b59b8
commit e17d5d0
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 12 deletions.
diff --git a/app/src/main/java/com/osfans/trime/core/Rime.java b/app/src/main/java/com/osfans/trime/core/Rime.java
@@ -356,7 +356,7 @@ public static boolean selectSchema(String schemaId) {
   public static Rime get(boolean full_check) {
     if (self == null) {
       if (full_check) {
-        OpenCCDictManager.internalDeploy();
+        OpenCCDictManager.buildOpenCCDict();
       }
       self = new Rime(full_check);
     }

diff --git a/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt b/app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt
@@ -16,17 +16,23 @@ object OpenCCDictManager {
         System.loadLibrary("rime_jni")
     }
 
-    private val openccDictDir = File(
-        DataManager.getDataDir("opencc")
-    ).also { it.mkdirs() }
+    val sharedDir = File(DataManager.sharedDataDir, "opencc").also { it.mkdirs() }
+    val userDir = File(DataManager.userDataDir, "opencc").also { it.mkdirs() }
 
-    fun dictionaries(): List<Dictionary> = openccDictDir
+    fun sharedDictionaries(): List<Dictionary> = sharedDir
         .listFiles()
-        ?.mapNotNull { Dictionary.new(it) }
-        ?.toList() ?: listOf()
+        ?.mapNotNull { Dictionary.new(it) } ?: listOf()
 
-    fun openccDictionaries(): List<OpenCCDictionary> =
-        dictionaries().mapNotNull { it as? OpenCCDictionary }
+    fun userDictionaries(): List<Dictionary> = userDir
+        .listFiles()
+        ?.mapNotNull { Dictionary.new(it) } ?: listOf()
+
+    fun getAllDictionaries(): List<Dictionary> =
+        if (sharedDir.path == userDir.path) userDictionaries()
+        else (sharedDictionaries() + userDictionaries())
+
+    fun openCCDictionaries(): List<OpenCCDictionary> =
+        getAllDictionaries().mapNotNull { it as? OpenCCDictionary }
 
     fun importFromFile(file: File): OpenCCDictionary {
         val raw = Dictionary.new(file)
@@ -35,7 +41,7 @@ object OpenCCDictManager {
         // preserve original file name
         val new = raw.toOpenCCDictionary(
             File(
-                openccDictDir,
+                userDir,
                 file.nameWithoutExtension + ".${Dictionary.Type.OPENCC.ext}"
             )
         )
@@ -47,8 +53,8 @@ object OpenCCDictManager {
      * Convert internal text dict to opencc format
      */
     @JvmStatic
-    fun internalDeploy() {
-        for (d in dictionaries()) {
+    fun buildOpenCCDict() {
+        for (d in getAllDictionaries()) {
             if (d is TextDictionary) {
                 val result: OpenCCDictionary
                 measureTimeMillis {