Refactor org/org-attach

modules/org/org-attach/config.el

@@ -4,46 +4,69 @@
   "Where to store attachments (relative to current org file).")
 
 
-(add-hook '+org-init-hook #'+org|init-attach t)
+(add-hook 'org-load-hook #'+org-attach|init t)
 
-;; FIXME This module is broken and needs to be rewritten.
-;;
 ;; I believe Org's native attachment system is over-complicated and litters
-;; files with metadata I don't want.
+;; files with metadata I don't want. So I wrote my own, which:
 ;;
-;; This installs my own attachment system. It:
-;;
-;; + Centralizes attachment in a global location,
-;; + Adds drag-and-drop file support
-;; + TODO ...with attachment icons, and
+;; + Causes attachments to be placed in a centralized location,
+;; + Adds drag-and-drop support for images (with inline image preview)
+;; + Adds drag-and-drop support for media files (pdfs, zips, etc) with a
+;;   filetype icon and short link.
 ;; + TODO Offers an attachment management system.
 
+;; Some commands of interest:
+;; + `org-download-screenshot'
+;; + `+org-attach/file'
+;; + `+org-attach/url'
+;; + :org [FILE/URL]
+
 (def-package! org-download
+  :commands (org-download-dnd org-download-dnd-base64)
+  :init
+  ;; Add these myself, so that org-download is lazy-loaded...
+  (setq dnd-protocol-alist
+        `(("^\\(https?\\|ftp\\|file\\|nfs\\):" . +org-attach-download-dnd)
+          ("^data:" . org-download-dnd-base64)
+          ,@dnd-protocol-alist))
+
+  (advice-add #'org-download-enable :override #'ignore)
   :config
   (setq-default org-download-image-dir +org-attach-dir
                 org-download-heading-lvl nil
                 org-download-timestamp "_%Y%m%d_%H%M%S")
+
   (setq org-download-screenshot-method
-        (cond (IS-MAC   "screencapture -i %s")
-              (IS-LINUX "maim --opengl -s %s")))
+        (cond (IS-MAC "screencapture -i %s")
+              (IS-LINUX
+               (cond ((executable-find "maim")
+                      "maim -s %s")
+                     ((executable-find "scrot")
+                      "scrot -s %s")))))
+
+  ;; Handle non-image files a little differently. Images should be inserted
+  ;; as-is, as image previews. Other files, like pdfs or zips, should be linked
+  ;; to, with an icon indicating the type of file.
+  (advice-add #'org-download-insert-link :override #'+org-attach*insert-link)
+
+  (defun +org-attach*download-subdir ()
+    (when (file-in-directory-p buffer-file-name +org-dir)
+      (file-relative-name buffer-file-name +org-dir)))
 
   ;; Write download paths relative to current file
   (defun +org-attach*download-fullname (path)
-    (file-relative-name path (file-name-directory (buffer-file-name))))
+    (file-relative-name path (file-name-directory buffer-file-name)))
   (advice-add #'org-download--dir-2 :override #'ignore)
   (advice-add #'org-download--fullname
               :filter-return #'+org-attach*download-fullname))
 
 ;;
 (defun +org-attach|init ()
-  (setq org-attach-directory +org-attach-directory)
+  (setq org-attach-directory +org-attach-dir)
+
+  (push +org-attach-dir projectile-globally-ignored-directories)
 
-  (push ".attach" projectile-globally-ignored-file-suffixes)
   (after! recentf
-    (push (format "/%s.+$" (regexp-quote +org-attach-dir))
-          recentf-exclude))
+    (push (format "%s.+$" (regexp-quote +org-attach-dir))
+          recentf-exclude)))
 
-  (require 'org-download)
-
-  ;; Add another drag-and-drop handler that will handle anything but image files
-  (push '("^\\(https?\\|ftp\\|file\\|nfs\\):\\(//\\)?" . +org-attach-download-dnd) dnd-protocol-alist))