feat: slightly enhance the handling of the old opencc dict format (ocd)

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/data/opencc/OpenCCDictManager.kt

@@ -48,8 +48,6 @@ object OpenCCDictManager {
             (sharedDictionaries() + userDictionaries())
         }
 
-    fun openCCDictionaries(): List<OpenCCDictionary> = getAllDictionaries().mapNotNull { it as? OpenCCDictionary }
-
     fun importFromFile(file: File): OpenCCDictionary {
         val raw =
             Dictionary.new(file)
@@ -60,7 +58,7 @@ object OpenCCDictManager {
             raw.toOpenCCDictionary(
                 File(
                     userDir,
-                    file.nameWithoutExtension + ".${Dictionary.Type.OPENCC.ext}",
+                    file.nameWithoutExtension + ".${Dictionary.Type.OCD2.ext}",
                 ),
             )
         Timber.d("Converted $raw to $new")
@@ -127,6 +125,6 @@ object OpenCCDictManager {
     @JvmStatic
     external fun getOpenCCVersion(): String
 
-    const val MODE_BIN_TO_TXT = true // OCD2 to TXT
+    const val MODE_BIN_TO_TXT = true // OCD(2) to TXT
     const val MODE_TXT_TO_BIN = false // TXT to OCD2
 }

app/src/main/java/com/osfans/trime/data/opencc/dict/Dictionary.kt

@@ -4,15 +4,16 @@ import java.io.File
 
 abstract class Dictionary {
     enum class Type(val ext: String) {
-        OPENCC("ocd2"),
+        OCD("ocd"),
+        OCD2("ocd2"),
         Text("txt"),
         ;
 
         companion object {
             fun fromFileName(name: String): Type? {
                 return when {
-                    name.endsWith(".ocd2") -> OPENCC
-                    name.endsWith(".ocd") -> OPENCC
+                    name.endsWith(".ocd2") -> OCD2
+                    name.endsWith(".ocd") -> OCD
                     name.endsWith(".txt") -> Text
                     else -> null
                 }
@@ -32,12 +33,12 @@ abstract class Dictionary {
         get() = file.nameWithoutExtension
 
     fun toTextDictionary(): TextDictionary {
-        val dest = file.resolveSibling(name + ".${Type.Text.ext}")
+        val dest = file.resolveSibling("$name.${Type.Text.ext}")
         return toTextDictionary(dest)
     }
 
     fun toOpenCCDictionary(): OpenCCDictionary {
-        val dest = file.resolveSibling(name + ".${Type.OPENCC.ext}")
+        val dest = file.resolveSibling("$name.${Type.OCD2.ext}")
         return toOpenCCDictionary(dest)
     }
 
@@ -48,15 +49,15 @@ abstract class Dictionary {
     }
 
     protected fun ensureTxt(dest: File) {
-        if (dest.extension != Type.Text.ext) {
+        if (dest.extension !in Type.Text.ext) {
             throw IllegalArgumentException("Dest file name must end with .${Type.Text.ext}")
         }
         dest.delete()
     }
 
     protected fun ensureBin(dest: File) {
-        if (dest.extension != Type.OPENCC.ext) {
-            throw IllegalArgumentException("Dest file name must end with .${Type.OPENCC.ext}")
+        if (dest.extension != Type.OCD.ext || dest.extension != Type.OCD2.ext) {
+            throw IllegalArgumentException("Dest file name must end with .${Type.OCD.ext} or .${Type.OCD2.ext}")
         }
         dest.delete()
     }
@@ -66,7 +67,7 @@ abstract class Dictionary {
     companion object {
         fun new(it: File): Dictionary? =
             when (Type.fromFileName(it.name)) {
-                Type.OPENCC -> OpenCCDictionary(it)
+                Type.OCD, Type.OCD2 -> OpenCCDictionary(it)
                 Type.Text -> TextDictionary(it)
                 null -> null
             }

app/src/main/java/com/osfans/trime/data/opencc/dict/OpenCCDictionary.kt

@@ -7,51 +7,18 @@ class OpenCCDictionary(file: File) : Dictionary() {
     override var file: File = file
         private set
 
-    var isOCD2: Boolean = true
-        private set
-
-    override val type: Type = Type.OPENCC
-
-    override val name: String
-        get() =
-            if (isOCD2) {
-                super.name
-            } else {
-                file.name.substringBefore("")
-            }
+    override val type: Type =
+        if (file.extension == NEW_FORMAT) {
+            Type.OCD2
+        } else {
+            Type.OCD
+        }
 
     init {
         ensureFileExists()
-        isOCD2 =
-            when {
-                file.extension == type.ext -> {
-                    true
-                }
-                file.name.endsWith(".$OLD_FORMAT") -> {
-                    false
-                }
-                else -> throw IllegalArgumentException("Not a libime dict ${file.name}")
-            }
-    }
-
-    fun useOCD2() {
-        if (isOCD2) {
-            return
-        }
-        val newFile = file.resolveSibling(name + ".${type.ext}")
-        file.renameTo(newFile)
-        file = newFile
-        isOCD2 = true
-    }
-
-    fun useOCD() {
-        if (!isOCD2) {
-            return
+        if (file.extension != type.ext) {
+            throw IllegalArgumentException("Not a OpenCC dict ${file.name}")
         }
-        val newFile = file.resolveSibling(name + ".$OLD_FORMAT")
-        file.renameTo(newFile)
-        file = newFile
-        isOCD2 = false
     }
 
     override fun toTextDictionary(dest: File): TextDictionary {
@@ -71,6 +38,7 @@ class OpenCCDictionary(file: File) : Dictionary() {
     }
 
     companion object {
+        const val NEW_FORMAT = "ocd2"
         const val OLD_FORMAT = "ocd"
     }
 }