clean up engine event

Author: aecsocket

Cargo.lock

@@ -48,15 +48,13 @@ async-stream         = { version = "0.3.6" }
 async-tar            = { version = "0.5" }
 async_zip            = { version = "0.0.17" }
 bimap                = { version = "0.6" }
-blocking             = { version = "1.6" }
 bytes                = { version = "1.10" }
 bzip2                = { version = "0.5" }
 cfg-if               = { version = "1.0" }
 clap                 = { version = "4.5" }
 data-encoding        = { version = "2.9" }
 derive_more          = { version = "2.0" }
 directories          = { version = "6.0" }
-either               = { version = "1.15" }
 foldhash             = { version = "0.1.4" }
 form_urlencoded      = { version = "1.2" }
 futures              = { version = "0.3" }
@@ -77,7 +75,6 @@ pipewire             = { version = "0.8" }
 poem                 = { version = "3.1.9" }
 poem-openapi         = { version = "5.1" }
 rand                 = { version = "0.9" }
-rayon                = { version = "1.10" }
 regex                = { version = "1.11" }
 relm4                = { version = "0.9.1" }
 relm4-components     = { version = "0.9.1" }
@@ -97,7 +94,6 @@ tokio-tungstenite    = { version = "0.26" }
 tokio-util           = { version = "0.7" }
 tracing              = { version = "0.1" }
 tracing-subscriber   = { version = "0.3" }
-unicode-segmentation = { version = "1.12" }
 uniffi               = { version = "0.29.2" }
 webkit6              = { version = "0.4" }
 xz2                  = { version = "0.1" }

Cargo.toml

@@ -20,7 +20,6 @@ wordbase = { workspace = true, features = ["desktop"] }
 
 anyhow             = { workspace = true }
 ascii_table        = { workspace = true, features = ["wide_characters"] }
-bytes              = { workspace = true }
 clap               = { workspace = true, features = ["derive"] }
 futures            = { workspace = true }
 tokio              = { workspace = true, features = ["full"] }

crates/wordbase-cli/Cargo.toml

@@ -22,8 +22,3 @@ name       = "wordbase"
 
 [dependencies]
 wordbase = { workspace = true, features = ["uniffi"] }
-
-uniffi = { workspace = true }
-
-[build-dependencies]
-uniffi = { workspace = true, features = ["build"] }

crates/wordbase-sys/Cargo.toml

@@ -20,7 +20,7 @@ all-features = true
 [features]
 poem   = ["wordbase-api/poem", "dep:poem-openapi"]
 uniffi = ["wordbase-api/uniffi", "dep:uniffi"]
-desktop = ["dep:directories"]
+desktop = ["dep:directories", "dep:tokio-tungstenite"]
 
 [dependencies]
 wordbase-api = { workspace = true, features = ["render-html"] }
@@ -31,11 +31,9 @@ async-compression    = { workspace = true, features = ["xz"] }
 async-stream         = { workspace = true }
 async-tar            = { workspace = true }
 async_zip            = { workspace = true, features = ["deflate", "tokio"] }
-blocking             = { workspace = true }
 bytes                = { workspace = true }
 data-encoding        = { workspace = true }
 directories          = { workspace = true, optional = true }
-either               = { workspace = true }
 foldhash             = { workspace = true }
 futures              = { workspace = true }
 indexmap             = { workspace = true, features = ["serde"] }
@@ -45,7 +43,6 @@ maud                 = { workspace = true }
 paste                = { workspace = true }
 pin-project          = { version = "1.1" }
 poem-openapi         = { workspace = true, optional = true }
-rayon                = { workspace = true }
 regex                = { workspace = true }
 reqwest              = { workspace = true, features = ["json"] }
 rmp-serde            = { workspace = true }
@@ -56,10 +53,9 @@ sqlx                 = { workspace = true, features = ["runtime-tokio", "sqlite"
 tera                 = { workspace = true, features = ["preserve_order"] }
 tokio                = { workspace = true, features = ["sync", "macros"] }
 tokio-stream         = { workspace = true }
-tokio-tungstenite    = { workspace = true }
+tokio-tungstenite    = { workspace = true, optional = true }
 tokio-util           = { workspace = true, features = ["rt"] }
 tracing              = { workspace = true }
-unicode-segmentation = { workspace = true }
 uniffi               = { workspace = true, optional = true, features = ["tokio"] }
 
 derive_more = { workspace = true, features = [

crates/wordbase/Cargo.toml

@@ -9,6 +9,7 @@ pub mod import;
 pub mod lookup;
 pub mod profile;
 pub mod render;
+#[cfg(feature = "desktop")]
 pub mod texthook;
 
 pub use wordbase_api::*;
@@ -23,7 +24,6 @@ use {
     sqlx::{Pool, Sqlite},
     std::path::Path,
     tera::Tera,
-    texthook::Texthookers,
     tokio::sync::broadcast,
     tracing::info,
 };
@@ -36,7 +36,8 @@ pub struct Engine {
     profiles: ArcSwap<Profiles>,
     dictionaries: ArcSwap<Dictionaries>,
     renderer: Tera,
-    texthookers: Texthookers,
+    #[cfg(feature = "desktop")]
+    texthookers: texthook::Texthookers,
     deinflectors: Deinflectors,
     anki: Anki,
     event_tx: broadcast::Sender<EngineEvent>,
@@ -138,7 +139,8 @@ impl Engine {
                 .unwrap();
                 tera
             },
-            texthookers: Texthookers::new(&db, event_tx.clone())
+            #[cfg(feature = "desktop")]
+            texthookers: texthook::Texthookers::new(&db, event_tx.clone())
                 .await
                 .context("failed to create texthooker listener")?,
             deinflectors: Deinflectors::new().context("failed to create deinflectors")?,

crates/wordbase/src/lib.rs

@@ -74,6 +74,8 @@
   body {
     padding: 0;
     margin: 0 0 var(--content-margin) 0;
+    word-break: break-all;
+    overflow-wrap: break-word;
   }
 
   a {

record-templates/records.html

@@ -14,7 +14,7 @@ android {
         minSdk = 24
         targetSdk = 35
         versionCode = 1
-        versionName = "0.1.0"
+        versionName = "0.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

wordbase-android/app/build.gradle.kts

@@ -15,9 +15,6 @@ import kotlinx.coroutines.Deferred
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
 import kotlinx.coroutines.async
-import kotlinx.coroutines.launch
-import uniffi.wordbase.DictionaryEvent
-import uniffi.wordbase.EngineEvent
 import uniffi.wordbase.Wordbase
 import uniffi.wordbase.wordbase
 import uniffi.wordbase_api.Dictionary
@@ -42,42 +39,15 @@ class App : Application() {
             val engine = wordbase(filesDir.absolutePath)
             _dictionaries = engine.dictionaries()
             _profiles = engine.profiles()
-
-            appScope.launch {
-                val eventRx = engine.eventRx()
-                while (true) {
-                    val event = eventRx.recv() ?: return@launch
-                    onWordbaseEvent(engine, event)
-                }
-            }
-
             engine
         }
     }
 
-    private fun onWordbaseEvent(wordbase: Wordbase, event: EngineEvent) {
-        // TODO clean this up on rust side as well
-        when (event) {
-            is EngineEvent.TexthookerConnected -> {}
-            is EngineEvent.TexthookerDisconnected -> {}
-            is EngineEvent.Sentence -> {}
-            is EngineEvent.Dictionary -> {
-                if (event.v1 !is DictionaryEvent.PositionsSwapped) {
-                    _dictionaries = wordbase.dictionaries()
-                    _profiles = wordbase.profiles()
-                }
-            }
-            else -> {
-                _dictionaries = wordbase.dictionaries()
-                _profiles = wordbase.profiles()
-            }
-        }
-    }
-
-    suspend fun swapDictionaryPositions(aId: DictionaryId, bId: DictionaryId) {
-        val wordbase = wordbase.await()
-        wordbase.swapDictionaryPositions(aId, bId)
+    suspend fun <R> writeToWordbase(wordbase: Wordbase, block: suspend () -> R): R {
+        val r = block()
         _dictionaries = wordbase.dictionaries()
+        _profiles = wordbase.profiles()
+        return r
     }
 }
 

wordbase-android/app/src/main/java/io/github/aecsocket/wordbase/App.kt

@@ -48,6 +48,7 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
+import androidx.compose.ui.zIndex
 import androidx.window.core.layout.WindowWidthSizeClass
 import io.github.aecsocket.wordbase.ui.theme.WordbaseTheme
 import kotlinx.coroutines.launch
@@ -139,7 +140,7 @@ fun Ui(manageContent: @Composable (Modifier) -> Unit) {
                         top = padding.calculateTopPadding(),
                         bottom = padding.calculateBottomPadding()
                     ),
-                    query = query
+                    query = query,
                 )
             }
         }