clipsy 1.7.1__py3-none-any.whl → 1.8.0__py3-none-any.whl

clipsy/__init__.py

@@ -1,2 +1,2 @@
-__version__ = "1.7.1"
+__version__ = "1.8.0"
 __app_name__ = "Clipsy"

clipsy/app.py

@@ -120,6 +120,7 @@ class ClipsyApp(rumps.App):
 
         try:
             from AppKit import NSPasteboard, NSPasteboardTypePNG, NSPasteboardTypeString
+            from Foundation import NSData
 
             pb = NSPasteboard.generalPasteboard()
 
@@ -128,11 +129,18 @@ class ClipsyApp(rumps.App):
             if entry.content_type == ContentType.TEXT and entry.text_content:
                 pb.clearContents()
                 pb.setString_forType_(entry.text_content, NSPasteboardTypeString)
+                if entry.rtf_data:
+                    rtf_ns_data = NSData.dataWithBytes_length_(entry.rtf_data, len(entry.rtf_data))
+                    if rtf_ns_data:
+                        pb.setData_forType_(rtf_ns_data, "public.rtf")
+                if entry.html_data:
+                    html_ns_data = NSData.dataWithBytes_length_(entry.html_data, len(entry.html_data))
+                    if html_ns_data:
+                        pb.setData_forType_(html_ns_data, "public.html")
                 self._monitor.sync_change_count()
                 copied = True
 
             elif entry.content_type == ContentType.IMAGE and entry.image_path:
-                from Foundation import NSData
                 img_data = NSData.dataWithContentsOfFile_(entry.image_path)
                 if img_data:
                     pb.clearContents()

clipsy/config.py

@@ -11,6 +11,17 @@ MAX_ENTRIES = 500  # auto-purge threshold
 MAX_TEXT_SIZE = 1_000_000  # 1MB text limit
 MAX_IMAGE_SIZE = 10_000_000  # 10MB image limit
 PREVIEW_LENGTH = 60  # characters shown in menu item
-MENU_DISPLAY_COUNT = 10  # items shown in dropdown
+def _parse_menu_display_count() -> int:
+    raw = os.environ.get("CLIPSY_MENU_DISPLAY_COUNT")
+    if raw is None:
+        return 10
+    try:
+        value = int(raw)
+    except ValueError:
+        return 10
+    return max(5, min(50, value))
+
+
+MENU_DISPLAY_COUNT = _parse_menu_display_count()
 THUMBNAIL_SIZE = (32, 32)  # pixels, for menu icon display
 REDACT_SENSITIVE = True  # mask sensitive data in preview (API keys, passwords, etc.)

clipsy/models.py

@@ -24,3 +24,5 @@ class ClipboardEntry:
     thumbnail_path: str | None = None
     is_sensitive: bool = False
     masked_preview: str | None = None
+    rtf_data: bytes | None = None
+    html_data: bytes | None = None

clipsy/monitor.py

@@ -5,6 +5,16 @@ from pathlib import Path
 
 from AppKit import NSPasteboard, NSPasteboardTypePNG, NSPasteboardTypeTIFF, NSPasteboardTypeString, NSFilenamesPboardType
 
+try:
+    from AppKit import NSPasteboardTypeRTF
+except ImportError:
+    NSPasteboardTypeRTF = "public.rtf"
+
+try:
+    from AppKit import NSPasteboardTypeHTML
+except ImportError:
+    NSPasteboardTypeHTML = "public.html"
+
 from clipsy.config import IMAGE_DIR, MAX_IMAGE_SIZE, MAX_TEXT_SIZE, PREVIEW_LENGTH, REDACT_SENSITIVE, THUMBNAIL_SIZE
 from clipsy.models import ClipboardEntry, ContentType
 from clipsy.redact import detect_sensitive, mask_text
@@ -57,84 +67,122 @@ class ClipboardMonitor:
             return None
 
         if NSPasteboardTypeString in types:
-            text = self._pasteboard.stringForType_(NSPasteboardTypeString)
-            if text:
-                text_bytes = text.encode("utf-8")
-                if len(text_bytes) <= MAX_TEXT_SIZE:
-                    content_hash = compute_hash(text_bytes)
-                    preview = truncate_text(text, PREVIEW_LENGTH)
-
-                    # Detect sensitive data
-                    is_sensitive = False
-                    masked_preview = None
-                    if REDACT_SENSITIVE:
-                        matches = detect_sensitive(text)
-                        if matches:
-                            is_sensitive = True
-                            masked_preview = truncate_text(mask_text(text, matches), PREVIEW_LENGTH)
-
-                    return ClipboardEntry(
-                        id=None,
-                        content_type=ContentType.TEXT,
-                        text_content=text,
-                        image_path=None,
-                        preview=preview,
-                        content_hash=content_hash,
-                        byte_size=len(text_bytes),
-                        created_at=datetime.now(),
-                        is_sensitive=is_sensitive,
-                        masked_preview=masked_preview,
-                    )
+            entry = self._read_text()
+            if entry:
+                return entry
 
         for img_type in (NSPasteboardTypePNG, NSPasteboardTypeTIFF):
             if img_type in types:
-                data = self._pasteboard.dataForType_(img_type)
-                if data is None:
-                    continue
-                img_bytes = bytes(data)
-                if len(img_bytes) > MAX_IMAGE_SIZE:
-                    logger.warning("Image too large (%d bytes), skipping", len(img_bytes))
-                    return None
-                content_hash = compute_hash(img_bytes)
-                is_png = img_type == NSPasteboardTypePNG
-                image_path, thumbnail_path = self._save_image(img_bytes, content_hash, is_png)
-                width, height = get_image_dimensions(img_bytes)
-                preview = f"[Image: {width}x{height}]" if width > 0 else "[Image]"
-                return ClipboardEntry(
-                    id=None,
-                    content_type=ContentType.IMAGE,
-                    text_content=None,
-                    image_path=str(image_path),
-                    preview=preview,
-                    content_hash=content_hash,
-                    byte_size=len(img_bytes),
-                    created_at=datetime.now(),
-                    thumbnail_path=str(thumbnail_path) if thumbnail_path else None,
-                )
+                entry = self._read_image(img_type)
+                if entry:
+                    return entry
 
         if NSFilenamesPboardType in types:
-            filenames = self._pasteboard.propertyListForType_(NSFilenamesPboardType)
-            if filenames:
-                file_list = list(filenames)
-                text = "\n".join(file_list)
-                content_hash = compute_hash(text)
-                if len(file_list) == 1:
-                    preview = truncate_text(Path(file_list[0]).name, PREVIEW_LENGTH)
-                else:
-                    preview = truncate_text(f"{len(file_list)} files: {Path(file_list[0]).name}, ...", PREVIEW_LENGTH)
-                return ClipboardEntry(
-                    id=None,
-                    content_type=ContentType.FILE,
-                    text_content=text,
-                    image_path=None,
-                    preview=preview,
-                    content_hash=content_hash,
-                    byte_size=len(text.encode("utf-8")),
-                    created_at=datetime.now(),
-                )
+            return self._read_files()
 
         return None
 
+    def _read_text(self) -> ClipboardEntry | None:
+        text = self._pasteboard.stringForType_(NSPasteboardTypeString)
+        if not text:
+            return None
+
+        text_bytes = text.encode("utf-8")
+        if len(text_bytes) > MAX_TEXT_SIZE:
+            return None
+
+        content_hash = compute_hash(text_bytes)
+        preview = truncate_text(text, PREVIEW_LENGTH)
+
+        rtf_data = None
+        html_data = None
+        types = self._pasteboard.types()
+        if types:
+            if NSPasteboardTypeRTF in types:
+                data = self._pasteboard.dataForType_(NSPasteboardTypeRTF)
+                if data:
+                    rtf_data = bytes(data)
+            if NSPasteboardTypeHTML in types:
+                data = self._pasteboard.dataForType_(NSPasteboardTypeHTML)
+                if data:
+                    html_data = bytes(data)
+
+        is_sensitive = False
+        masked_preview = None
+        if REDACT_SENSITIVE:
+            matches = detect_sensitive(text)
+            if matches:
+                is_sensitive = True
+                masked_preview = truncate_text(mask_text(text, matches), PREVIEW_LENGTH)
+
+        return ClipboardEntry(
+            id=None,
+            content_type=ContentType.TEXT,
+            text_content=text,
+            image_path=None,
+            preview=preview,
+            content_hash=content_hash,
+            byte_size=len(text_bytes),
+            created_at=datetime.now(),
+            is_sensitive=is_sensitive,
+            masked_preview=masked_preview,
+            rtf_data=rtf_data,
+            html_data=html_data,
+        )
+
+    def _read_image(self, img_type) -> ClipboardEntry | None:
+        data = self._pasteboard.dataForType_(img_type)
+        if data is None:
+            return None
+
+        img_bytes = bytes(data)
+        if len(img_bytes) > MAX_IMAGE_SIZE:
+            logger.warning("Image too large (%d bytes), skipping", len(img_bytes))
+            return None
+
+        content_hash = compute_hash(img_bytes)
+        is_png = img_type == NSPasteboardTypePNG
+        image_path, thumbnail_path = self._save_image(img_bytes, content_hash, is_png)
+        width, height = get_image_dimensions(img_bytes)
+        preview = f"[Image: {width}x{height}]" if width > 0 else "[Image]"
+
+        return ClipboardEntry(
+            id=None,
+            content_type=ContentType.IMAGE,
+            text_content=None,
+            image_path=str(image_path),
+            preview=preview,
+            content_hash=content_hash,
+            byte_size=len(img_bytes),
+            created_at=datetime.now(),
+            thumbnail_path=str(thumbnail_path) if thumbnail_path else None,
+        )
+
+    def _read_files(self) -> ClipboardEntry | None:
+        filenames = self._pasteboard.propertyListForType_(NSFilenamesPboardType)
+        if not filenames:
+            return None
+
+        file_list = list(filenames)
+        text = "\n".join(file_list)
+        content_hash = compute_hash(text)
+
+        if len(file_list) == 1:
+            preview = truncate_text(Path(file_list[0]).name, PREVIEW_LENGTH)
+        else:
+            preview = truncate_text(f"{len(file_list)} files: {Path(file_list[0]).name}, ...", PREVIEW_LENGTH)
+
+        return ClipboardEntry(
+            id=None,
+            content_type=ContentType.FILE,
+            text_content=text,
+            image_path=None,
+            preview=preview,
+            content_hash=content_hash,
+            byte_size=len(text.encode("utf-8")),
+            created_at=datetime.now(),
+        )
+
     def _save_image(self, img_bytes: bytes, content_hash: str, is_png: bool) -> tuple[Path, Path | None]:
         ext = ".png" if is_png else ".tiff"
         filename = content_hash[:12] + ext

clipsy/storage.py

@@ -20,7 +20,9 @@ CREATE TABLE IF NOT EXISTS clipboard_entries (
     source_app     TEXT,
     thumbnail_path TEXT,
     is_sensitive   INTEGER NOT NULL DEFAULT 0,
-    masked_preview TEXT
+    masked_preview TEXT,
+    rtf_data       BLOB,
+    html_data      BLOB
 );
 
 CREATE INDEX IF NOT EXISTS idx_created_at ON clipboard_entries(created_at DESC);
@@ -70,12 +72,24 @@ class StorageManager:
             self._conn.execute("ALTER TABLE clipboard_entries ADD COLUMN is_sensitive INTEGER NOT NULL DEFAULT 0")
         if "masked_preview" not in columns:
             self._conn.execute("ALTER TABLE clipboard_entries ADD COLUMN masked_preview TEXT")
+        if "rtf_data" not in columns:
+            self._conn.execute("ALTER TABLE clipboard_entries ADD COLUMN rtf_data BLOB")
+        if "html_data" not in columns:
+            self._conn.execute("ALTER TABLE clipboard_entries ADD COLUMN html_data BLOB")
+
+    @staticmethod
+    def _delete_files(image_path: str | None, thumbnail_path: str | None) -> None:
+        for file_path in (image_path, thumbnail_path):
+            if file_path:
+                p = Path(file_path)
+                if p.exists():
+                    p.unlink()
 
     def add_entry(self, entry: ClipboardEntry) -> int:
         cursor = self._conn.execute(
             """INSERT INTO clipboard_entries
-               (content_type, text_content, image_path, preview, content_hash, byte_size, created_at, pinned, source_app, thumbnail_path, is_sensitive, masked_preview)
-               VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
+               (content_type, text_content, image_path, preview, content_hash, byte_size, created_at, pinned, source_app, thumbnail_path, is_sensitive, masked_preview, rtf_data, html_data)
+               VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)""",
             (
                 entry.content_type.value,
                 entry.text_content,
@@ -89,6 +103,8 @@ class StorageManager:
                 entry.thumbnail_path,
                 int(entry.is_sensitive),
                 entry.masked_preview,
+                entry.rtf_data,
+                entry.html_data,
             ),
         )
         self._conn.commit()
@@ -124,14 +140,7 @@ class StorageManager:
     def delete_entry(self, entry_id: int) -> None:
         entry = self.get_entry(entry_id)
         if entry:
-            if entry.image_path:
-                path = Path(entry.image_path)
-                if path.exists():
-                    path.unlink()
-            if entry.thumbnail_path:
-                thumb = Path(entry.thumbnail_path)
-                if thumb.exists():
-                    thumb.unlink()
+            self._delete_files(entry.image_path, entry.thumbnail_path)
         self._conn.execute("DELETE FROM clipboard_entries WHERE id = ?", (entry_id,))
         self._conn.commit()
 
@@ -169,14 +178,7 @@ class StorageManager:
 
         deleted = 0
         for row in rows:
-            if row["image_path"]:
-                path = Path(row["image_path"])
-                if path.exists():
-                    path.unlink()
-            if row["thumbnail_path"]:
-                thumb = Path(row["thumbnail_path"])
-                if thumb.exists():
-                    thumb.unlink()
+            self._delete_files(row["image_path"], row["thumbnail_path"])
             self._conn.execute("DELETE FROM clipboard_entries WHERE id = ?", (row["id"],))
             deleted += 1
 
@@ -201,14 +203,7 @@ class StorageManager:
             "SELECT image_path, thumbnail_path FROM clipboard_entries WHERE image_path IS NOT NULL OR thumbnail_path IS NOT NULL"
         ).fetchall()
         for row in rows:
-            if row["image_path"]:
-                path = Path(row["image_path"])
-                if path.exists():
-                    path.unlink()
-            if row["thumbnail_path"]:
-                thumb = Path(row["thumbnail_path"])
-                if thumb.exists():
-                    thumb.unlink()
+            self._delete_files(row["image_path"], row["thumbnail_path"])
         self._conn.execute("DELETE FROM clipboard_entries")
         self._conn.commit()
 
@@ -241,6 +236,8 @@ class StorageManager:
         thumbnail_path = row["thumbnail_path"] if "thumbnail_path" in keys else None
         is_sensitive = bool(row["is_sensitive"]) if "is_sensitive" in keys else False
         masked_preview = row["masked_preview"] if "masked_preview" in keys else None
+        rtf_data = bytes(row["rtf_data"]) if "rtf_data" in keys and row["rtf_data"] is not None else None
+        html_data = bytes(row["html_data"]) if "html_data" in keys and row["html_data"] is not None else None
         return ClipboardEntry(
             id=row["id"],
             content_type=ContentType(row["content_type"]),
@@ -255,4 +252,6 @@ class StorageManager:
             thumbnail_path=thumbnail_path,
             is_sensitive=is_sensitive,
             masked_preview=masked_preview,
+            rtf_data=rtf_data,
+            html_data=html_data,
         )

{clipsy-1.7.1.dist-info → clipsy-1.8.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: clipsy
-Version: 1.7.1
+Version: 1.8.0
 Summary: Lightweight clipboard history manager for macOS
 Author-email: Brendan Conrad <brendan.conrad@gmail.com>
 License: MIT
@@ -59,7 +59,14 @@ A lightweight clipboard history manager for macOS. Runs as a menu bar icon — n
 
 ## Installation
 
-### Via pipx (recommended)
+### Via Homebrew (recommended)
+
+```bash
+brew install brencon/clipsy/clipsy
+clipsy
+```
+
+### Via pipx
 
 ```bash
 brew install pipx

clipsy-1.8.0.dist-info/RECORD

@@ -0,0 +1,15 @@
+clipsy/__init__.py,sha256=2M96CO-qBjhCYnYgi1FZuen5WyQOvlbtLUIIPCDsES0,46
+clipsy/__main__.py,sha256=AzUjrEhnuVX5Mkk3QhfmAO17cyvIYOABsz7QWYmw1r8,4991
+clipsy/app.py,sha256=e987geHCfDs3_9GulTZaS2iJT-BUL_iwpNtAmt6kPW8,7786
+clipsy/config.py,sha256=YetSNZkSkSOHYnCZpty6sGeG99MajbN4goL8UkzJ62A,913
+clipsy/models.py,sha256=9wuaq1t9HhaH8QYuieN7fEVM_RTYEvv6ZUCM_InOMKk,632
+clipsy/monitor.py,sha256=PBTxK53arFm5VVCHIYlxz8eoYQrgTwWsIWNE49IE7oU,6904
+clipsy/redact.py,sha256=EU2nq8oEDYLZ_I_9tX2bXACIF971a0V_ApKdvpN4VGY,7284
+clipsy/storage.py,sha256=ZcuW2uFvJM0Cd3UQEWIMSZYH2DYWM6lD6yol6VpM5io,10047
+clipsy/utils.py,sha256=rztT20cXYJ7633q3oLwt6Fv0Ubq9hm5bPPKDkWyvxdI,2208
+clipsy-1.8.0.dist-info/licenses/LICENSE,sha256=bZ7uVihgPnLGryi5ugUgkVrEoho0_hFAd3bVdhYXGqs,1071
+clipsy-1.8.0.dist-info/METADATA,sha256=UMKIznK4wUar5eV0ic7QVLuoRdZN4fMT6AL34BbuHdE,5884
+clipsy-1.8.0.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+clipsy-1.8.0.dist-info/entry_points.txt,sha256=ISIoWU3Zj-4NEuj2pJW96LxpsvjRJJH73otv9gA9YSs,48
+clipsy-1.8.0.dist-info/top_level.txt,sha256=trxprVJk4ZMudCshc7PD0N9iFgQO4Tq4sW5L5wLduns,7
+clipsy-1.8.0.dist-info/RECORD,,

clipsy-1.7.1.dist-info/RECORD

@@ -1,15 +0,0 @@
-clipsy/__init__.py,sha256=SiyI4J0QW-zHfQ-u7WyAEHr27xsi2W5hxIJPHCKqMq4,46
-clipsy/__main__.py,sha256=AzUjrEhnuVX5Mkk3QhfmAO17cyvIYOABsz7QWYmw1r8,4991
-clipsy/app.py,sha256=_IKuZgA-DvAE3KDsDN00S0aaMIxwBpiv_P1fpzwQFqU,7299
-clipsy/config.py,sha256=E9NCsGMeT2H0YXYCq5xYwbd27VkksV4S9txZSMX0RmE,672
-clipsy/models.py,sha256=i3KjD4Dcp7y_gTXkIBr2xZxFIIC6kHaMWmv6cSIDABM,563
-clipsy/monitor.py,sha256=UUKZToYcZ5pzu7LfiuJ_nnE4AA-d3uLW-WdQU_XrDME,6288
-clipsy/redact.py,sha256=EU2nq8oEDYLZ_I_9tX2bXACIF971a0V_ApKdvpN4VGY,7284
-clipsy/storage.py,sha256=QNox2-spkVx_gMPSWqKgF_yj-SMpRJ4UAT6yd9l6rVY,9794
-clipsy/utils.py,sha256=rztT20cXYJ7633q3oLwt6Fv0Ubq9hm5bPPKDkWyvxdI,2208
-clipsy-1.7.1.dist-info/licenses/LICENSE,sha256=bZ7uVihgPnLGryi5ugUgkVrEoho0_hFAd3bVdhYXGqs,1071
-clipsy-1.7.1.dist-info/METADATA,sha256=o3ccHVdbPvMkh49ZfyqM4WHnCn8YJoEolpQDJ0uj74A,5811
-clipsy-1.7.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-clipsy-1.7.1.dist-info/entry_points.txt,sha256=ISIoWU3Zj-4NEuj2pJW96LxpsvjRJJH73otv9gA9YSs,48
-clipsy-1.7.1.dist-info/top_level.txt,sha256=trxprVJk4ZMudCshc7PD0N9iFgQO4Tq4sW5L5wLduns,7
-clipsy-1.7.1.dist-info/RECORD,,