mirror of
git://git.sv.gnu.org/emacs.git
synced 2025-12-22 13:40:44 -08:00
* org-protocol.el (org-protocol-store-link) (org-protocol-remember, org-protocol-open-source): Add autoloads. * org-compat.el (org-float-time): New function. * org.el (org-clock-update-time-maybe) (org-sort-entries-or-items, org-do-sort) (org-evaluate-time-range, org-time-string-to-seconds) (org-closed-in-range): Use `org-float-time'. * org-timer.el (org-timer-start, org-timer-pause-or-continue) (org-timer-seconds): Use `org-float-time'. * org-clock.el (org-clock-get-clocked-time, org-clock-out) (org-clock-sum, org-dblock-write:clocktable) (org-clocktable-steps): Use `org-float-time'. * org-agenda.el (org-agenda-last-marker-time) (org-agenda-new-marker, org-diary): Use `org-float-time'. * org-compat.el (w32-focus-frame): Declare the w32-focus-frame function. * org-exp.el (org-get-file-contents): Only protect lines that really need it. * org-html.el (require): Require cl for compilation. * org.el: Avoid using `default-major-mode'. * org-plot.el (require): Require CL only at compile time. * org-exp.el (require): Require CL only at compile time. * org-agenda.el (org-agenda-quit): When the agenda window is dedicated, remove other windows before exiting, so that the frame really will be killed. * org-exp.el (org-export-handle-include-files): Reset START and END for each loop cycle. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-eval-in-calendar): Use `org-select-frame-set-input-focus'. * org-compat.el (org-select-frame-set-input-focus): New function. * org.el (org-update-statistics-cookies): New function. (org-mode-map): Bind `C-c #' to `org-update-statistics-cookies'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-src.el (org-edit-fixed-width-region): Set org-src-mode only after the local variables are set. * org-latex.el (org-export-latex-protect-amp): New function. (org-export-latex-links): Protect link ampersands in tables. * org-exp.el (org-export-select-backend-specific-text): Match in two steps, to avoid regexp problems. * org.el (org-offer-links-in-entry): Improve working with many and duplicate links. * org-agenda.el (org-agenda-show-1): Make more consistent with normal cycling. (org-agenda-cycle-show): Make more consistent with normal cycling. * org-gnus.el (org-gnus-store-link): Restore the linking to a website. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-latex.el (org-export-latex-first-lines): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-clock.el (org-clock-modify-effort-estimate): Emit message about new effort. * org.el (org-set-effort): New function. (org-mode-map): New key for effort setting command. * org-agenda.el (org-agenda): Keep window setup when calling agenda from within agenda window. (org-agenda-mode-map): New keys for effort setting commands. (org-agenda-menu): Add effort setting commands to menu. (org-agenda-set-property, org-agenda-set-effort): New functions. * org-latex.el (org-export-latex-tables): Fix `org-table-last-alignment' and `org-table-last-column-widths' if the first column has been removed. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-remove-timestamp-with-keyword): Only remove in entry, not in subtree. * org-src.el (org-src-lang-modes): Add abbreviation elisp for emacs lisp. * org.el (org-open-at-point): When on headline, offer all strings in entry. * org-remember.el (org-remember-templates): Documentation fix. * org.el (org-move-subtree-down): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. (org-get-last-sibling): New function. (org-refile): Use `org-get-next-sibling' instead of the outline version of this function. (org-clean-visibility-after-subtree-move): Use `org-get-next-sibling' and `org-get-last-sibling' instead of the outline versions of these functions. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-prepare-agenda): When creating a new frame for the agenda, make the window dedicated. * org-agenda.el (org-agenda-mode-map): New keys for time motion. * org-table.el (org-table-align): Change the order of reinsertion and deletion, to avoid problems with overlays following the table. * org.el (org-parse-time-string): Better error message. (org-show-subtree): Use org-end-of-subtree. * org-macs.el (org-goto-line): New defsubst. * org.el (org-open-file, org-change-tag-in-region) (org-fast-tag-show-exit): Don't use `goto-line'. * org-table.el (org-table-align, org-table-insert-column) (org-table-delete-column, org-table-move-column) (org-table-sort-lines, org-table-copy-region) (org-table-paste-rectangle, org-table-wrap-region) (org-table-get-specials, org-table-rotate-recalc-marks) (org-table-get-range, org-table-recalculate) (org-table-edit-formulas, org-table-fedit-convert-buffer) (org-table-show-reference, org-table-highlight-rectangle): Don't use `goto-line'. * org-src.el (org-edit-src-code, org-edit-fixed-width-region) (org-edit-src-exit): Don't use `goto-line'. * org-macs.el (org-preserve-lc): Don't use `goto-line'. * org-list.el (org-renumber-ordered-list, org-fix-bullet-type): Don't use `goto-line'. * org-exp.el (org-export-number-lines): Don't use `goto-line'. * org-colview.el (org-columns, org-columns-redo) (org-agenda-columns): Don't use `goto-line'. * org-colview-xemacs.el (org-columns, org-agenda-columns): Don't use `goto-line'. * org-agenda.el (org-agenda-mode): Force visual line motion off. (org-agenda-add-entry-text-maxlines): Improve docstring. (org-agenda-start-with-entry-text-mode): New option. (org-agenda-entry-text-maxlines): New option. (org-agenda-entry-text-mode): New variable. (org-agenda-mode): Set initial value of `org-agenda-entry-text-mode'. (org-agenda-mode-map): Add the `E' key. (org-agenda-menu): Add entry text mode to the menu. (org-agenda-get-some-entry-text): Fix line count bug. (org-finalize-agenda): Apply entry text mode if appropriate. (org-agenda-entry-text-show-here): New function. (org-agenda-entry-text-show): New function. (org-agenda-entry-text-hide): New function. (org-agenda-view-mode-dispatch): Add entry text mode to the view key menu. (org-agenda-entry-text-mode): New command. (org-agenda-set-mode-name): Add entry text mode to the mode line string. (org-agenda-undo, org-agenda-get-restriction-and-command) (org-agenda-get-some-entry-text, org-agenda-redo): Don't use `goto-line'. 2009-09-02 Bernt Hansen <bernt@norang.ca> * org-clock.el (org-notify): Bugfix. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-open-link): Handle multiple links and check for after-string. * org-gnus.el (org-gnus-store-link): Simplify. * org.el (org-latex-regexps): Don't add extra empty lines for display formulas. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-agenda.el (org-agenda-get-some-entry-text): New function. (org-agenda-add-entry-text): Use `org-agenda-get-some-entry-text'. * org.el (org-cycle-separator-lines): Update docstring. (org-cycle-show-empty-lines): Handle negative values for `org-cycle-show-empty-lines'. * org-exp.el (org-export-protect-sub-super): New function. (org-export-normalize-links): Protect the url of plain links from supscript and superscript processing. * org-remember.el (org-remember-escaped-%): New function. (org-remember-apply-template): Use `org-remember-escaped-%' to detect escaped % signs. 2009-09-02 Bastien Guerry <bzg@altern.org> * org-timer.el (org-timer-set-timer): Use `org-notify' and play a sound when showing the notification. * org-clock.el (org-notify): New function. (org-clock-notify-once-if-expired): Use `org-notify'. * org-gnus.el (org-gnus-store-link): Handle `gnus-summary-mode' and `gnus-article-mode' separately. (gnus-summary-article-header): Fix the declare-function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-export-format-source-code-or-example): Translate language. * org-src.el (org-src-lang-modes): New variable (org-edit-src-code): Translate language. * org-exp.el (org-export-format-source-code-or-example): Deal wit the new structure of the `org-export-latex-listings-langs' variable. * org-latex.el (org-export-latex-listings-langs): Change structure of the variable from plist to alist. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-in-commented-line): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hide-block-toggle): Make folded blocks searchable. 2009-09-02 Friedrich Delgado Friedrichs <friedel@nomaden.org> (tiny change) * org.el (org-flag-drawer): More useful error. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-remember.el (org-remember-apply-template): Use org-icompleting-read. * org-publish.el (org-publish): Use org-icompleting-read. * org-colview.el (org-columns-edit-value, org-columns-new) (org-insert-columns-dblock): Use org-icompleting-read. * org-colview-xemacs.el (org-columns-edit-value) (org-columns-new, org-insert-columns-dblock): Use org-icompleting-read. * org-attach.el (org-attach-delete-one, org-attach-open): Use org-icompleting-read. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-hierarchical-todo-statistics): Improve docstring. (org-version): Return the version text. (org-org-menu): Add a menu entry for the new bug reporter. (org-submit-bug-report): New command. * org-list.el (org-hierarchical-checkbox-statistics): Improve docstring. * org.el (org-emphasis-regexp-components): Add "`" to set of pre-emphasis characters. * org-latex.el (org-export-latex-classes): Always include the soul package. (org-export-latex-emphasis-alist): Use \st for strikethough. * org-exp-blocks.el (org-export-blocks-preprocess): Use `indent-code-rigidly' to indent. * org-agenda.el (org-agenda-get-restriction-and-command): Remove properties only if MATCH really is a string. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-packages-alist): Fix customization type. * org.el (org-create-formula-image): Also use `org-export-latex-packages-alist'. * org-html.el (org-export-as-html): Fix bug in footnote regexp. (org-export-as-html): Format footnotes correctly. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-fast-tag-selection): Avoid text properties on tags in the alist. * org-agenda.el (org-agenda-get-restriction-and-command): Avoid text properties on the match element. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-set-regexps-and-options): Make sure the list of done keywords is not invalid. * org-exp.el (org-export-interpolate-newlines): New function. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-format-latex): Avoid nested overlays. * org-latex.el (org-export-latex-listings-langs): Add a few more languages. * org-exp.el (org-export-preprocess-apply-macros): Make sure to ignore newlines and space before the first macro argument. * org-latex.el (org-export-latex-tables): Remove save-excursion around `org-table-align'. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-export-html-special-string-regexps): Definition moved into org.el * org-exp.el (org-export-preprocess-apply-macros): Allow newlines in macro calls. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-latex.el (org-export-latex-listings) (org-export-latex-listings-langs): New options. * org-exp.el (org-export-format-source-code-or-example): Use listing package if requested by the user. 2009-09-02 Bastien Guerry <bzg@altern.org> * org.el (org-iswitchb): Fix bug when aborting the `org-iswitchb' command before actually switching to a buffer. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org-exp.el (org-get-file-contents): Only quote org lines when the markup is src or example. * org-agenda.el (org-agenda-skip-scheduled-if-deadline-is-shown): New option (org-agenda-get-day-entries): Remember deadline results and pass them on into the function getting the scheduling information. (org-agenda-get-scheduled): Accept deadline results as parameters and maybe skip some entries. (org-agenda-skip-scheduled-if-deadline-is-shown): New option. * org.el (org-insert-heading): When respecting content, do not convert current line to headline. * org-clock.el (org-clock-save-markers-for-cut-and-paste): Also cheeeeeck the hd marker (org-clock-in): Also set the hd marker. (org-clock-out): Also set the hd marker. (org-clock-cancel): Reset markers. * org.el (org-clock-hd-marker): New marker. * org-faces.el (org-agenda-clocking): New face. * org-agenda.el (org-agenda-mark-clocking-task): New function. (org-finalize-agenda): call `org-agenda-mark-clocking-task'. * org.el (org-modules): Add org-track.el. * org-agenda.el (org-agenda-bulk-marked-p): New function. (org-agenda-bulk-mark, org-agenda-bulk-unmark): Use `org-agenda-bulk-marked-p'. (org-agenda-bulk-toggle): New command. 2009-09-02 Carsten Dominik <carsten.dominik@gmail.com> * org.el (org-move-subtree-down): Hide subtree if it was folded, not just the body. * org-remember.el (org-remember-finalize): Avoid buffer-modified messages.
416 lines
16 KiB
EmacsLisp
416 lines
16 KiB
EmacsLisp
;;; org-attach.el --- Manage file attachments to org-mode tasks
|
|
|
|
;; Copyright (C) 2008, 2009 Free Software Foundation, Inc.
|
|
|
|
;; Author: John Wiegley <johnw@newartisans.com>
|
|
;; Keywords: org data task
|
|
;; Version: 6.30c
|
|
|
|
;; This file is part of GNU Emacs.
|
|
;;
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
|
;; it under the terms of the GNU General Public License as published by
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
;; (at your option) any later version.
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
;; GNU General Public License for more details.
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
|
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
;;; Commentary:
|
|
|
|
;; See the Org-mode manual for information on how to use it.
|
|
;;
|
|
;; Attachments are managed in a special directory called "data", which
|
|
;; lives in the same directory as the org file itself. If this data
|
|
;; directory is initialized as a Git repository, then org-attach will
|
|
;; automatically commit changes when it sees them.
|
|
;;
|
|
;; Attachment directories are identified using a UUID generated for the
|
|
;; task which has the attachments. These are added as property to the
|
|
;; task when necessary, and should not be deleted or changed by the
|
|
;; user, ever. UUIDs are generated by a mechanism defined in the variable
|
|
;; `org-id-method'.
|
|
|
|
;;; Code:
|
|
|
|
(eval-when-compile
|
|
(require 'cl))
|
|
(require 'org-id)
|
|
(require 'org)
|
|
|
|
(defgroup org-attach nil
|
|
"Options concerning entry attachments in Org-mode."
|
|
:tag "Org Attach"
|
|
:group 'org)
|
|
|
|
(defcustom org-attach-directory "data/"
|
|
"The directory where attachments are stored.
|
|
If this is a relative path, it will be interpreted relative to the directory
|
|
where the Org file lives."
|
|
:group 'org-attach
|
|
:type 'directory)
|
|
|
|
(defcustom org-attach-auto-tag "ATTACH"
|
|
"Tag that will be triggered automatically when an entry has an attachment."
|
|
:group 'org-attach
|
|
:type '(choice
|
|
(const :tag "None" nil)
|
|
(string :tag "Tag")))
|
|
|
|
(defcustom org-attach-file-list-property "Attachments"
|
|
"The property used to keep a list of attachment belonging to this entry.
|
|
This is not really needed, so you may set this to nil if you don't want it.
|
|
Also, for entries where children inherit the directory, the list of
|
|
attachments is not kept in this property."
|
|
:group 'org-attach
|
|
:type '(choice
|
|
(const :tag "None" nil)
|
|
(string :tag "Tag")))
|
|
|
|
(defcustom org-attach-method 'cp
|
|
"The preferred method to attach a file.
|
|
Allowed values are:
|
|
|
|
mv rename the file to move it into the attachment directory
|
|
cp copy the file
|
|
ln create a hard link. Note that this is not supported
|
|
on all systems, and then the result is not defined."
|
|
:group 'org-attach
|
|
:type '(choice
|
|
(const :tag "Copy" cp)
|
|
(const :tag "Move/Rename" mv)
|
|
(const :tag "Link" ln)))
|
|
|
|
(defcustom org-attach-expert nil
|
|
"Non-nil means do not show the splash buffer with the attach dispatcher."
|
|
:group 'org-attach
|
|
:type 'boolean)
|
|
|
|
(defcustom org-attach-allow-inheritance t
|
|
"Non-nil means, allow attachment directories be inherited."
|
|
:group 'org-attach
|
|
:type 'boolean)
|
|
|
|
|
|
(defvar org-attach-inherited nil
|
|
"Indicates if the last access to the attachment directory was inherited.")
|
|
|
|
;;;###autoload
|
|
(defun org-attach ()
|
|
"The dispatcher for attachment commands.
|
|
Shows a list of commands and prompts for another key to execute a command."
|
|
(interactive)
|
|
(let (c marker)
|
|
(when (eq major-mode 'org-agenda-mode)
|
|
(setq marker (or (get-text-property (point) 'org-hd-marker)
|
|
(get-text-property (point) 'org-marker)))
|
|
(unless marker
|
|
(error "No task in current line")))
|
|
(save-excursion
|
|
(when marker
|
|
(set-buffer (marker-buffer marker))
|
|
(goto-char marker))
|
|
(org-back-to-heading t)
|
|
(save-excursion
|
|
(save-window-excursion
|
|
(unless org-attach-expert
|
|
(with-output-to-temp-buffer "*Org Attach*"
|
|
(princ "Select an Attachment Command:
|
|
|
|
a Select a file and attach it to the task, using `org-attach-method'.
|
|
c/m/l Attach a file using copy/move/link method.
|
|
n Create a new attachment, as an Emacs buffer.
|
|
z Synchronize the current task with its attachment
|
|
directory, in case you added attachments yourself.
|
|
|
|
o Open current task's attachments.
|
|
O Like \"o\", but force opening in Emacs.
|
|
f Open current task's attachment directory.
|
|
F Like \"f\", but force using dired in Emacs.
|
|
|
|
d Delete one attachment, you will be prompted for a file name.
|
|
D Delete all of a task's attachments. A safer way is
|
|
to open the directory in dired and delete from there.
|
|
|
|
s Set a specific attachment directory for this entry.
|
|
i Make children of the current entry inherit its attachment directory.")))
|
|
(org-fit-window-to-buffer (get-buffer-window "*Org Attach*"))
|
|
(message "Select command: [acmlzoOfFdD]")
|
|
(setq c (read-char-exclusive))
|
|
(and (get-buffer "*Org Attach*") (kill-buffer "*Org Attach*"))))
|
|
(cond
|
|
((memq c '(?a ?\C-a)) (call-interactively 'org-attach-attach))
|
|
((memq c '(?c ?\C-c))
|
|
(let ((org-attach-method 'cp)) (call-interactively 'org-attach-attach)))
|
|
((memq c '(?m ?\C-m))
|
|
(let ((org-attach-method 'mv)) (call-interactively 'org-attach-attach)))
|
|
((memq c '(?l ?\C-l))
|
|
(let ((org-attach-method 'ln)) (call-interactively 'org-attach-attach)))
|
|
((memq c '(?n ?\C-n)) (call-interactively 'org-attach-new))
|
|
((memq c '(?z ?\C-z)) (call-interactively 'org-attach-sync))
|
|
((memq c '(?o ?\C-o)) (call-interactively 'org-attach-open))
|
|
((eq c ?O) (call-interactively 'org-attach-open-in-emacs))
|
|
((memq c '(?f ?\C-f)) (call-interactively 'org-attach-reveal))
|
|
((memq c '(?F)) (call-interactively 'org-attach-reveal-in-emacs))
|
|
((memq c '(?d ?\C-d)) (call-interactively
|
|
'org-attach-delete-one))
|
|
((eq c ?D) (call-interactively 'org-attach-delete-all))
|
|
((eq c ?q) (message "Abort"))
|
|
((memq c '(?s ?\C-s)) (call-interactively
|
|
'org-attach-set-directory))
|
|
((memq c '(?i ?\C-i)) (call-interactively
|
|
'org-attach-set-inherit))
|
|
(t (error "No such attachment command %c" c))))))
|
|
|
|
(defun org-attach-dir (&optional create-if-not-exists-p)
|
|
"Return the directory associated with the current entry.
|
|
This first checks for a local property ATTACH_DIR, and then for an inherited
|
|
property ATTACH_DIR_INHERIT. If neither exists, the default mechanism
|
|
using the entry ID will be invoked to access the unique directory for the
|
|
current entry.
|
|
If the directory does not exist and CREATE-IF-NOT-EXISTS-P is non-nil,
|
|
the directory and (if necessary) the corresponding ID will be created."
|
|
(let (attach-dir uuid inherit)
|
|
(setq org-attach-inherited (org-entry-get nil "ATTACH_DIR_INHERIT"))
|
|
(cond
|
|
((setq attach-dir (org-entry-get nil "ATTACH_DIR"))
|
|
(org-attach-check-absolute-path attach-dir))
|
|
((and org-attach-allow-inheritance
|
|
(setq inherit (org-entry-get nil "ATTACH_DIR_INHERIT" t)))
|
|
(setq attach-dir
|
|
(save-excursion
|
|
(save-restriction
|
|
(widen)
|
|
(goto-char org-entry-property-inherited-from)
|
|
(let (org-attach-allow-inheritance)
|
|
(org-attach-dir create-if-not-exists-p)))))
|
|
(org-attach-check-absolute-path attach-dir)
|
|
(setq org-attach-inherited t))
|
|
(t ; use the ID
|
|
(org-attach-check-absolute-path nil)
|
|
(setq uuid (org-id-get (point) create-if-not-exists-p))
|
|
(when (or uuid create-if-not-exists-p)
|
|
(unless uuid (error "ID retrieval/creation failed"))
|
|
(setq attach-dir (expand-file-name
|
|
(format "%s/%s"
|
|
(substring uuid 0 2)
|
|
(substring uuid 2))
|
|
(expand-file-name org-attach-directory))))))
|
|
(when attach-dir
|
|
(if (and create-if-not-exists-p
|
|
(not (file-directory-p attach-dir)))
|
|
(make-directory attach-dir t))
|
|
(and (file-exists-p attach-dir)
|
|
attach-dir))))
|
|
|
|
(defun org-attach-check-absolute-path (dir)
|
|
"Check if we have enough information to root the atachment directory.
|
|
When DIR is given, check also if it is already absolute. Otherwise,
|
|
assume that it will be relative, and check if `org-attach-directory' is
|
|
absolute, or if at least the current buffer has a file name.
|
|
Throw an error if we cannot root the directory."
|
|
(or (and dir (file-name-absolute-p dir))
|
|
(file-name-absolute-p org-attach-directory)
|
|
(buffer-file-name (buffer-base-buffer))
|
|
(error "Need absolute `org-attach-directory' to attach in buffers without filename.")))
|
|
|
|
(defun org-attach-set-directory ()
|
|
"Set the ATTACH_DIR property of the current entry.
|
|
The property defines the directory that is used for attachments
|
|
of the entry."
|
|
(interactive)
|
|
(let ((dir (org-entry-get nil "ATTACH_DIR")))
|
|
(setq dir (read-directory-name "Attachment directory: " dir))
|
|
(org-entry-put nil "ATTACH_DIR" dir)))
|
|
|
|
(defun org-attach-set-inherit ()
|
|
"Set the ATTACH_DIR_INHERIT property of the current entry.
|
|
The property defines the directory that is used for attachments
|
|
of the entry and any children that do not explicitly define (by setting
|
|
the ATTACH_DIR property) their own attachment directory."
|
|
(interactive)
|
|
(org-entry-put nil "ATTACH_DIR_INHERIT" "t")
|
|
(message "Children will inherit attachment directory"))
|
|
|
|
(defun org-attach-commit ()
|
|
"Commit changes to git if `org-attach-directory' is properly initialized.
|
|
This checks for the existence of a \".git\" directory in that directory."
|
|
(let ((dir (expand-file-name org-attach-directory)))
|
|
(if (file-exists-p (expand-file-name ".git" dir))
|
|
(shell-command
|
|
(concat "(cd " dir "; "
|
|
" git add .; "
|
|
" git ls-files --deleted -z | xargs -0 git rm; "
|
|
" git commit -m 'Synchronized attachments')")))))
|
|
|
|
(defun org-attach-tag (&optional off)
|
|
"Turn the autotag on or (if OFF is set) off."
|
|
(when org-attach-auto-tag
|
|
(save-excursion
|
|
(org-back-to-heading t)
|
|
(org-toggle-tag org-attach-auto-tag (if off 'off 'on)))))
|
|
|
|
(defun org-attach-untag ()
|
|
"Turn the autotag off."
|
|
(org-attach-tag 'off))
|
|
|
|
(defun org-attach-attach (file &optional visit-dir method)
|
|
"Move/copy/link FILE into the attachment directory of the current task.
|
|
If VISIT-DIR is non-nil, visit the directory with dired.
|
|
METHOD may be `cp', `mv', or `ln', default taken from `org-attach-method'."
|
|
(interactive "fFile to keep as an attachment: \nP")
|
|
(setq method (or method org-attach-method))
|
|
(let ((basename (file-name-nondirectory file)))
|
|
(when (and org-attach-file-list-property (not org-attach-inherited))
|
|
(org-entry-add-to-multivalued-property
|
|
(point) org-attach-file-list-property basename))
|
|
(let* ((attach-dir (org-attach-dir t))
|
|
(fname (expand-file-name basename attach-dir)))
|
|
(cond
|
|
((eq method 'mv) (rename-file file fname))
|
|
((eq method 'cp) (copy-file file fname))
|
|
((eq method 'ln) (add-name-to-file file fname)))
|
|
(org-attach-commit)
|
|
(org-attach-tag)
|
|
(if visit-dir
|
|
(dired attach-dir)
|
|
(message "File \"%s\" is now a task attachment." basename)))))
|
|
|
|
(defun org-attach-attach-cp ()
|
|
"Attach a file by copying it."
|
|
(interactive)
|
|
(let ((org-attach-method 'cp)) (call-interactively 'org-attach-attach)))
|
|
(defun org-attach-attach-mv ()
|
|
"Attach a file by moving (renaming) it."
|
|
(interactive)
|
|
(let ((org-attach-method 'mv)) (call-interactively 'org-attach-attach)))
|
|
(defun org-attach-attach-ln ()
|
|
"Attach a file by creating a hard link to it.
|
|
Beware that this does not work on systems that do not support hard links.
|
|
On some systems, this apparently does copy the file instead."
|
|
(interactive)
|
|
(let ((org-attach-method 'ln)) (call-interactively 'org-attach-attach)))
|
|
|
|
(defun org-attach-new (file)
|
|
"Create a new attachment FILE for the current task.
|
|
The attachment is created as an Emacs buffer."
|
|
(interactive "sCreate attachment named: ")
|
|
(when (and org-attach-file-list-property (not org-attach-inherited))
|
|
(org-entry-add-to-multivalued-property
|
|
(point) org-attach-file-list-property file))
|
|
(let ((attach-dir (org-attach-dir t)))
|
|
(org-attach-tag)
|
|
(find-file (expand-file-name file attach-dir))
|
|
(message "New attachment %s" file)))
|
|
|
|
(defun org-attach-delete-one (&optional file)
|
|
"Delete a single attachment."
|
|
(interactive)
|
|
(let* ((attach-dir (org-attach-dir t))
|
|
(files (org-attach-file-list attach-dir))
|
|
(file (or file
|
|
(org-icompleting-read
|
|
"Delete attachment: "
|
|
(mapcar (lambda (f)
|
|
(list (file-name-nondirectory f)))
|
|
files)))))
|
|
(setq file (expand-file-name file attach-dir))
|
|
(unless (file-exists-p file)
|
|
(error "No such attachment: %s" file))
|
|
(delete-file file)))
|
|
|
|
(defun org-attach-delete-all (&optional force)
|
|
"Delete all attachments from the current task.
|
|
This actually deletes the entire attachment directory.
|
|
A safer way is to open the directory in dired and delete from there."
|
|
(interactive "P")
|
|
(when (and org-attach-file-list-property (not org-attach-inherited))
|
|
(org-entry-delete (point) org-attach-file-list-property))
|
|
(let ((attach-dir (org-attach-dir)))
|
|
(when
|
|
(and attach-dir
|
|
(or force
|
|
(y-or-n-p "Are you sure you want to remove all attachments of this entry? ")))
|
|
(shell-command (format "rm -fr %s" attach-dir))
|
|
(message "Attachment directory removed")
|
|
(org-attach-commit)
|
|
(org-attach-untag))))
|
|
|
|
(defun org-attach-sync ()
|
|
"Synchronize the current tasks with its attachments.
|
|
This can be used after files have been added externally."
|
|
(interactive)
|
|
(org-attach-commit)
|
|
(when (and org-attach-file-list-property (not org-attach-inherited))
|
|
(org-entry-delete (point) org-attach-file-list-property))
|
|
(let ((attach-dir (org-attach-dir)))
|
|
(when attach-dir
|
|
(let ((files (org-attach-file-list attach-dir)))
|
|
(and files (org-attach-tag))
|
|
(when org-attach-file-list-property
|
|
(dolist (file files)
|
|
(unless (string-match "^\\." file)
|
|
(org-entry-add-to-multivalued-property
|
|
(point) org-attach-file-list-property file))))))))
|
|
|
|
(defun org-attach-file-list (dir)
|
|
"Return a list of files in the attachment directory.
|
|
This ignores files starting with a \".\", and files ending in \"~\"."
|
|
(delq nil
|
|
(mapcar (lambda (x) (if (string-match "^\\." x) nil x))
|
|
(directory-files dir nil "[^~]\\'"))))
|
|
|
|
(defun org-attach-reveal ()
|
|
"Show the attachment directory of the current task in dired."
|
|
(interactive)
|
|
(let ((attach-dir (org-attach-dir t)))
|
|
(org-open-file attach-dir)))
|
|
|
|
(defun org-attach-reveal-in-emacs ()
|
|
"Show the attachment directory of the current task.
|
|
This will attempt to use an external program to show the directory."
|
|
(interactive)
|
|
(let ((attach-dir (org-attach-dir t)))
|
|
(dired attach-dir)))
|
|
|
|
(defun org-attach-open (&optional in-emacs)
|
|
"Open an attachment of the current task.
|
|
If there are more than one attachment, you will be prompted for the file name.
|
|
This command will open the file using the settings in `org-file-apps'
|
|
and in the system-specific variants of this variable.
|
|
If IN-EMACS is non-nil, force opening in Emacs."
|
|
(interactive "P")
|
|
(let* ((attach-dir (org-attach-dir t))
|
|
(files (org-attach-file-list attach-dir))
|
|
(file (if (= (length files) 1)
|
|
(car files)
|
|
(org-icompleting-read "Open attachment: "
|
|
(mapcar 'list files) nil t))))
|
|
(org-open-file (expand-file-name file attach-dir) in-emacs)))
|
|
|
|
(defun org-attach-open-in-emacs ()
|
|
"Open attachment, force opening in Emacs.
|
|
See `org-attach-open'."
|
|
(interactive)
|
|
(org-attach-open 'in-emacs))
|
|
|
|
(defun org-attach-expand (file)
|
|
"Return the full path to the current entry's attachment file FILE.
|
|
Basically, this adds the path to the attachment directory."
|
|
(expand-file-name file (org-attach-dir)))
|
|
|
|
(defun org-attach-expand-link (file)
|
|
"Return a file link pointing to the current entry's attachment file FILE.
|
|
Basically, this adds the path to the attachment directory, and a \"file:\"
|
|
prefix."
|
|
(concat "file:" (org-attach-expand file)))
|
|
|
|
(provide 'org-attach)
|
|
|
|
;; arch-tag: fce93c2e-fe07-4fa3-a905-e10dcc7a6248
|
|
;;; org-attach.el ends here
|