✨ Add a switch to control whether to read pasteboard content set before application startup (#1877)

guiyanakuang · web-flow · commit 5194fbcef626 · 2024-09-12T11:40:22.000+08:00
diff --git a/composeApp/src/commonMain/kotlin/com/crosspaste/config/AppConfig.kt b/composeApp/src/commonMain/kotlin/com/crosspaste/config/AppConfig.kt
@@ -21,6 +21,7 @@ data class AppConfig(
     val cleanupPercentage: Int = 20,
     val isAllowDiscovery: Boolean = true,
     val blacklist: String = "[]",
+    val enableSkipPriorPasteboardContent: Boolean = true,
     val lastPasteboardChangeCount: Int = -1,
     val enablePasteboardListening: Boolean = true,
     val showTutorial: Boolean = true,
@@ -51,6 +52,12 @@ data class AppConfig(
             cleanupPercentage = if (key == "cleanupPercentage") value as Int else cleanupPercentage,
             isAllowDiscovery = if (key == "isAllowDiscovery") value as Boolean else isAllowDiscovery,
             blacklist = if (key == "blacklist") value as String else blacklist,
+            enableSkipPriorPasteboardContent =
+                if (key == "enableSkipPriorPasteboardContent") {
+                    value as Boolean
+                } else {
+                    enableSkipPriorPasteboardContent
+                },
             lastPasteboardChangeCount = if (key == "lastPasteboardChangeCount") value as Int else lastPasteboardChangeCount,
             enablePasteboardListening = if (key == "enablePasteboardListening") value as Boolean else enablePasteboardListening,
             showTutorial = if (key == "showTutorial") value as Boolean else showTutorial,
diff --git a/composeApp/src/commonMain/kotlin/com/crosspaste/ui/base/BaseIcon.kt b/composeApp/src/commonMain/kotlin/com/crosspaste/ui/base/BaseIcon.kt
@@ -123,3 +123,8 @@ fun circle(): Painter {
 fun archive(): Painter {
     return painterResource("icon/base/archive.svg")
 }
+
+@Composable
+fun skipForward(): Painter {
+    return painterResource("icon/base/skip-forward.svg")
+}
diff --git a/composeApp/src/commonMain/kotlin/com/crosspaste/ui/settings/PasteboardSettingsView.kt b/composeApp/src/commonMain/kotlin/com/crosspaste/ui/settings/PasteboardSettingsView.kt
@@ -30,6 +30,7 @@ import com.crosspaste.i18n.GlobalCopywriter
 import com.crosspaste.ui.base.Counter
 import com.crosspaste.ui.base.CustomSwitch
 import com.crosspaste.ui.base.file
+import com.crosspaste.ui.base.skipForward
 import com.crosspaste.ui.base.sync
 import org.koin.compose.koinInject
 
@@ -56,6 +57,31 @@ fun PasteboardSettingsView() {
                 .clip(RoundedCornerShape(8.dp))
                 .background(MaterialTheme.colors.background),
     ) {
+        SettingItemView(
+            painter = skipForward(),
+            text = "skip_prior_pasteboard_content",
+            tint = Color(0xFFFF885B),
+        ) {
+            var enableSkipPriorPasteboardContent by remember {
+                mutableStateOf(
+                    configManager.config.enableSkipPriorPasteboardContent,
+                )
+            }
+
+            CustomSwitch(
+                modifier =
+                    Modifier.width(32.dp)
+                        .height(20.dp),
+                checked = enableSkipPriorPasteboardContent,
+                onCheckedChange = { newEnableSkipPriorPasteboardContent ->
+                    configManager.updateConfig("enableSkipPriorPasteboardContent", newEnableSkipPriorPasteboardContent)
+                    enableSkipPriorPasteboardContent = configManager.config.enableSkipPriorPasteboardContent
+                },
+            )
+        }
+
+        Divider(modifier = Modifier.padding(start = 35.dp))
+
         SettingItemView(
             painter = file(),
             text = "max_back_up_file_size",
@@ -81,7 +107,7 @@ fun PasteboardSettingsView() {
         SettingItemView(
             painter = sync(),
             text = "sync_file_size_limit",
-            tint = MaterialTheme.colors.onBackground,
+            tint = Color(0xFF825B32),
         ) {
             var enabledSyncFileSizeLimit by remember {
                 mutableStateOf(
diff --git a/composeApp/src/commonMain/resources/icon/base/skip-forward.svg b/composeApp/src/commonMain/resources/icon/base/skip-forward.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-skip-forward"><polygon points="5 4 15 12 5 20 5 4"></polygon><line x1="19" y1="5" x2="19" y2="19"></line></svg>
diff --git a/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/LinuxPasteboardService.kt b/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/LinuxPasteboardService.kt
@@ -66,6 +66,12 @@ class LinuxPasteboardService(
 
     private fun run(): Job {
         return serviceScope.launch(CoroutineName("LinuxPasteboardService")) {
+            val firstChange = changeCount == configManager.config.lastPasteboardChangeCount
+
+            if (firstChange && !configManager.config.enableSkipPriorPasteboardContent) {
+                onChange(this, true)
+            }
+
             val x11 = X11Api.INSTANCE
             x11.XOpenDisplay(null)?.let { display ->
                 try {
@@ -106,29 +112,7 @@ class LinuxPasteboardService(
                                 if (selectionNotify.selection?.toLong() == clipboardAtom.toLong()) {
                                     logger.info { "notify change event" }
                                     changeCount++
-
-                                    val source =
-                                        controlUtils.ensureMinExecutionTime(delayTime = 20) {
-                                            appWindowManager.getCurrentActiveAppName()
-                                        }
-
-                                    val contents =
-                                        controlUtils.exponentialBackoffUntilValid(
-                                            initTime = 20L,
-                                            maxTime = 1000L,
-                                            isValidResult = ::isValidContents,
-                                        ) {
-                                            getPasteboardContentsBySafe()
-                                        }
-                                    if (contents != ownerTransferable) {
-                                        contents?.let {
-                                            ownerTransferable = it
-                                            launch(CoroutineName("LinuxPasteboardServiceConsumer")) {
-                                                val pasteTransferable = DesktopReadTransferable(it)
-                                                pasteConsumer.consume(pasteTransferable, source, remote = false)
-                                            }
-                                        }
-                                    }
+                                    onChange(this)
                                 }
                                 selectionNotify.clear()
                             }
@@ -143,6 +127,38 @@ class LinuxPasteboardService(
         }
     }
 
+    private suspend fun onChange(
+        scope: CoroutineScope,
+        firstChange: Boolean = false,
+    ) {
+        val source =
+            if (firstChange) {
+                null
+            } else {
+                controlUtils.ensureMinExecutionTime(delayTime = 20) {
+                    appWindowManager.getCurrentActiveAppName()
+                }
+            }
+
+        val contents =
+            controlUtils.exponentialBackoffUntilValid(
+                initTime = 20L,
+                maxTime = 1000L,
+                isValidResult = ::isValidContents,
+            ) {
+                getPasteboardContentsBySafe()
+            }
+        if (contents != ownerTransferable) {
+            contents?.let {
+                ownerTransferable = it
+                scope.launch(CoroutineName("LinuxPasteboardServiceConsumer")) {
+                    val pasteTransferable = DesktopReadTransferable(it)
+                    pasteConsumer.consume(pasteTransferable, source, remote = false)
+                }
+            }
+        }
+    }
+
     override fun start() {
         if (configManager.config.enablePasteboardListening) {
             if (job?.isActive != true) {
diff --git a/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/MacosPasteboardService.kt b/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/MacosPasteboardService.kt
@@ -70,6 +70,12 @@ class MacosPasteboardService(
                                 logger.info { "currentChangeCount $currentChangeCount changeCount $changeCount" }
                                 val firstChange = changeCount == configManager.config.lastPasteboardChangeCount
                                 changeCount = currentChangeCount
+
+                                if (firstChange && configManager.config.enableSkipPriorPasteboardContent) {
+                                    logger.debug { "Ignoring prior pasteboard" }
+                                    return@let
+                                }
+
                                 if (isCrossPaste.value != 0) {
                                     logger.debug { "Ignoring crosspaste change" }
                                 } else {
diff --git a/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/WindowsPasteboardService.kt b/composeApp/src/desktopMain/kotlin/com/crosspaste/paste/WindowsPasteboardService.kt
@@ -144,6 +144,10 @@ class WindowsPasteboardService(
         if (job?.isActive != true) {
             job =
                 serviceScope.launch(CoroutineName("WindowsPasteboardService")) {
+                    val firstChange = changeCount == configManager.config.lastPasteboardChangeCount
+                    if (firstChange && !configManager.config.enableSkipPriorPasteboardContent) {
+                        onChange(true)
+                    }
                     run()
                 }
         }
@@ -155,11 +159,15 @@ class WindowsPasteboardService(
         configManager.updateConfig("lastPasteboardChangeCount", changeCount)
     }
 
-    private fun onChange() {
+    private fun onChange(firstChange: Boolean = false) {
         try {
             val source =
-                controlUtils.blockEnsureMinExecutionTime(delayTime = 20) {
-                    appWindowManager.getCurrentActiveAppName()
+                if (firstChange) {
+                    null
+                } else {
+                    controlUtils.blockEnsureMinExecutionTime(delayTime = 20) {
+                        appWindowManager.getCurrentActiveAppName()
+                    }
                 }
 
             val contents =
diff --git a/composeApp/src/desktopMain/resources/i18n/en.properties b/composeApp/src/desktopMain/resources/i18n/en.properties
@@ -138,8 +138,9 @@ service_discovery=Service Discovery
 settings=Settings
 show_main=Show Main Window
 show_search=Show Search Window
-size=Size
 shortcut_keys=Shortcut Keys
+size=Size
+skip_prior_pasteboard_content=Skip prior pasteboard content
 sort_by_creation_time=Sort by creation time
 source=Source
 state=State
diff --git a/composeApp/src/desktopMain/resources/i18n/es.properties b/composeApp/src/desktopMain/resources/i18n/es.properties
@@ -140,6 +140,7 @@ shortcut_keys=Teclas de acceso rápido
 show_main=Mostrar ventana principal
 show_search=Mostrar ventana de búsqueda
 size=Tamaño
+skip_prior_pasteboard_content=Omitir contenido previo del portapapeles
 sort_by_creation_time=Ordenar por tiempo de creación
 source=Fuente
 state=Estado
diff --git a/composeApp/src/desktopMain/resources/i18n/jp.properties b/composeApp/src/desktopMain/resources/i18n/jp.properties
@@ -140,6 +140,7 @@ shortcut_keys=ショートカットキー
 show_main=メインウィンドウを表示
 show_search=検索ウィンドウを表示
 size=サイズ
+skip_prior_pasteboard_content=以前のペーストボードコンテンツをスキップ
 sort_by_creation_time=作成時間でソート
 source=ソース
 state=状態
diff --git a/composeApp/src/desktopMain/resources/i18n/zh.properties b/composeApp/src/desktopMain/resources/i18n/zh.properties
@@ -140,6 +140,7 @@ shortcut_keys=快捷键
 show_main=显示主窗口
 show_search=显示搜索窗口
 size=大小
+skip_prior_pasteboard_content=跳过之前的剪贴板内容
 sort_by_creation_time=按创建时间排序
 source=来源
 state=状态

Original file line number	Diff line number	Diff line change
`@@ -123,3 +123,8 @@ fun circle(): Painter {`
`123`	`123`	`fun archive(): Painter {`
`124`	`124`	`return painterResource("icon/base/archive.svg")`
`125`	`125`	`}`
	`126`	`+`
	`127`	`+@Composable`
	`128`	`+fun skipForward(): Painter {`
	`129`	`+ return painterResource("icon/base/skip-forward.svg")`
	`130`	`+}`