Added test for #16

Author: RhetTbull

src/pasteboard.py

@@ -1,4 +1,13 @@
-"""macOS Pasteboard/Clipboard access using native APIs"""
+"""macOS Pasteboard/Clipboard access using native APIs
+
+Author: Rhet Turnbull <[email protected]>
+
+License: MIT License, copyright 2022 Rhet Turnbull
+
+Original Source: https://github.com/RhetTbull/textinator
+
+Version: 1.1.0, 2022-10-26
+"""
 
 import os
 import typing as t
@@ -191,6 +200,35 @@ def set_image_data(self, image_data: NSData, format: str):
         self.pasteboard.setData_forType_(image_data, format_type)
         self._change_count = self.pasteboard.changeCount()
 
+    def set_text_and_image(
+        self, text: str, filename: t.Union[str, os.PathLike], format: str
+    ):
+        """Set both text from str and image from file in either PNG or TIFF format
+
+        Args:
+            text (str): Text to set on clipboard
+            filename (os.PathLike): Filename of image to set on clipboard
+            format (str): Format of image to set, "PNG" or "TIFF"
+        """
+        if not isinstance(filename, str):
+            filename = str(filename)
+        data = NSData.dataWithContentsOfFile_(filename)
+        self.set_text_and_image_data(text, data, format)
+
+    def set_text_and_image_data(self, text: str, image_data: NSData, format: str):
+        """Set both text and image data on clipboard from NSData in a supported image format
+
+        Args:
+            text (str): Text to set on clipboard
+            image_data (NSData): Image data to set on clipboard
+            format (str): Format of image to set, "PNG" or "TIFF"
+
+        Raises: PasteboardTypeError if format is not "PNG" or "TIFF"
+        """
+        self.set_image_data(image_data, format)
+        self.pasteboard.setString_forType_(text, NSPasteboardTypeString)
+        self._change_count = self.pasteboard.changeCount()
+
     def has_changed(self) -> bool:
         """Return True if clipboard has been changed by another process since last check
 

tests/pasteboard.py

@@ -1,4 +1,13 @@
-"""macOS Pasteboard/Clipboard access using native APIs"""
+"""macOS Pasteboard/Clipboard access using native APIs
+
+Author: Rhet Turnbull <[email protected]>
+
+License: MIT License, copyright 2022 Rhet Turnbull
+
+Original Source: https://github.com/RhetTbull/textinator
+
+Version: 1.1.0, 2022-10-26
+"""
 
 import os
 import typing as t
@@ -191,6 +200,35 @@ def set_image_data(self, image_data: NSData, format: str):
         self.pasteboard.setData_forType_(image_data, format_type)
         self._change_count = self.pasteboard.changeCount()
 
+    def set_text_and_image(
+        self, text: str, filename: t.Union[str, os.PathLike], format: str
+    ):
+        """Set both text from str and image from file in either PNG or TIFF format
+
+        Args:
+            text (str): Text to set on clipboard
+            filename (os.PathLike): Filename of image to set on clipboard
+            format (str): Format of image to set, "PNG" or "TIFF"
+        """
+        if not isinstance(filename, str):
+            filename = str(filename)
+        data = NSData.dataWithContentsOfFile_(filename)
+        self.set_text_and_image_data(text, data, format)
+
+    def set_text_and_image_data(self, text: str, image_data: NSData, format: str):
+        """Set both text and image data on clipboard from NSData in a supported image format
+
+        Args:
+            text (str): Text to set on clipboard
+            image_data (NSData): Image data to set on clipboard
+            format (str): Format of image to set, "PNG" or "TIFF"
+
+        Raises: PasteboardTypeError if format is not "PNG" or "TIFF"
+        """
+        self.set_image_data(image_data, format)
+        self.pasteboard.setString_forType_(text, NSPasteboardTypeString)
+        self._change_count = self.pasteboard.changeCount()
+
     def has_changed(self) -> bool:
         """Return True if clipboard has been changed by another process since last check
 

tests/test_textinator.py

@@ -154,6 +154,16 @@ def test_clipboard_basic(pb):
     assert pb.get_text() == "Hello World"
 
 
+def test_clipboard_text_and_image(pb):
+    """Test clipboard detection when clipboard has text and image (#16)"""
+    pb.clear()
+    with log_file() as log:
+        pb.set_text_and_image("Alt Text", TEST_FILE_HELLO_WORLD, "PNG")
+        sleep(5)
+        assert "clipboard has text, skipping" in log.read()
+        assert pb.get_text() == "Alt Text"
+
+
 def test_clipboard_no_clipboard(pb):
     """Test clipboard detection does not run when "Detect text in images on clipboard" is off"""
     assert click_menu_item("Detect text in images on clipboard")