Only restore clipboard content when it exists

Also, try to force it into text format

Issue: #214

Author: fdw

src/picker/clipboarder/wl.py

@@ -18,13 +18,15 @@ def copy_characters_to_clipboard(self, characters: str) -> None:
         run(["wl-copy"], input=characters, encoding="utf-8")
 
     def copy_paste_characters(self, characters: str, active_window: str, typer: Typer) -> None:
-        old_clipboard_content = run(args=["wl-paste"], capture_output=True).stdout
-        old_primary_content = run(args=["wl-paste", "--primary"], capture_output=True).stdout
+        old_clipboard_content = run(args=["wl-paste", "--type", "text"], capture_output=True, encoding="utf-8")
+        old_primary_content = run(args=["wl-paste", "--primary", "type", "text"], capture_output=True, encoding="utf-8")
 
         run(args=["wl-copy"], input=characters, encoding="utf-8")
         run(args=["wl-copy", "--primary"], input=characters, encoding="utf-8")
 
         typer.insert_from_clipboard(active_window)
 
-        run(args=["wl-copy"], input=old_clipboard_content)
-        run(args=["wl-copy", "--primary"], input=old_primary_content)
+        if old_clipboard_content.returncode == 0:
+            run(args=["wl-copy"], input=old_clipboard_content.stdout, encoding="utf-8")
+        if old_primary_content.returncode == 0:
+            run(args=["wl-copy", "--primary"], input=old_primary_content.stdout, encoding="utf-8")

src/picker/clipboarder/xclip.py

@@ -25,8 +25,16 @@ def copy_characters_to_clipboard(self, characters: str) -> None:
         )
 
     def copy_paste_characters(self, characters: str, active_window: str, typer: Typer) -> None:
-        old_clipboard_content = run(args=["xclip", "-o", "-selection", "clipboard"], capture_output=True).stdout
-        old_primary_content = run(args=["xclip", "-o", "-selection", "primary"], capture_output=True).stdout
+        old_clipboard_content = run(
+            args=["xclip", "-out", "-selection", "clipboard", "-target", "text/plain;charset=utf-8"],
+            capture_output=True,
+            encoding="utf-8",
+        )
+        old_primary_content = run(
+            args=["xclip", "-out", "-selection", "primary", "-target", "text/plain;charset=utf-8"],
+            capture_output=True,
+            encoding="utf-8",
+        )
 
         run(
             args=["xclip", "-i", "-selection", "clipboard"],
@@ -45,15 +53,19 @@ def copy_paste_characters(self, characters: str, active_window: str, typer: Type
 
         typer.insert_from_clipboard(active_window)
 
-        run(
-            args=["xclip", "-i", "-selection", "clipboard"],
-            input=old_clipboard_content,
-            stderr=subprocess.DEVNULL,
-            stdout=subprocess.DEVNULL,
-        )
-        run(
-            args=["xclip", "-i", "-selection", "primary"],
-            input=old_primary_content,
-            stderr=subprocess.DEVNULL,
-            stdout=subprocess.DEVNULL,
-        )
+        if old_clipboard_content.returncode == 0:
+            run(
+                args=["xclip", "-i", "-selection", "clipboard"],
+                input=old_clipboard_content.stdout,
+                stderr=subprocess.DEVNULL,
+                stdout=subprocess.DEVNULL,
+                encoding="utf-8",
+            )
+        if old_primary_content.returncode == 0:
+            run(
+                args=["xclip", "-i", "-selection", "primary"],
+                input=old_primary_content.stdout,
+                stderr=subprocess.DEVNULL,
+                stdout=subprocess.DEVNULL,
+                encoding="utf-8",
+            )

src/picker/clipboarder/xsel.py

@@ -18,13 +18,15 @@ def copy_characters_to_clipboard(self, characters: str) -> None:
         run(["xsel", "-i", "-b"], input=characters, encoding="utf-8")
 
     def copy_paste_characters(self, characters: str, active_window: str, typer: Typer) -> None:
-        old_clipboard_content = run(args=["xsel", "-o", "-b"], capture_output=True).stdout
-        old_primary_content = run(args=["xsel", "-o", "-p"], capture_output=True).stdout
+        old_clipboard_content = run(args=["xsel", "-o", "-b"], capture_output=True, encoding="utf-8")
+        old_primary_content = run(args=["xsel", "-o", "-p"], capture_output=True, encoding="utf-8")
 
         run(args=["xsel", "-i", "-b"], input=characters, encoding="utf-8")
         run(args=["xsel", "-i", "-p"], input=characters, encoding="utf-8")
 
         typer.insert_from_clipboard(active_window)
 
-        run(args=["xsel", "-i", "-b"], input=old_clipboard_content)
-        run(args=["xsel", "-i", "-p"], input=old_primary_content)
+        if old_clipboard_content.returncode == 0:
+            run(args=["xsel", "-i", "-b"], input=old_clipboard_content.stdout, encoding="utf-8")
+        if old_primary_content.returncode == 0:
+            run(args=["xsel", "-i", "-p"], input=old_primary_content.stdout, encoding="utf-8")