GitHubMirror/libmutton
1
0
Fork 0
mirror of https://github.com/rwinkhart/libmutton.git synced 2026-08-30 22:06:32 -04:00
Code Issues Packages Projects Releases Wiki Activity

Handle error for failing to read clipboard contents on all platforms

Browse Source
This commit is contained in:
RandyTheSilly
2024-06-05 17:45:49 -04:00
parent f7cc27f88d
commit a804cf7cff
3 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/backend/copyDARWIN.go
+6 -2
View File
@@ -40,12 +40,16 @@ func clipClear(oldContents string) {
time.Sleep(30 * time.Second) time.Sleep(30 * time.Second)
cmd := exec.Command("pbpaste") cmd := exec.Command("pbpaste")
newContents, _ := cmd.Output() newContents, err := cmd.Output()
if err != nil {
fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset)
os.Exit(1)
}
if oldContents == strings.TrimRight(string(newContents), "\r\n") { if oldContents == strings.TrimRight(string(newContents), "\r\n") {
cmd = exec.Command("pbcopy") cmd = exec.Command("pbcopy")
writeToStdin(cmd, "") writeToStdin(cmd, "")
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset)
os.Exit(1) os.Exit(1)
src/backend/copyTERMUX.go
+6 -2
View File
@@ -38,12 +38,16 @@ func clipClear(oldContents string) {
time.Sleep(30 * time.Second) time.Sleep(30 * time.Second)
cmd := exec.Command("termux-clipboard-get") cmd := exec.Command("termux-clipboard-get")
newContents, _ := cmd.Output() newContents, err := cmd.Output()
if err != nil {
fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset)
os.Exit(1)
}
if oldContents == strings.TrimRight(string(newContents), "\r\n") { if oldContents == strings.TrimRight(string(newContents), "\r\n") {
cmd = exec.Command("termux-clipboard-set") cmd = exec.Command("termux-clipboard-set")
writeToStdin(cmd, "") writeToStdin(cmd, "")
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset)
os.Exit(1) os.Exit(1)
src/backend/copyWIN.go
+6 -2
View File
@@ -37,11 +37,15 @@ func clipClear(oldContents string) {
time.Sleep(30 * time.Second) time.Sleep(30 * time.Second)
cmd := exec.Command("powershell.exe", "-c", "Get-Clipboard") cmd := exec.Command("powershell.exe", "-c", "Get-Clipboard")
newContents, _ := cmd.Output() newContents, err := cmd.Output()
if err != nil {
fmt.Println(AnsiError + "Failed to read clipboard contents: " + err.Error() + AnsiReset)
os.Exit(1)
}
if oldContents == strings.TrimRight(string(newContents), "\r\n") { if oldContents == strings.TrimRight(string(newContents), "\r\n") {
cmd = exec.Command("powershell.exe", "-c", "Set-Clipboard") cmd = exec.Command("powershell.exe", "-c", "Set-Clipboard")
err := cmd.Run() err = cmd.Run()
if err != nil { if err != nil {
fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset) fmt.Println(AnsiError + "Failed to clear clipboard: " + err.Error() + AnsiReset)
os.Exit(1) os.Exit(1)