Option to skip similar entries in the history (closes #272)

you-apps · Jun 16, 2023 · 8173344 · 8173344
1 parent 58d6976
commit 8173344
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 11 deletions.
diff --git a/app/src/main/java/com/bnyro/translate/db/dao/HistoryDao.kt b/app/src/main/java/com/bnyro/translate/db/dao/HistoryDao.kt
@@ -11,6 +11,13 @@ interface HistoryDao {
     @Query("SELECT * FROM HistoryItem")
     fun getAll(): List<HistoryItem>
 
+    @Query("SELECT EXISTS(SELECT * FROM HistoryItem WHERE insertedText = :insertedText AND sourceLanguageCode = :sourceLanguage AND targetLanguageCode = :targetLanguage)")
+    fun existsSimilar(
+        insertedText: String,
+        sourceLanguage: String,
+        targetLanguage: String
+    ): Boolean
+
     @Insert
     fun insertAll(vararg historyItems: HistoryItem)
 

diff --git a/app/src/main/java/com/bnyro/translate/ui/models/TranslationModel.kt b/app/src/main/java/com/bnyro/translate/ui/models/TranslationModel.kt
@@ -153,17 +153,26 @@ class TranslationModel : ViewModel() {
         ) {
             return
         }
+
+        val historyItem = HistoryItem(
+            sourceLanguageCode = sourceLanguage.code,
+            sourceLanguageName = sourceLanguage.name,
+            targetLanguageCode = targetLanguage.code,
+            targetLanguageName = targetLanguage.name,
+            insertedText = insertedText,
+            translatedText = translation.translatedText
+        )
+
         query {
-            Db.historyDao().insertAll(
-                HistoryItem(
-                    sourceLanguageCode = sourceLanguage.code,
-                    sourceLanguageName = sourceLanguage.name,
-                    targetLanguageCode = targetLanguage.code,
-                    targetLanguageName = targetLanguage.name,
-                    insertedText = insertedText,
-                    translatedText = translation.translatedText
-                )
-            )
+            // don't create new entry if a similar one exists
+            if (Preferences.get(Preferences.skipSimilarHistoryKey, true) && Db.historyDao()
+                    .existsSimilar(
+                        historyItem.insertedText,
+                        historyItem.sourceLanguageCode,
+                        historyItem.targetLanguageCode
+                    )
+            ) return@query
+            Db.historyDao().insertAll(historyItem)
         }
     }
 
@@ -194,7 +203,7 @@ class TranslationModel : ViewModel() {
     }
 
     private fun getCurrentEngine() = TranslationEngines.engines[
-        Preferences.get(Preferences.apiTypeKey, 0)
+            Preferences.get(Preferences.apiTypeKey, 0)
     ]
 
     private fun getEnabledEngines() = TranslationEngines.engines.filter {

diff --git a/app/src/main/java/com/bnyro/translate/ui/screens/SettingsScreen.kt b/app/src/main/java/com/bnyro/translate/ui/screens/SettingsScreen.kt
@@ -176,6 +176,13 @@ fun SettingsScreen(
                         preferenceTitle = stringResource(R.string.compact_history),
                         preferenceSummary = stringResource(R.string.compact_history_summary)
                     )
+
+                    SwitchPreference(
+                        preferenceKey = Preferences.skipSimilarHistoryKey,
+                        defaultValue = true,
+                        preferenceTitle = stringResource(R.string.skip_similar_entries),
+                        preferenceSummary = stringResource(R.string.skip_similar_entries_desc)
+                    )
                 }
 
                 item {

diff --git a/app/src/main/java/com/bnyro/translate/util/Preferences.kt b/app/src/main/java/com/bnyro/translate/util/Preferences.kt
@@ -9,6 +9,7 @@ object Preferences {
     const val apiKey = "apiKey"
     const val apiTypeKey = "apiTypeKey"
     const val historyEnabledKey = "historyEnabledKey"
+    const val skipSimilarHistoryKey = "skipSimilarHistory"
     const val translateAutomatically = "translateAutomatically"
     const val fetchDelay = "fetchDelay"
     const val compactHistory = "compactHistory"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -27,6 +27,8 @@
     <string name="required">Required</string>
     <string name="optional">Optional</string>
     <string name="compact_history">Compact history</string>
+    <string name="skip_similar_entries">Skip similar entries</string>
+    <string name="skip_similar_entries_desc">Only store unique entries in the history, based on insertion and languages.</string>
     <string name="compact_history_summary">Only show the first 3 text lines per default in the history</string>
     <string name="simultaneous_translation">Simultaneous translation</string>
     <string name="simultaneous_translation_summary">Fetch results from multiple engines at the same time.</string>