n/futokb
1
0
Fork 0
mirror of https://gitlab.futo.org/keyboard/latinime.git synced 2024-09-28 14:54:30 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add a special error when a wordlist is being imported

Browse Source
This commit is contained in:
Aleksandras Kostarevas 2024-07-19 18:28:55 +03:00
parent d1abf44bc0
commit a1fd7c59a0
1 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
java/src/org/futo/inputmethod/latin/uix/ImportResourceActivity.kt
View File

@ -102,10 +102,15 @@ fun ImportScreen(fileKind: FileKindAndInfo, file: String?, onApply: (FileKindAnd
ScreenTitleWithIcon(title = "Import ${fileKind.kind.kindTitle()}", painter = painterResource(id = fileKind.kind.icon())) ScreenTitleWithIcon(title = "Import ${fileKind.kind.kindTitle()}", painter = painterResource(id = fileKind.kind.icon()))
if(fileKind.kind == FileKind.Invalid) { if(fileKind.kind == FileKind.Invalid) {
Text("This file does not appear to be a dictionary, voice input or transformer model. It may be an invalid file or corrupted. Please try a different file.") if(fileKind.invalidKindHint == InvalidFileHint.ImportedWordListInsteadOfDict) {
Text("Error: This file appears to be a source wordlist (_wordlist.combined) instead of a compiled dictionary (.dict) file.")
Tip("Please download the main dictionary file instead of the source wordlist. In the aosp-dictionaries repo, this would be the first blue link that says something like [German Main], instead of the long blue link to a wordlist.")
} else {
Text("Error: This file does not appear to be a dictionary, voice input or transformer model. It may be an invalid file or corrupted. Please try a different file.")
}
NavigationItem( NavigationItem(
title = "Close", title = "Cancel",
style = NavigationItemStyle.MiscNoArrow, style = NavigationItemStyle.MiscNoArrow,
navigate = { navigate = {
onCancel() onCancel()
@ -214,10 +219,15 @@ fun FileKind.extension(): String {
} }
} }
enum class InvalidFileHint {
ImportedWordListInsteadOfDict
}
data class FileKindAndInfo( data class FileKindAndInfo(
val kind: FileKind, val kind: FileKind,
val name: String?, val name: String?,
val locale: String? val locale: String?,
val invalidKindHint: InvalidFileHint? = null
) )
private fun parseDictionaryMetadataKV(inputStream: InputStream): Map<String, String>? { private fun parseDictionaryMetadataKV(inputStream: InputStream): Map<String, String>? {
@ -300,10 +310,10 @@ fun determineFileKind(context: Context, file: Uri): FileKindAndInfo {
val magic = ByteBuffer.wrap(array).getInt().toUInt() val magic = ByteBuffer.wrap(array).getInt().toUInt()
when(magic) { when {
voiceInputMagic -> FileKindAndInfo(FileKind.VoiceInput, null, null) magic == voiceInputMagic -> FileKindAndInfo(FileKind.VoiceInput, null, null)
transformerMagic -> FileKindAndInfo(FileKind.Transformer, null, null) magic == transformerMagic -> FileKindAndInfo(FileKind.Transformer, null, null)
dictionaryMagic -> { magic == dictionaryMagic -> {
val metadata = parseDictionaryMetadataKV(inputStream) val metadata = parseDictionaryMetadataKV(inputStream)
FileKindAndInfo( FileKindAndInfo(
@ -312,6 +322,10 @@ fun determineFileKind(context: Context, file: Uri): FileKindAndInfo {
locale = metadata?.get("locale") locale = metadata?.get("locale")
) )
} }
(magic == 0x1f8b0808.toUInt()) || (magic == 0x1f8b0800.toUInt()) || (magic == 0x64696374.toUInt()) ->
FileKindAndInfo(FileKind.Invalid, null, null, InvalidFileHint.ImportedWordListInsteadOfDict)
else -> FileKindAndInfo(FileKind.Invalid, null, null) else -> FileKindAndInfo(FileKind.Invalid, null, null)
} }
} ?: FileKindAndInfo(FileKind.Invalid, null, null) } ?: FileKindAndInfo(FileKind.Invalid, null, null)