refactor: replace MainScope with UIScope in multiple files

fix: filter tag content not fully displayed

Author: Gegenbauer

app/src/main/kotlin/me/gegenbauer/catspy/ui/MainFrame.kt

@@ -1,6 +1,9 @@
 package me.gegenbauer.catspy.ui
 
-import kotlinx.coroutines.*
+import kotlinx.coroutines.Dispatchers
+import kotlinx.coroutines.cancel
+import kotlinx.coroutines.launch
+import kotlinx.coroutines.withContext
 import me.gegenbauer.catspy.concurrency.*
 import me.gegenbauer.catspy.conf.MainConfSync
 import me.gegenbauer.catspy.configuration.GlobalStrings
@@ -62,7 +65,7 @@ class MainFrame(
     private val globalStatus = ServiceManager.getContextService(StatusPanel::class.java)
     private val mainViewModel = ServiceManager.getContextService(this, MainViewModel::class.java)
     private val memoryStatusBar = MemoryStatusBar()
-    private val scope = MainScope()
+    private val scope = UIScope()
 
     init {
         configureWindow()

app/src/main/kotlin/me/gegenbauer/catspy/ui/dialog/GThemeSettingsDialog.kt

@@ -1,13 +1,13 @@
 package me.gegenbauer.catspy.ui.dialog
 
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import me.gegenbauer.catspy.configuration.*
 import me.gegenbauer.catspy.file.gson
 import me.gegenbauer.catspy.java.ext.EMPTY_STRING
 import me.gegenbauer.catspy.concurrency.GlobalMessageManager
 import me.gegenbauer.catspy.concurrency.Message
+import me.gegenbauer.catspy.concurrency.UIScope
 import me.gegenbauer.catspy.java.ext.copyFields
 import me.gegenbauer.catspy.strings.STRINGS
 import me.gegenbauer.catspy.strings.globalLocale
@@ -26,14 +26,15 @@ class GThemeSettingsDialog(
     private var tree = SettingsTree()
 
     private var startSettings = SettingsManager.string
-    private val scope = MainScope()
+    private val scope = UIScope()
 
     init {
         title = STRINGS.ui.preferences
 
         initUI()
 
-        defaultCloseOperation = WindowConstants.DISPOSE_ON_CLOSE
+        defaultCloseOperation = DISPOSE_ON_CLOSE
+        installKeyStrokeEscClosing(this)
         modalityType = ModalityType.APPLICATION_MODAL
         pack()
 

app/src/main/kotlin/me/gegenbauer/catspy/ui/panel/HomePanel.kt

@@ -3,8 +3,8 @@ package me.gegenbauer.catspy.ui.panel
 import info.clearthought.layout.TableLayout
 import info.clearthought.layout.TableLayoutConstants.FILL
 import info.clearthought.layout.TableLayoutConstants.PREFERRED
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
+import me.gegenbauer.catspy.concurrency.UIScope
 import me.gegenbauer.catspy.context.ServiceManager
 import me.gegenbauer.catspy.java.ext.Bundle
 import me.gegenbauer.catspy.log.ui.tab.DeviceLogGuidancePanel
@@ -30,7 +30,7 @@ class HomePanel : BaseTabPanel() {
     private val tabManager: TabManager
         get() = contexts.getContext(MainFrame::class.java)!!
     private val statusBar = ServiceManager.getContextService(StatusPanel::class.java)
-    private val scope = MainScope()
+    private val scope = UIScope()
 
     override fun onSetup(bundle: Bundle?) {
         layout = TableLayout(

app/src/main/kotlin/me/gegenbauer/catspy/ui/panel/MemoryStatusBar.kt

@@ -1,10 +1,10 @@
 package me.gegenbauer.catspy.ui.panel
 
 import kotlinx.coroutines.Dispatchers
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
 import me.gegenbauer.catspy.concurrency.CPU
+import me.gegenbauer.catspy.concurrency.UIScope
 import me.gegenbauer.catspy.context.*
 import me.gegenbauer.catspy.file.GB
 import me.gegenbauer.catspy.file.KB
@@ -18,7 +18,7 @@ import java.awt.event.MouseEvent
 import javax.swing.JProgressBar
 
 class MemoryStatusBar(override val contexts: Contexts = Contexts.default) : JProgressBar(), Context {
-    private val scope = MainScope()
+    private val scope = UIScope()
     private val memoryLimit by lazy {
         (Runtime.getRuntime().maxMemory() - MemoryMonitor.minFreeMemory).also {
             GLog.d(TAG, "[memoryLimit] ${it / GB} GB")

app/src/main/kotlin/me/gegenbauer/catspy/ui/panel/TabManagerPane.kt

@@ -2,9 +2,9 @@ package me.gegenbauer.catspy.ui.panel
 
 import com.formdev.flatlaf.FlatClientProperties.*
 import com.github.weisj.darklaf.iconset.AllIcons
-import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.cancel
 import kotlinx.coroutines.launch
+import me.gegenbauer.catspy.concurrency.UIScope
 import me.gegenbauer.catspy.context.Contexts
 import me.gegenbauer.catspy.context.ServiceManager
 import me.gegenbauer.catspy.glog.GLog
@@ -17,7 +17,6 @@ import me.gegenbauer.catspy.log.serialize.toLogMetadata
 import me.gegenbauer.catspy.log.ui.tab.DeviceLogMainPanel
 import me.gegenbauer.catspy.log.ui.tab.FileLogMainPanel
 import me.gegenbauer.catspy.platform.currentPlatform
-import me.gegenbauer.catspy.script.ui.ScriptTabPanel
 import me.gegenbauer.catspy.strings.STRINGS
 import me.gegenbauer.catspy.ui.MainFrame
 import me.gegenbauer.catspy.ui.menu.TabSelectorPopupMenu
@@ -65,7 +64,7 @@ class TabManagerPane(override val contexts: Contexts = Contexts.default) : TabMa
     }
 
     private val selectMenu = TabSelectorPopupMenu()
-    private val scope = MainScope()
+    private val scope = UIScope()
     private val addTabButton = JButton().apply {
         icon = AllIcons.Action.Add.get(TAB_ICON_SIZE, TAB_ICON_SIZE)
         addActionListener(createNewTabAction())

concurrency/src/main/kotlin/me/gegenbauer/catspy/concurrency/ScopeDomain.kt

@@ -56,6 +56,15 @@ open class ModelScope : CoroutineScope {
     }
 }
 
+class UIScope : CoroutineScope {
+    override val coroutineContext: CoroutineContext
+        = CoroutineName(TAG) + Dispatchers.UI + loggingExceptionHandler + SupervisorJob()
+
+    private companion object {
+        private const val TAG = "UIScope"
+    }
+}
+
 /**
  * Scope of ViewModel. Use [Dispatchers.UI] as default. Its lifecycle is as long as ViewModel.
  */

task/src/main/kotlin/me/gegenbauer/catspy/task/LoadProcessPackageTask.kt

@@ -94,18 +94,20 @@ class AndroidProcessFetcher(private val device: String) {
 
     private suspend fun updatePidToPackageMap(reason: String) {
         withContext(Dispatchers.GIO) {
-            kotlin.runCatching {
+            runCatching {
                 if (device.isEmpty()) {
                     return@withContext
                 }
                 Log.d(TAG, "[updatePidToPackageMap] $reason, query package info from device.")
                 val process = Runtime.getRuntime().exec("${SettingsManager.adbPath} -s $device shell ps")
-                val reader = BufferedReader(InputStreamReader(process.inputStream))
-                reader.forEachLine {
-                    parseLineToPidPackage(it)?.let { (pid, packageName) ->
-                        packageNameCache[pid] = packageName
+                BufferedReader(InputStreamReader(process.inputStream)).use { reader ->
+                    reader.forEachLine {
+                        parseLineToPidPackage(it)?.let { (pid, packageName) ->
+                            packageNameCache[pid] = packageName
+                        }
                     }
                 }
+                process.errorStream.bufferedReader().use { it.readText() }
             }.onFailure {
                 Log.e(TAG, "[updatePidToPackageMap] failed", it)
             }
@@ -135,7 +137,7 @@ class AndroidProcessFetcher(private val device: String) {
      * adb shell "date +'%m-%d %H:%M:%S' | awk '{printf \"%s.\", \$0}'; date +'%N' | cut -c1-3"
      */
     private fun fetchTimeOnDevice(): String {
-        return kotlin.runCatching {
+        return runCatching {
             val dateTimeProcess = Runtime.getRuntime().exec(
                 "${SettingsManager.adbPath} -s " +
                         "$device shell date +'%m-%d %H:%M:%S'"