refactor: replace logcat DSL with subprocess

Author: WhiredPlanck

app/src/main/java/com/osfans/trime/daemon/RimeDaemon.kt

@@ -20,7 +20,8 @@ import com.osfans.trime.core.whenReady
 import com.osfans.trime.ui.main.LogActivity
 import com.osfans.trime.util.appContext
 import com.osfans.trime.util.createNotificationChannel
-import com.osfans.trime.util.logcat
+import com.osfans.trime.util.readText
+import com.osfans.trime.util.subprocess
 import com.osfans.trime.util.toast
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -171,9 +172,7 @@ object RimeDaemon {
         if (it is RimeMessage.DeployMessage) {
             when (it.data) {
                 RimeMessage.DeployMessage.State.Start -> {
-                    withContext(Dispatchers.IO) {
-                        logcat { clear() }
-                    }
+                    withContext(Dispatchers.IO) { subprocess("logcat", "--clear") }
                 }
                 RimeMessage.DeployMessage.State.Success -> {
                     ContextCompat.getMainExecutor(appContext).execute {
@@ -185,13 +184,8 @@ object RimeDaemon {
                         Intent(appContext, LogActivity::class.java).apply {
                             flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TASK
                             val log =
-                                withContext(Dispatchers.IO) {
-                                    logcat {
-                                        format("brief")
-                                        filterspec("rime.trime", "W")
-                                        dump()
-                                    }.inputStream.bufferedReader().readText()
-                                }
+                                subprocess("logcat", "-v", "brief", "-s", "rime.trime:W", "-d")
+                                    .readText()
                             putExtra(LogActivity.FROM_DEPLOY, true)
                             putExtra(LogActivity.DEPLOY_FAILURE_TRACE, log)
                         }

app/src/main/java/com/osfans/trime/util/Logcat.kt

@@ -39,10 +39,7 @@ class Logcat(
     fun getLogAsync(): Deferred<Result<List<String>>> =
         async {
             runCatching {
-                logcat {
-                    pid?.let { pid(it) }
-                    dump()
-                }.inputStream.bufferedReader().readLines()
+                subprocess("logcat", pid?.let { "--pid=$it" } ?: "", "-d").readLines()
             }
         }
 
@@ -51,7 +48,7 @@ class Logcat(
      */
     fun clearLog(): Job =
         launch {
-            runCatching { logcat { clear() } }
+            runCatching { subprocess("logcat", "--clear") }
         }
 
     /**
@@ -63,10 +60,8 @@ class Logcat(
         } else {
             launch {
                 runCatching {
-                    logcat {
-                        pid?.let { pid(it) }
-                        format("time")
-                    }.also { process = it }
+                    subprocess("logcat", pid?.let { "--pid=$it" } ?: "", "-v", "time")
+                        .also { process = it }
                         .asFlow()
                         .collect { flow.emit(it) }
                 }
@@ -85,35 +80,3 @@ class Logcat(
         val default by lazy { Logcat() }
     }
 }
-
-// DSL
-inline fun logcat(builderAction: LogcatCommandBuilder.() -> Unit): java.lang.Process =
-    LogcatCommandBuilder().apply(builderAction).toProcess()
-
-class LogcatCommandBuilder {
-    private val cmdList = arrayListOf("logcat")
-
-    fun clear() = apply { cmdList.add("--clear") }
-
-    fun dump() = apply { cmdList.add("-d") }
-
-    fun pid(pid: Int) = apply { cmdList.add("--pid=$pid") }
-
-    fun format(format: String) = apply { cmdList.add("--format=$format") }
-
-    fun filterspec(
-        tag: String,
-        priority: String,
-    ) = apply {
-        cmdList.add("-s")
-        cmdList.add("$tag:$priority")
-    }
-
-    fun filterspec(spec: String) =
-        apply {
-            cmdList.add("-s")
-            cmdList.add(spec)
-        }
-
-    fun toProcess(): java.lang.Process = Runtime.getRuntime().exec(cmdList.toTypedArray())
-}

app/src/main/java/com/osfans/trime/util/Flow.kt renamed to app/src/main/java/com/osfans/trime/util/Process.kt

@@ -10,6 +10,9 @@ import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.asFlow
 import kotlinx.coroutines.flow.cancellable
 import kotlinx.coroutines.flow.flowOn
+import kotlinx.coroutines.withContext
+
+fun subprocess(vararg commands: String): Process = Runtime.getRuntime().exec(commands)
 
 fun Process.asFlow(): Flow<String> =
     inputStream
@@ -18,3 +21,13 @@ fun Process.asFlow(): Flow<String> =
         .asFlow()
         .flowOn(Dispatchers.IO)
         .cancellable()
+
+suspend fun Process.readText() =
+    withContext(Dispatchers.IO) {
+        inputStream.bufferedReader().readText()
+    }
+
+suspend fun Process.readLines() =
+    withContext(Dispatchers.IO) {
+        inputStream.bufferedReader().readLines()
+    }