2009-09-15 18:06:44 +00:00
|
|
|
;;; org-mobile.el --- Code for asymmetric sync with a mobile device
|
2012-03-17 15:31:04 +00:00
|
|
|
;; Copyright (C) 2009-2012 Free Software Foundation, Inc.
|
2009-09-15 18:06:44 +00:00
|
|
|
;;
|
|
|
|
;; Author: Carsten Dominik <carsten at orgmode dot org>
|
|
|
|
;; Keywords: outlines, hypermedia, calendar, wp
|
|
|
|
;; Homepage: http://orgmode.org
|
|
|
|
;;
|
|
|
|
;; 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:
|
|
|
|
;;
|
|
|
|
;; This file contains the code to interact with Richard Moreland's iPhone
|
2010-10-13 15:20:53 +00:00
|
|
|
;; application MobileOrg, as well as with the Android version by Matthew Jones.
|
|
|
|
;; This code is documented in Appendix B of the Org-mode manual. The code is
|
|
|
|
;; not specific for the iPhone and Android - any external
|
|
|
|
;; viewer/flagging/editing application that uses the same conventions could
|
|
|
|
;; be used.
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(require 'org)
|
|
|
|
(require 'org-agenda)
|
2010-07-16 21:23:01 +00:00
|
|
|
;;; Code:
|
|
|
|
|
2009-10-20 11:24:55 +00:00
|
|
|
(eval-when-compile (require 'cl))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(declare-function org-pop-to-buffer-same-window
|
2011-07-18 17:25:10 +00:00
|
|
|
"org-compat" (&optional buffer-or-name norecord label))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defgroup org-mobile nil
|
2009-10-05 15:13:56 +00:00
|
|
|
"Options concerning support for a viewer/editor on a mobile device."
|
2009-09-15 18:06:44 +00:00
|
|
|
:tag "Org Mobile"
|
|
|
|
:group 'org)
|
|
|
|
|
2009-09-28 18:25:50 +00:00
|
|
|
(defcustom org-mobile-files '(org-agenda-files)
|
|
|
|
"Files to be staged for MobileOrg.
|
2009-11-12 12:39:29 +00:00
|
|
|
This is basically a list of files and directories. Files will be staged
|
2009-09-28 18:25:50 +00:00
|
|
|
directly. Directories will be search for files with the extension `.org'.
|
|
|
|
In addition to this, the list may also contain the following symbols:
|
|
|
|
|
|
|
|
org-agenda-files
|
2010-01-21 15:15:40 +00:00
|
|
|
This means include the complete, unrestricted list of files given in
|
2009-09-28 18:25:50 +00:00
|
|
|
the variable `org-agenda-files'.
|
|
|
|
org-agenda-text-search-extra-files
|
|
|
|
Include the files given in the variable
|
|
|
|
`org-agenda-text-search-extra-files'"
|
|
|
|
:group 'org-mobile
|
|
|
|
:type '(list :greedy t
|
|
|
|
(option (const :tag "org-agenda-files" org-agenda-files))
|
|
|
|
(option (const :tag "org-agenda-text-search-extra-files"
|
|
|
|
org-agenda-text-search-extra-files))
|
|
|
|
(repeat :inline t :tag "Additional files"
|
|
|
|
(file))))
|
|
|
|
|
2011-03-05 10:49:30 +00:00
|
|
|
(defcustom org-mobile-files-exclude-regexp ""
|
|
|
|
"A regexp to exclude files from `org-mobile-files'."
|
|
|
|
:group 'org-mobile
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2011-03-05 10:49:30 +00:00
|
|
|
:type 'regexp)
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defcustom org-mobile-directory ""
|
|
|
|
"The WebDAV directory where the interaction with the mobile takes place."
|
|
|
|
:group 'org-mobile
|
|
|
|
:type 'directory)
|
|
|
|
|
2010-03-16 06:32:50 +00:00
|
|
|
(defcustom org-mobile-use-encryption nil
|
2010-07-16 21:23:01 +00:00
|
|
|
"Non-nil means keep only encrypted files on the WebDAV server.
|
2010-03-16 06:32:50 +00:00
|
|
|
Encryption uses AES-256, with a password given in
|
|
|
|
`org-mobile-encryption-password'.
|
|
|
|
When nil, plain files are kept on the server.
|
|
|
|
Turning on encryption requires to set the same password in the MobileOrg
|
2010-05-31 07:14:12 +00:00
|
|
|
application. Before turning this on, check of MobileOrg does already
|
|
|
|
support it - at the time of this writing it did not yet."
|
2010-03-16 06:32:50 +00:00
|
|
|
:group 'org-mobile
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-03-16 06:32:50 +00:00
|
|
|
:type 'boolean)
|
|
|
|
|
|
|
|
(defcustom org-mobile-encryption-tempfile "~/orgtmpcrypt"
|
|
|
|
"File that is being used as a temporary file for encryption.
|
2010-07-16 21:23:01 +00:00
|
|
|
This must be local file on your local machine (not on the WebDAV server).
|
2010-03-16 06:32:50 +00:00
|
|
|
You might want to put this file into a directory where only you have access."
|
|
|
|
:group 'org-mobile
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-03-16 06:32:50 +00:00
|
|
|
:type 'directory)
|
|
|
|
|
|
|
|
(defcustom org-mobile-encryption-password ""
|
|
|
|
"Password for encrypting files uploaded to the server.
|
|
|
|
This is a single password which is used for AES-256 encryption. The same
|
|
|
|
password must also be set in the MobileOrg application. All Org files,
|
|
|
|
including mobileorg.org will be encrypted using this password.
|
2010-09-26 09:16:34 +00:00
|
|
|
|
|
|
|
SECURITY CONSIDERATIONS:
|
|
|
|
|
2010-07-16 21:23:01 +00:00
|
|
|
Note that, when Org runs the encryption commands, the password could
|
2010-09-26 09:16:34 +00:00
|
|
|
be visible briefly on your system with the `ps' command. So this method is
|
|
|
|
only intended to keep the files secure on the server, not on your own machine.
|
|
|
|
|
|
|
|
Also, if you set this variable in an init file (.emacs or .emacs.d/init.el
|
|
|
|
or custom.el...) and if that file is stored in a way so that other can read
|
|
|
|
it, this also limits the security of this approach. You can also leave
|
|
|
|
this variable empty - Org will then ask for the password once per Emacs
|
|
|
|
session."
|
2010-03-16 06:32:50 +00:00
|
|
|
:group 'org-mobile
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2010-03-16 06:32:50 +00:00
|
|
|
:type '(string :tag "Password"))
|
|
|
|
|
2010-09-26 09:16:34 +00:00
|
|
|
(defvar org-mobile-encryption-password-session nil)
|
|
|
|
|
|
|
|
(defun org-mobile-encryption-password ()
|
|
|
|
(or (org-string-nw-p org-mobile-encryption-password)
|
|
|
|
(org-string-nw-p org-mobile-encryption-password-session)
|
|
|
|
(setq org-mobile-encryption-password-session
|
|
|
|
(read-passwd "Password for MobileOrg: " t))))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defcustom org-mobile-inbox-for-pull "~/org/from-mobile.org"
|
|
|
|
"The file where captured notes and flags will be appended to.
|
|
|
|
During the execution of `org-mobile-pull', the file
|
|
|
|
`org-mobile-capture-file' will be emptied it's contents have
|
2009-10-18 00:53:51 +00:00
|
|
|
been appended to the file given here. This file should be in
|
|
|
|
`org-directory', and not in the staging area or on the web server."
|
2009-09-15 18:06:44 +00:00
|
|
|
:group 'org-mobile
|
|
|
|
:type 'file)
|
|
|
|
|
2009-09-18 17:00:24 +00:00
|
|
|
(defconst org-mobile-capture-file "mobileorg.org"
|
2009-09-15 18:06:44 +00:00
|
|
|
"The capture file where the mobile stores captured notes and flags.
|
2009-09-18 17:00:24 +00:00
|
|
|
This should not be changed, because MobileOrg assumes this name.")
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defcustom org-mobile-index-file "index.org"
|
2011-05-10 15:07:35 +00:00
|
|
|
"The index file with links to all Org files that should be loaded by MobileOrg.
|
2009-09-18 17:23:13 +00:00
|
|
|
Relative to `org-mobile-directory'. The Address field in the MobileOrg setup
|
|
|
|
should point to this file."
|
2009-09-15 18:06:44 +00:00
|
|
|
:group 'org-mobile
|
|
|
|
:type 'file)
|
|
|
|
|
2009-11-24 23:53:03 +00:00
|
|
|
(defcustom org-mobile-agendas 'all
|
|
|
|
"The agendas that should be pushed to MobileOrg.
|
|
|
|
Allowed values:
|
|
|
|
|
|
|
|
default the weekly agenda and the global TODO list
|
|
|
|
custom all custom agendas defined by the user
|
|
|
|
all the custom agendas and the default ones
|
|
|
|
list a list of selection key(s) as string."
|
|
|
|
:group 'org-mobile
|
2012-03-19 20:38:12 +00:00
|
|
|
:version "24.1"
|
2009-11-24 23:53:03 +00:00
|
|
|
:type '(choice
|
|
|
|
(const :tag "Default Agendas" default)
|
|
|
|
(const :tag "Custom Agendas" custom)
|
|
|
|
(const :tag "Default and Custom Agendas" all)
|
|
|
|
(repeat :tag "Selected"
|
|
|
|
(string :tag "Selection Keys"))))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defcustom org-mobile-force-id-on-agenda-items t
|
2010-10-08 07:29:42 +00:00
|
|
|
"Non-nil means make all agenda items carry an ID."
|
2009-09-15 18:06:44 +00:00
|
|
|
:group 'org-mobile
|
|
|
|
:type 'boolean)
|
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defcustom org-mobile-force-mobile-change nil
|
2010-01-21 15:15:40 +00:00
|
|
|
"Non-nil means force the change made on the mobile device.
|
2009-10-05 15:13:56 +00:00
|
|
|
So even if there have been changes to the computer version of the entry,
|
|
|
|
force the new value set on the mobile.
|
|
|
|
When nil, mark the entry from the mobile with an error message.
|
|
|
|
Instead of nil or t, this variable can also be a list of symbols, indicating
|
|
|
|
the editing types for which the mobile version should always dominate."
|
|
|
|
:group 'org-mobile
|
|
|
|
:type '(choice
|
|
|
|
(const :tag "Always" t)
|
|
|
|
(const :tag "Never" nil)
|
|
|
|
(set :greedy t :tag "Specify"
|
|
|
|
(const todo)
|
|
|
|
(const tags)
|
|
|
|
(const priority)
|
|
|
|
(const heading)
|
|
|
|
(const body))))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defcustom org-mobile-action-alist
|
2009-10-12 13:19:10 +00:00
|
|
|
'(("edit" . (org-mobile-edit data old new)))
|
2009-09-15 18:06:44 +00:00
|
|
|
"Alist with flags and actions for mobile sync.
|
|
|
|
When flagging an entry, MobileOrg will create entries that look like
|
|
|
|
|
2009-09-30 07:22:33 +00:00
|
|
|
* F(action:data) [[id:entry-id][entry title]]
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2009-09-30 07:22:33 +00:00
|
|
|
This alist defines that the ACTION in the parentheses of F() should mean,
|
|
|
|
i.e. what action should be taken. The :data part in the parenthesis is
|
|
|
|
optional. If present, the string after the colon will be passed to the
|
|
|
|
action form as the `data' variable.
|
|
|
|
The car of each elements of the alist is an actions string. The cdr is
|
|
|
|
an Emacs Lisp form that will be evaluated with the cursor on the headline
|
2009-10-12 13:19:10 +00:00
|
|
|
of that entry.
|
|
|
|
|
|
|
|
For now, it is not recommended to change this variable."
|
2009-09-15 18:06:44 +00:00
|
|
|
:group 'org-mobile
|
|
|
|
:type '(repeat
|
|
|
|
(cons (string :tag "Action flag")
|
|
|
|
(sexp :tag "Action form"))))
|
|
|
|
|
2009-10-19 06:30:06 +00:00
|
|
|
(defcustom org-mobile-checksum-binary (or (executable-find "shasum")
|
|
|
|
(executable-find "sha1sum")
|
|
|
|
(executable-find "md5sum")
|
|
|
|
(executable-find "md5"))
|
2009-10-19 11:20:51 +00:00
|
|
|
"Executable used for computing checksums of agenda files."
|
2009-10-19 06:30:06 +00:00
|
|
|
:group 'org-mobile
|
|
|
|
:type 'string)
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defvar org-mobile-pre-push-hook nil
|
|
|
|
"Hook run before running `org-mobile-push'.
|
|
|
|
This could be used to clean up `org-mobile-directory', for example to
|
|
|
|
remove files that used to be included in the agenda but no longer are.
|
|
|
|
The presence of such files would not really be a problem, but after time
|
|
|
|
they may accumulate.")
|
|
|
|
|
|
|
|
(defvar org-mobile-post-push-hook nil
|
|
|
|
"Hook run after running `org-mobile-push'.
|
|
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
2009-09-19 17:27:34 +00:00
|
|
|
by the mobile device, this hook should be used to copy all files from the
|
|
|
|
local staging directory `org-mobile-directory' to the WebDAV directory,
|
|
|
|
for example using `rsync' or `scp'.")
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defvar org-mobile-pre-pull-hook nil
|
|
|
|
"Hook run before executing `org-mobile-pull'.
|
|
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
2009-09-19 17:27:34 +00:00
|
|
|
by the mobile device, this hook should be used to copy the capture file
|
|
|
|
`mobileorg.org' from the WebDAV location to the local staging
|
|
|
|
directory `org-mobile-directory'.")
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defvar org-mobile-post-pull-hook nil
|
2012-07-26 13:02:32 +00:00
|
|
|
"Hook run after running `org-mobile-pull', only if new items were found.
|
2009-09-15 18:06:44 +00:00
|
|
|
If Emacs does not have direct write access to the WebDAV directory used
|
2009-09-19 17:27:34 +00:00
|
|
|
by the mobile device, this hook should be used to copy the emptied
|
|
|
|
capture file `mobileorg.org' back to the WebDAV directory, for example
|
|
|
|
using `rsync' or `scp'.")
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defvar org-mobile-last-flagged-files nil
|
2009-11-12 12:39:29 +00:00
|
|
|
"List of files containing entries flagged in the latest pull.")
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2009-09-28 18:25:50 +00:00
|
|
|
(defvar org-mobile-files-alist nil)
|
|
|
|
(defvar org-mobile-checksum-files nil)
|
|
|
|
|
|
|
|
(defun org-mobile-prepare-file-lists ()
|
|
|
|
(setq org-mobile-files-alist (org-mobile-files-alist))
|
2009-10-19 06:30:06 +00:00
|
|
|
(setq org-mobile-checksum-files nil))
|
2009-09-28 18:25:50 +00:00
|
|
|
|
|
|
|
(defun org-mobile-files-alist ()
|
2011-03-05 10:49:30 +00:00
|
|
|
"Expand the list in `org-mobile-files' to a list of existing files.
|
|
|
|
Also exclude files matching `org-mobile-files-exclude-regexp'."
|
2009-11-05 11:10:32 +00:00
|
|
|
(let* ((include-archives
|
|
|
|
(and (member 'org-agenda-text-search-extra-files org-mobile-files)
|
2009-11-05 12:48:01 +00:00
|
|
|
(member 'agenda-archives org-agenda-text-search-extra-files)
|
|
|
|
t))
|
2009-11-05 11:10:32 +00:00
|
|
|
(files
|
|
|
|
(apply 'append
|
|
|
|
(mapcar
|
|
|
|
(lambda (f)
|
|
|
|
(cond
|
2009-11-05 11:12:36 +00:00
|
|
|
((eq f 'org-agenda-files)
|
|
|
|
(org-agenda-files t include-archives))
|
2009-11-05 11:10:32 +00:00
|
|
|
((eq f 'org-agenda-text-search-extra-files)
|
|
|
|
(delq 'agenda-archives
|
|
|
|
(copy-sequence
|
|
|
|
org-agenda-text-search-extra-files)))
|
|
|
|
((and (stringp f) (file-directory-p f))
|
|
|
|
(directory-files f 'full "\\.org\\'"))
|
|
|
|
((and (stringp f) (file-exists-p f))
|
|
|
|
(list f))
|
|
|
|
(t nil)))
|
|
|
|
org-mobile-files)))
|
2011-03-05 10:49:30 +00:00
|
|
|
(files (delete
|
2012-03-19 20:38:12 +00:00
|
|
|
nil
|
2011-03-05 10:49:30 +00:00
|
|
|
(mapcar (lambda (f)
|
|
|
|
(unless (and (not (string= org-mobile-files-exclude-regexp ""))
|
|
|
|
(string-match org-mobile-files-exclude-regexp f))
|
|
|
|
(identity f)))
|
|
|
|
files)))
|
2009-09-28 18:25:50 +00:00
|
|
|
(orgdir-uname (file-name-as-directory (file-truename org-directory)))
|
|
|
|
(orgdir-re (concat "\\`" (regexp-quote orgdir-uname)))
|
2009-09-29 05:39:07 +00:00
|
|
|
uname seen rtn file link-name)
|
2009-09-28 18:25:50 +00:00
|
|
|
;; Make the files unique, and determine the name under which they will
|
|
|
|
;; be listed.
|
|
|
|
(while (setq file (pop files))
|
2009-10-23 20:19:23 +00:00
|
|
|
(if (not (file-name-absolute-p file))
|
|
|
|
(setq file (expand-file-name file org-directory)))
|
2009-09-28 18:25:50 +00:00
|
|
|
(setq uname (file-truename file))
|
|
|
|
(unless (member uname seen)
|
|
|
|
(push uname seen)
|
|
|
|
(if (string-match orgdir-re uname)
|
|
|
|
(setq link-name (substring uname (match-end 0)))
|
|
|
|
(setq link-name (file-name-nondirectory uname)))
|
|
|
|
(push (cons file link-name) rtn)))
|
|
|
|
(nreverse rtn)))
|
|
|
|
|
2012-03-19 20:38:12 +00:00
|
|
|
(defvar org-agenda-filter)
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-mobile-push ()
|
|
|
|
"Push the current state of Org affairs to the WebDAV directory.
|
|
|
|
This will create the index file, copy all agenda files there, and also
|
|
|
|
create all custom agenda views, for upload to the mobile phone."
|
|
|
|
(interactive)
|
2009-11-05 14:44:17 +00:00
|
|
|
(let ((a-buffer (get-buffer org-agenda-buffer-name)))
|
|
|
|
(let ((org-agenda-buffer-name "*SUMO*")
|
2012-03-19 20:38:12 +00:00
|
|
|
(org-agenda-tag-filter org-agenda-tag-filter)
|
2009-11-05 14:44:17 +00:00
|
|
|
(org-agenda-redo-command org-agenda-redo-command))
|
|
|
|
(save-excursion
|
|
|
|
(save-window-excursion
|
2011-03-06 04:17:08 +00:00
|
|
|
(run-hooks 'org-mobile-pre-push-hook)
|
2009-11-05 14:44:17 +00:00
|
|
|
(org-mobile-check-setup)
|
|
|
|
(org-mobile-prepare-file-lists)
|
|
|
|
(message "Creating agendas...")
|
2012-07-08 20:40:34 +00:00
|
|
|
(let ((inhibit-redisplay t)
|
|
|
|
(org-agenda-files (mapcar 'car org-mobile-files-alist)))
|
|
|
|
(org-mobile-create-sumo-agenda))
|
2009-11-05 14:44:17 +00:00
|
|
|
(message "Creating agendas...done")
|
|
|
|
(org-save-all-org-buffers) ; to save any IDs created by this process
|
|
|
|
(message "Copying files...")
|
|
|
|
(org-mobile-copy-agenda-files)
|
|
|
|
(message "Writing index file...")
|
|
|
|
(org-mobile-create-index-file)
|
|
|
|
(message "Writing checksums...")
|
|
|
|
(org-mobile-write-checksums)
|
|
|
|
(run-hooks 'org-mobile-post-push-hook))))
|
|
|
|
(redraw-display)
|
|
|
|
(when (and a-buffer (buffer-live-p a-buffer))
|
|
|
|
(if (not (get-buffer-window a-buffer))
|
|
|
|
(kill-buffer a-buffer)
|
|
|
|
(let ((cw (selected-window)))
|
|
|
|
(select-window (get-buffer-window a-buffer))
|
|
|
|
(org-agenda-redo)
|
|
|
|
(select-window cw)))))
|
2009-09-15 18:06:44 +00:00
|
|
|
(message "Files for mobile viewer staged"))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2009-11-06 16:40:52 +00:00
|
|
|
(defvar org-mobile-before-process-capture-hook nil
|
|
|
|
"Hook that is run after content was moved to `org-mobile-inbox-for-pull'.
|
2010-01-03 18:12:33 +00:00
|
|
|
The inbox file is visited by the current buffer, and the buffer is
|
|
|
|
narrowed to the newly captured data.")
|
2009-11-06 16:40:52 +00:00
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defun org-mobile-pull ()
|
|
|
|
"Pull the contents of `org-mobile-capture-file' and integrate them.
|
|
|
|
Apply all flagged actions, flag entries to be flagged and then call an
|
|
|
|
agenda view showing the flagged items."
|
|
|
|
(interactive)
|
|
|
|
(org-mobile-check-setup)
|
|
|
|
(run-hooks 'org-mobile-pre-pull-hook)
|
|
|
|
(let ((insertion-marker (org-mobile-move-capture)))
|
|
|
|
(if (not (markerp insertion-marker))
|
|
|
|
(message "No new items")
|
2009-11-06 16:40:52 +00:00
|
|
|
(org-with-point-at insertion-marker
|
|
|
|
(save-restriction
|
|
|
|
(narrow-to-region (point) (point-max))
|
|
|
|
(run-hooks 'org-mobile-before-process-capture-hook)))
|
2009-09-15 18:06:44 +00:00
|
|
|
(org-with-point-at insertion-marker
|
2009-10-05 15:13:56 +00:00
|
|
|
(org-mobile-apply (point) (point-max)))
|
2009-09-15 18:06:44 +00:00
|
|
|
(move-marker insertion-marker nil)
|
|
|
|
(run-hooks 'org-mobile-post-pull-hook)
|
|
|
|
(when org-mobile-last-flagged-files
|
|
|
|
;; Make an agenda view of flagged entries, but only in the files
|
|
|
|
;; where stuff has been added.
|
|
|
|
(put 'org-agenda-files 'org-restrict org-mobile-last-flagged-files)
|
2009-11-12 12:39:44 +00:00
|
|
|
(let ((org-agenda-keep-restricted-file-list t))
|
2009-09-15 18:06:44 +00:00
|
|
|
(org-agenda nil "?"))))))
|
|
|
|
|
|
|
|
(defun org-mobile-check-setup ()
|
|
|
|
"Check if org-mobile-directory has been set up."
|
2010-10-13 17:13:52 +00:00
|
|
|
(org-mobile-cleanup-encryption-tempfile)
|
2009-10-18 00:53:51 +00:00
|
|
|
(unless (and org-directory
|
|
|
|
(stringp org-directory)
|
|
|
|
(string-match "\\S-" org-directory)
|
|
|
|
(file-exists-p org-directory)
|
|
|
|
(file-directory-p org-directory))
|
|
|
|
(error
|
|
|
|
"Please set `org-directory' to the directory where your org files live"))
|
|
|
|
(unless (and org-mobile-directory
|
|
|
|
(stringp org-mobile-directory)
|
|
|
|
(string-match "\\S-" org-mobile-directory)
|
|
|
|
(file-exists-p org-mobile-directory)
|
|
|
|
(file-directory-p org-mobile-directory))
|
2009-09-15 18:06:44 +00:00
|
|
|
(error
|
|
|
|
"Variable `org-mobile-directory' must point to an existing directory"))
|
2009-10-18 00:53:51 +00:00
|
|
|
(unless (and org-mobile-inbox-for-pull
|
|
|
|
(stringp org-mobile-inbox-for-pull)
|
|
|
|
(string-match "\\S-" org-mobile-inbox-for-pull)
|
|
|
|
(file-exists-p
|
|
|
|
(file-name-directory org-mobile-inbox-for-pull)))
|
2009-09-15 18:06:44 +00:00
|
|
|
(error
|
2010-03-16 06:32:50 +00:00
|
|
|
"Variable `org-mobile-inbox-for-pull' must point to a file in an existing directory"))
|
2010-04-09 12:30:57 +00:00
|
|
|
(unless (and org-mobile-checksum-binary
|
|
|
|
(string-match "\\S-" org-mobile-checksum-binary))
|
|
|
|
(error "No executable found to compute checksums"))
|
2010-03-16 06:32:50 +00:00
|
|
|
(when org-mobile-use-encryption
|
2010-09-26 09:16:34 +00:00
|
|
|
(unless (string-match "\\S-" (org-mobile-encryption-password))
|
2010-03-16 06:32:50 +00:00
|
|
|
(error
|
|
|
|
"To use encryption, you must set `org-mobile-encryption-password'"))
|
|
|
|
(unless (file-writable-p org-mobile-encryption-tempfile)
|
2010-07-16 21:23:01 +00:00
|
|
|
(error "Cannot write to encryption tempfile %s"
|
2010-03-16 06:32:50 +00:00
|
|
|
org-mobile-encryption-tempfile))
|
|
|
|
(unless (executable-find "openssl")
|
2012-08-13 03:59:44 +00:00
|
|
|
(error "OpenSSL is needed to encrypt files"))))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defun org-mobile-create-index-file ()
|
|
|
|
"Write the index file in the WebDAV directory."
|
2009-10-18 14:57:09 +00:00
|
|
|
(let ((files-alist (sort (copy-sequence org-mobile-files-alist)
|
|
|
|
(lambda (a b) (string< (cdr a) (cdr b)))))
|
2009-10-01 17:58:50 +00:00
|
|
|
(def-todo (default-value 'org-todo-keywords))
|
|
|
|
(def-tags (default-value 'org-tag-alist))
|
2010-10-13 08:48:35 +00:00
|
|
|
(target-file (expand-file-name org-mobile-index-file
|
|
|
|
org-mobile-directory))
|
2009-10-05 15:13:56 +00:00
|
|
|
file link-name todo-kwds done-kwds tags drawers entry kwds dwds twds)
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2012-08-28 11:11:12 +00:00
|
|
|
(org-agenda-prepare-buffers (mapcar 'car files-alist))
|
2009-09-19 09:46:05 +00:00
|
|
|
(setq done-kwds (org-uniquify org-done-keywords-for-agenda))
|
|
|
|
(setq todo-kwds (org-delete-all
|
|
|
|
done-kwds
|
|
|
|
(org-uniquify org-todo-keywords-for-agenda)))
|
|
|
|
(setq drawers (org-uniquify org-drawers-for-agenda))
|
2012-08-04 08:22:20 +00:00
|
|
|
(setq tags (mapcar 'car (org-global-tags-completion-table
|
|
|
|
(mapcar 'car files-alist))))
|
2009-09-19 09:46:05 +00:00
|
|
|
(with-temp-file
|
2010-10-13 08:48:35 +00:00
|
|
|
(if org-mobile-use-encryption
|
|
|
|
org-mobile-encryption-tempfile
|
|
|
|
target-file)
|
2009-10-01 17:58:50 +00:00
|
|
|
(while (setq entry (pop def-todo))
|
2009-10-10 21:32:18 +00:00
|
|
|
(insert "#+READONLY\n")
|
2009-10-01 17:58:50 +00:00
|
|
|
(setq kwds (mapcar (lambda (x) (if (string-match "(" x)
|
|
|
|
(substring x 0 (match-beginning 0))
|
|
|
|
x))
|
|
|
|
(cdr entry)))
|
|
|
|
(insert "#+TODO: " (mapconcat 'identity kwds " ") "\n")
|
|
|
|
(setq dwds (member "|" kwds)
|
|
|
|
twds (org-delete-all dwds kwds)
|
|
|
|
todo-kwds (org-delete-all twds todo-kwds)
|
|
|
|
done-kwds (org-delete-all dwds done-kwds)))
|
|
|
|
(when (or todo-kwds done-kwds)
|
|
|
|
(insert "#+TODO: " (mapconcat 'identity todo-kwds " ") " | "
|
|
|
|
(mapconcat 'identity done-kwds " ") "\n"))
|
|
|
|
(setq def-tags (mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(cond ((null x) nil)
|
|
|
|
((stringp x) x)
|
|
|
|
((eq (car x) :startgroup) "{")
|
|
|
|
((eq (car x) :endgroup) "}")
|
|
|
|
((eq (car x) :newline) nil)
|
Remove useless (t nil) sexps at the end of some (cond ...) constructs
* org.el (org-compute-latex-and-specials-regexp)
(org-paste-subtree, org-sort-entries, org-store-link)
(org-open-at-point, org-file-remote-p, org-add-log-setup)
(org-set-tags-to, org-fast-tag-selection)
(org-diary-sexp-entry): Ditto.
* org-agenda.el (org-agenda-get-blocks, org-cmp-priority)
(org-cmp-effort, org-cmp-todo-state, org-cmp-alpha)
(org-cmp-tag, org-cmp-time): Remove useless (t nil) sexps at
the end of (cond ...) constructs.
* org-mobile.el (org-mobile-create-index-file): Ditto.
* org-lparse.el (org-lparse-format-table-row): Ditto.
* org-list.el (org-sort-list): Ditto.
* org-id.el (org-id-get): Ditto.
* org-html.el (org-export-html-preprocess): Ditto.
* org-exp.el (org-default-export-plist)
(org-table-clean-before-export): Ditto.
(t nil) in (cond (...) (...) (t nil)) has no other meaning that to
remind the developer that the cond sexp returns nil in case no condition
is matched. For several (cond ...) constructs this is obvious from reading
the code. For others, the reminder might be useful and we leave it.
See the discussion about this on emacs-devel:
http://thread.gmane.org/gmane.emacs.devel/152664
2012-08-19 12:42:54 +00:00
|
|
|
((listp x) (car x))))
|
2009-10-01 17:58:50 +00:00
|
|
|
def-tags))
|
|
|
|
(setq def-tags (delq nil def-tags))
|
|
|
|
(setq tags (org-delete-all def-tags tags))
|
2009-10-12 07:21:37 +00:00
|
|
|
(setq tags (sort tags (lambda (a b) (string< (downcase a) (downcase b)))))
|
2009-10-01 17:58:50 +00:00
|
|
|
(setq tags (append def-tags tags nil))
|
|
|
|
(insert "#+TAGS: " (mapconcat 'identity tags " ") "\n")
|
|
|
|
(insert "#+DRAWERS: " (mapconcat 'identity drawers " ") "\n")
|
2009-10-05 15:13:56 +00:00
|
|
|
(insert "#+ALLPRIORITIES: A B C" "\n")
|
2009-10-15 13:33:11 +00:00
|
|
|
(when (file-exists-p (expand-file-name
|
|
|
|
org-mobile-directory "agendas.org"))
|
2009-10-14 15:18:37 +00:00
|
|
|
(insert "* [[file:agendas.org][Agenda Views]]\n"))
|
2009-09-28 18:18:31 +00:00
|
|
|
(while (setq entry (pop files-alist))
|
|
|
|
(setq file (car entry)
|
|
|
|
link-name (cdr entry))
|
2009-09-15 18:06:44 +00:00
|
|
|
(insert (format "* [[file:%s][%s]]\n"
|
2009-10-19 06:30:06 +00:00
|
|
|
link-name link-name)))
|
|
|
|
(push (cons org-mobile-index-file (md5 (buffer-string)))
|
2010-10-13 08:48:35 +00:00
|
|
|
org-mobile-checksum-files))
|
2010-10-13 17:13:52 +00:00
|
|
|
(when org-mobile-use-encryption
|
|
|
|
(org-mobile-encrypt-and-move org-mobile-encryption-tempfile
|
|
|
|
target-file)
|
|
|
|
(org-mobile-cleanup-encryption-tempfile))))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defun org-mobile-copy-agenda-files ()
|
|
|
|
"Copy all agenda files to the stage or WebDAV directory."
|
2009-09-28 18:18:31 +00:00
|
|
|
(let ((files-alist org-mobile-files-alist)
|
2009-10-20 11:24:55 +00:00
|
|
|
file buf entry link-name target-path target-dir check)
|
2009-09-28 18:18:31 +00:00
|
|
|
(while (setq entry (pop files-alist))
|
|
|
|
(setq file (car entry) link-name (cdr entry))
|
|
|
|
(when (file-exists-p file)
|
|
|
|
(setq target-path (expand-file-name link-name org-mobile-directory)
|
|
|
|
target-dir (file-name-directory target-path))
|
|
|
|
(unless (file-directory-p target-dir)
|
2009-10-04 15:50:49 +00:00
|
|
|
(make-directory target-dir 'parents))
|
2010-03-16 06:32:50 +00:00
|
|
|
(if org-mobile-use-encryption
|
|
|
|
(org-mobile-encrypt-and-move file target-path)
|
|
|
|
(copy-file file target-path 'ok-if-exists))
|
2009-10-19 06:30:06 +00:00
|
|
|
(setq check (shell-command-to-string
|
|
|
|
(concat org-mobile-checksum-binary " "
|
|
|
|
(shell-quote-argument (expand-file-name file)))))
|
|
|
|
(when (string-match "[a-fA-F0-9]\\{30,40\\}" check)
|
|
|
|
(push (cons link-name (match-string 0 check))
|
|
|
|
org-mobile-checksum-files))))
|
2010-10-13 08:48:35 +00:00
|
|
|
|
2009-09-17 12:46:25 +00:00
|
|
|
(setq file (expand-file-name org-mobile-capture-file
|
|
|
|
org-mobile-directory))
|
2009-10-19 11:03:09 +00:00
|
|
|
(save-excursion
|
|
|
|
(setq buf (find-file file))
|
2012-03-19 20:38:12 +00:00
|
|
|
(when (and (= (point-min) (point-max)))
|
2010-10-13 08:48:35 +00:00
|
|
|
(insert "\n")
|
|
|
|
(save-buffer)
|
|
|
|
(when org-mobile-use-encryption
|
|
|
|
(write-file org-mobile-encryption-tempfile)
|
|
|
|
(org-mobile-encrypt-and-move org-mobile-encryption-tempfile file)))
|
2009-10-19 11:03:09 +00:00
|
|
|
(push (cons org-mobile-capture-file (md5 (buffer-string)))
|
2010-10-13 08:48:35 +00:00
|
|
|
org-mobile-checksum-files))
|
2010-10-13 17:13:52 +00:00
|
|
|
(org-mobile-cleanup-encryption-tempfile)
|
2009-10-19 11:03:09 +00:00
|
|
|
(kill-buffer buf)))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defun org-mobile-write-checksums ()
|
|
|
|
"Create checksums for all files in `org-mobile-directory'.
|
|
|
|
The table of checksums is written to the file mobile-checksums."
|
2009-10-19 06:30:06 +00:00
|
|
|
(let ((sumfile (expand-file-name "checksums.dat" org-mobile-directory))
|
|
|
|
(files org-mobile-checksum-files)
|
|
|
|
entry file sum)
|
|
|
|
(with-temp-file sumfile
|
2009-11-12 22:52:41 +00:00
|
|
|
(set-buffer-file-coding-system 'undecided-unix nil)
|
2009-10-19 06:30:06 +00:00
|
|
|
(while (setq entry (pop files))
|
|
|
|
(setq file (car entry) sum (cdr entry))
|
|
|
|
(insert (format "%s %s\n" sum file))))))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
|
|
|
(defun org-mobile-sumo-agenda-command ()
|
|
|
|
"Return an agenda custom command that comprises all custom commands."
|
|
|
|
(let ((custom-list
|
|
|
|
;; normalize different versions
|
|
|
|
(delq nil
|
|
|
|
(mapcar
|
|
|
|
(lambda (x)
|
|
|
|
(cond ((stringp (cdr x)) nil)
|
|
|
|
((stringp (nth 1 x)) x)
|
|
|
|
((not (nth 1 x)) (cons (car x) (cons "" (cddr x))))
|
|
|
|
(t (cons (car x) (cons "" (cdr x))))))
|
|
|
|
org-agenda-custom-commands)))
|
2009-11-24 23:53:03 +00:00
|
|
|
(default-list '(("a" "Agenda" agenda) ("t" "All TODO" alltodo)))
|
|
|
|
thelist new e key desc type match settings cmds gkey gdesc gsettings cnt)
|
|
|
|
(cond
|
|
|
|
((eq org-mobile-agendas 'custom)
|
|
|
|
(setq thelist custom-list))
|
|
|
|
((eq org-mobile-agendas 'default)
|
|
|
|
(setq thelist default-list))
|
|
|
|
((eq org-mobile-agendas 'all)
|
|
|
|
(setq thelist custom-list)
|
|
|
|
(unless (assoc "t" thelist) (push '("t" "ALL TODO" alltodo) thelist))
|
|
|
|
(unless (assoc "a" thelist) (push '("a" "Agenda" agenda) thelist)))
|
|
|
|
((listp org-mobile-agendas)
|
|
|
|
(setq thelist (append custom-list default-list))
|
|
|
|
(setq thelist (delq nil (mapcar (lambda (k) (assoc k thelist))
|
|
|
|
org-mobile-agendas)))))
|
|
|
|
(while (setq e (pop thelist))
|
2009-09-15 18:06:44 +00:00
|
|
|
(cond
|
|
|
|
((stringp (cdr e))
|
|
|
|
;; this is a description entry - skip it
|
|
|
|
)
|
|
|
|
((eq (nth 2 e) 'search)
|
|
|
|
;; Search view is interactive, skip
|
|
|
|
)
|
|
|
|
((memq (nth 2 e) '(todo-tree tags-tree occur-tree))
|
|
|
|
;; These are trees, not really agenda commands
|
|
|
|
)
|
2010-03-16 06:32:50 +00:00
|
|
|
((and (memq (nth 2 e) '(todo tags tags-todo))
|
|
|
|
(or (null (nth 3 e))
|
|
|
|
(not (string-match "\\S-" (nth 3 e)))))
|
|
|
|
;; These would be interactive because the match string is empty
|
|
|
|
)
|
2009-12-04 09:53:03 +00:00
|
|
|
((memq (nth 2 e) '(agenda alltodo todo tags tags-todo))
|
2009-09-15 18:06:44 +00:00
|
|
|
;; a normal command
|
|
|
|
(setq key (car e) desc (nth 1 e) type (nth 2 e) match (nth 3 e)
|
|
|
|
settings (nth 4 e))
|
|
|
|
(setq settings
|
|
|
|
(cons (list 'org-agenda-title-append
|
2009-10-05 15:13:56 +00:00
|
|
|
(concat "<after>KEYS=" key " TITLE: "
|
2009-09-15 18:06:44 +00:00
|
|
|
(if (and (stringp desc) (> (length desc) 0))
|
|
|
|
desc (symbol-name type))
|
2012-03-20 15:28:45 +00:00
|
|
|
"</after>"))
|
2009-09-15 18:06:44 +00:00
|
|
|
settings))
|
|
|
|
(push (list type match settings) new))
|
2011-07-08 06:30:31 +00:00
|
|
|
((or (functionp (nth 2 e)) (symbolp (nth 2 e)))
|
|
|
|
;; A user-defined function, which can do anything, so simply
|
|
|
|
;; ignore it.
|
2009-09-15 18:06:44 +00:00
|
|
|
)
|
|
|
|
(t
|
|
|
|
;; a block agenda
|
|
|
|
(setq gkey (car e) gdesc (nth 1 e) gsettings (nth 3 e) cmds (nth 2 e))
|
|
|
|
(setq cnt 0)
|
|
|
|
(while (setq e (pop cmds))
|
|
|
|
(setq type (car e) match (nth 1 e) settings (nth 2 e))
|
|
|
|
(setq settings (append gsettings settings))
|
|
|
|
(setq settings
|
|
|
|
(cons (list 'org-agenda-title-append
|
2009-10-05 15:13:56 +00:00
|
|
|
(concat "<after>KEYS=" gkey "#" (number-to-string
|
2012-08-11 17:10:44 +00:00
|
|
|
(setq cnt (1+ cnt)))
|
2009-10-05 15:13:56 +00:00
|
|
|
" TITLE: " gdesc " " match "</after>"))
|
2009-09-15 18:06:44 +00:00
|
|
|
settings))
|
|
|
|
(push (list type match settings) new)))))
|
2009-10-16 16:10:14 +00:00
|
|
|
(and new (list "X" "SUMO" (reverse new)
|
|
|
|
'((org-agenda-compact-blocks nil))))))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defvar org-mobile-creating-agendas nil)
|
|
|
|
(defun org-mobile-write-agenda-for-mobile (file)
|
|
|
|
(let ((all (buffer-string)) in-date id pl prefix line app short m sexp)
|
|
|
|
(with-temp-file file
|
|
|
|
(org-mode)
|
|
|
|
(insert "#+READONLY\n")
|
|
|
|
(insert all)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(while (not (eobp))
|
|
|
|
(cond
|
|
|
|
((looking-at "[ \t]*$")) ; keep empty lines
|
|
|
|
((looking-at "=+$")
|
|
|
|
;; remove underlining
|
|
|
|
(delete-region (point) (point-at-eol)))
|
|
|
|
((get-text-property (point) 'org-agenda-structural-header)
|
|
|
|
(setq in-date nil)
|
|
|
|
(setq app (get-text-property (point)
|
|
|
|
'org-agenda-title-append))
|
|
|
|
(setq short (get-text-property (point)
|
|
|
|
'short-heading))
|
|
|
|
(when (and short (looking-at ".+"))
|
|
|
|
(replace-match short)
|
|
|
|
(beginning-of-line 1))
|
|
|
|
(when app
|
|
|
|
(end-of-line 1)
|
|
|
|
(insert app)
|
|
|
|
(beginning-of-line 1))
|
|
|
|
(insert "* "))
|
|
|
|
((get-text-property (point) 'org-agenda-date-header)
|
|
|
|
(setq in-date t)
|
|
|
|
(insert "** "))
|
|
|
|
((setq m (or (get-text-property (point) 'org-hd-marker)
|
|
|
|
(get-text-property (point) 'org-marker)))
|
|
|
|
(setq sexp (member (get-text-property (point) 'type)
|
|
|
|
'("diary" "sexp")))
|
2011-03-16 17:17:28 +00:00
|
|
|
(if (setq pl (text-property-any (point) (point-at-eol) 'org-heading t))
|
2009-10-05 15:13:56 +00:00
|
|
|
(progn
|
|
|
|
(setq prefix (org-trim (buffer-substring
|
2011-03-16 17:17:28 +00:00
|
|
|
(point) pl))
|
2009-10-05 15:13:56 +00:00
|
|
|
line (org-trim (buffer-substring
|
2011-03-16 17:17:28 +00:00
|
|
|
pl
|
2009-10-05 15:13:56 +00:00
|
|
|
(point-at-eol))))
|
|
|
|
(delete-region (point-at-bol) (point-at-eol))
|
|
|
|
(insert line "<before>" prefix "</before>")
|
|
|
|
(beginning-of-line 1))
|
|
|
|
(and (looking-at "[ \t]+") (replace-match "")))
|
|
|
|
(insert (if in-date "*** " "** "))
|
|
|
|
(end-of-line 1)
|
|
|
|
(insert "\n")
|
|
|
|
(unless sexp
|
|
|
|
(insert (org-agenda-get-some-entry-text
|
|
|
|
m 10 " " 'planning)
|
|
|
|
"\n")
|
|
|
|
(when (setq id
|
|
|
|
(if (org-bound-and-true-p
|
|
|
|
org-mobile-force-id-on-agenda-items)
|
|
|
|
(org-id-get m 'create)
|
2010-10-08 07:29:42 +00:00
|
|
|
(or (org-entry-get m "ID")
|
|
|
|
(org-mobile-get-outline-path-link m))))
|
2009-10-05 15:13:56 +00:00
|
|
|
(insert " :PROPERTIES:\n :ORIGINAL_ID: " id
|
|
|
|
"\n :END:\n")))))
|
2009-10-19 06:30:06 +00:00
|
|
|
(beginning-of-line 2))
|
2010-10-08 07:27:43 +00:00
|
|
|
(push (cons "agendas.org" (md5 (buffer-string)))
|
2009-10-19 06:30:06 +00:00
|
|
|
org-mobile-checksum-files))
|
2009-10-05 15:13:56 +00:00
|
|
|
(message "Agenda written to Org file %s" file)))
|
|
|
|
|
2010-10-08 07:29:42 +00:00
|
|
|
(defun org-mobile-get-outline-path-link (pom)
|
|
|
|
(org-with-point-at pom
|
|
|
|
(concat "olp:"
|
|
|
|
(org-mobile-escape-olp (file-name-nondirectory buffer-file-name))
|
|
|
|
"/"
|
|
|
|
(mapconcat 'org-mobile-escape-olp
|
|
|
|
(org-get-outline-path)
|
|
|
|
"/")
|
|
|
|
"/"
|
|
|
|
(org-mobile-escape-olp (nth 4 (org-heading-components))))))
|
|
|
|
|
|
|
|
(defun org-mobile-escape-olp (s)
|
2010-11-21 11:06:42 +00:00
|
|
|
(let ((table '(?: ?/)))
|
2010-10-08 07:29:42 +00:00
|
|
|
(org-link-escape s table)))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defun org-mobile-create-sumo-agenda ()
|
|
|
|
"Create a file that contains all custom agenda views."
|
|
|
|
(interactive)
|
|
|
|
(let* ((file (expand-file-name "agendas.org"
|
|
|
|
org-mobile-directory))
|
2010-03-16 06:32:50 +00:00
|
|
|
(file1 (if org-mobile-use-encryption
|
|
|
|
org-mobile-encryption-tempfile
|
|
|
|
file))
|
2009-10-14 15:18:37 +00:00
|
|
|
(sumo (org-mobile-sumo-agenda-command))
|
2009-09-15 18:06:44 +00:00
|
|
|
(org-agenda-custom-commands
|
2010-03-16 06:32:50 +00:00
|
|
|
(list (append sumo (list (list file1)))))
|
2009-10-11 16:09:55 +00:00
|
|
|
(org-mobile-creating-agendas t))
|
2010-03-16 06:32:50 +00:00
|
|
|
(unless (file-writable-p file1)
|
|
|
|
(error "Cannot write to file %s" file1))
|
2009-10-14 15:18:37 +00:00
|
|
|
(when sumo
|
2010-03-16 06:32:50 +00:00
|
|
|
(org-store-agenda-views))
|
|
|
|
(when org-mobile-use-encryption
|
2010-10-14 06:23:34 +00:00
|
|
|
(org-mobile-encrypt-and-move file1 file)
|
2010-10-13 17:13:52 +00:00
|
|
|
(delete-file file1)
|
|
|
|
(org-mobile-cleanup-encryption-tempfile))))
|
2010-03-16 06:32:50 +00:00
|
|
|
|
|
|
|
(defun org-mobile-encrypt-and-move (infile outfile)
|
|
|
|
"Encrypt INFILE locally to INFILE_enc, then move it to OUTFILE.
|
|
|
|
We do this in two steps so that remote paths will work, even if the
|
|
|
|
encryption program does not understand them."
|
|
|
|
(let ((encfile (concat infile "_enc")))
|
|
|
|
(org-mobile-encrypt-file infile encfile)
|
|
|
|
(when outfile
|
|
|
|
(copy-file encfile outfile 'ok-if-exists)
|
|
|
|
(delete-file encfile))))
|
|
|
|
|
|
|
|
(defun org-mobile-encrypt-file (infile outfile)
|
|
|
|
"Encrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
|
|
|
|
(shell-command
|
|
|
|
(format "openssl enc -aes-256-cbc -salt -pass %s -in %s -out %s"
|
2010-09-26 09:16:34 +00:00
|
|
|
(shell-quote-argument (concat "pass:"
|
|
|
|
(org-mobile-encryption-password)))
|
2010-03-16 06:32:50 +00:00
|
|
|
(shell-quote-argument (expand-file-name infile))
|
|
|
|
(shell-quote-argument (expand-file-name outfile)))))
|
|
|
|
|
|
|
|
(defun org-mobile-decrypt-file (infile outfile)
|
|
|
|
"Decrypt INFILE to OUTFILE, using `org-mobile-encryption-password'."
|
|
|
|
(shell-command
|
|
|
|
(format "openssl enc -d -aes-256-cbc -salt -pass %s -in %s -out %s"
|
2010-09-26 09:16:34 +00:00
|
|
|
(shell-quote-argument (concat "pass:"
|
|
|
|
(org-mobile-encryption-password)))
|
2010-03-16 06:32:50 +00:00
|
|
|
(shell-quote-argument (expand-file-name infile))
|
|
|
|
(shell-quote-argument (expand-file-name outfile)))))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2010-10-13 17:13:52 +00:00
|
|
|
(defun org-mobile-cleanup-encryption-tempfile ()
|
|
|
|
"Remove the encryption tempfile if it exists."
|
|
|
|
(and (stringp org-mobile-encryption-tempfile)
|
|
|
|
(file-exists-p org-mobile-encryption-tempfile)
|
|
|
|
(delete-file org-mobile-encryption-tempfile)))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defun org-mobile-move-capture ()
|
|
|
|
"Move the contents of the capture file to the inbox file.
|
|
|
|
Return a marker to the location where the new content has been added.
|
2009-11-06 16:01:25 +00:00
|
|
|
If nothing new has been added, return nil."
|
2009-09-15 18:06:44 +00:00
|
|
|
(interactive)
|
2010-03-16 06:32:50 +00:00
|
|
|
(let* ((encfile nil)
|
|
|
|
(capture-file (expand-file-name org-mobile-capture-file
|
|
|
|
org-mobile-directory))
|
|
|
|
(inbox-buffer (find-file-noselect org-mobile-inbox-for-pull))
|
|
|
|
(capture-buffer
|
|
|
|
(if (not org-mobile-use-encryption)
|
|
|
|
(find-file-noselect capture-file)
|
2010-10-13 17:13:52 +00:00
|
|
|
(org-mobile-cleanup-encryption-tempfile)
|
2010-03-16 06:32:50 +00:00
|
|
|
(setq encfile (concat org-mobile-encryption-tempfile "_enc"))
|
|
|
|
(copy-file capture-file encfile)
|
|
|
|
(org-mobile-decrypt-file encfile org-mobile-encryption-tempfile)
|
|
|
|
(find-file-noselect org-mobile-encryption-tempfile)))
|
|
|
|
(insertion-point (make-marker))
|
|
|
|
not-empty content)
|
2009-11-05 21:51:50 +00:00
|
|
|
(with-current-buffer capture-buffer
|
2009-09-15 18:06:44 +00:00
|
|
|
(setq content (buffer-string))
|
|
|
|
(setq not-empty (string-match "\\S-" content))
|
|
|
|
(when not-empty
|
|
|
|
(set-buffer inbox-buffer)
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(or (bolp) (newline))
|
|
|
|
(move-marker insertion-point
|
|
|
|
(prog1 (point) (insert content)))
|
|
|
|
(save-buffer)
|
|
|
|
(set-buffer capture-buffer)
|
|
|
|
(erase-buffer)
|
2009-10-19 11:20:51 +00:00
|
|
|
(save-buffer)
|
|
|
|
(org-mobile-update-checksum-for-capture-file (buffer-string))))
|
2009-09-15 18:06:44 +00:00
|
|
|
(kill-buffer capture-buffer)
|
2010-03-16 06:32:50 +00:00
|
|
|
(when org-mobile-use-encryption
|
|
|
|
(org-mobile-encrypt-and-move org-mobile-encryption-tempfile
|
2010-10-13 17:13:52 +00:00
|
|
|
capture-file)
|
|
|
|
(org-mobile-cleanup-encryption-tempfile))
|
2009-09-15 18:06:44 +00:00
|
|
|
(if not-empty insertion-point)))
|
|
|
|
|
2009-10-19 11:20:51 +00:00
|
|
|
(defun org-mobile-update-checksum-for-capture-file (buffer-string)
|
2010-03-16 06:32:50 +00:00
|
|
|
"Find the checksum line and modify it to match BUFFER-STRING."
|
2009-10-19 11:20:51 +00:00
|
|
|
(let* ((file (expand-file-name "checksums.dat" org-mobile-directory))
|
|
|
|
(buffer (find-file-noselect file)))
|
|
|
|
(when buffer
|
|
|
|
(with-current-buffer buffer
|
|
|
|
(when (re-search-forward (concat "\\([0-9a-fA-F]\\{30,\\}\\).*?"
|
|
|
|
(regexp-quote org-mobile-capture-file)
|
2009-10-22 14:30:00 +00:00
|
|
|
"[ \t]*$") nil t)
|
2009-10-19 11:20:51 +00:00
|
|
|
(goto-char (match-beginning 1))
|
|
|
|
(delete-region (match-beginning 1) (match-end 1))
|
|
|
|
(insert (md5 buffer-string))
|
|
|
|
(save-buffer)))
|
|
|
|
(kill-buffer buffer))))
|
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defun org-mobile-apply (&optional beg end)
|
|
|
|
"Apply all change requests in the current buffer.
|
2009-09-15 18:06:44 +00:00
|
|
|
If BEG and END are given, only do this in that region."
|
|
|
|
(interactive)
|
2009-09-17 20:54:54 +00:00
|
|
|
(require 'org-archive)
|
2009-09-15 18:06:44 +00:00
|
|
|
(setq org-mobile-last-flagged-files nil)
|
|
|
|
(setq beg (or beg (point-min)) end (or end (point-max)))
|
2009-10-05 15:13:56 +00:00
|
|
|
|
2009-10-12 07:21:37 +00:00
|
|
|
;; Remove all Note IDs
|
2009-10-14 15:26:10 +00:00
|
|
|
(goto-char beg)
|
2009-10-19 10:50:47 +00:00
|
|
|
(while (re-search-forward "^\\*\\* Note ID: [-0-9A-F]+[ \t]*\n" end t)
|
2009-10-12 07:21:37 +00:00
|
|
|
(replace-match ""))
|
|
|
|
|
|
|
|
;; Find all the referenced entries, without making any changes yet
|
2009-09-15 18:06:44 +00:00
|
|
|
(let ((marker (make-marker))
|
2009-10-05 15:13:56 +00:00
|
|
|
(bos-marker (make-marker))
|
2009-09-15 18:06:44 +00:00
|
|
|
(end (move-marker (make-marker) end))
|
2009-10-19 10:50:47 +00:00
|
|
|
(cnt-new 0)
|
|
|
|
(cnt-edit 0)
|
|
|
|
(cnt-flag 0)
|
|
|
|
(cnt-error 0)
|
2009-10-05 15:13:56 +00:00
|
|
|
buf-list
|
|
|
|
id-pos org-mobile-error)
|
2009-10-19 10:50:47 +00:00
|
|
|
|
|
|
|
;; Count the new captures
|
|
|
|
(goto-char beg)
|
|
|
|
(while (re-search-forward "^\\* \\(.*\\)" end t)
|
|
|
|
(and (>= (- (match-end 1) (match-beginning 1)) 2)
|
|
|
|
(not (equal (downcase (substring (match-string 1) 0 2)) "f("))
|
|
|
|
(incf cnt-new)))
|
|
|
|
|
2012-05-22 11:32:27 +00:00
|
|
|
;; Find and apply the edits
|
2009-10-19 10:50:47 +00:00
|
|
|
(goto-char beg)
|
2009-09-15 18:06:44 +00:00
|
|
|
(while (re-search-forward
|
2009-10-12 21:59:43 +00:00
|
|
|
"^\\*+[ \t]+F(\\([^():\n]*\\)\\(:\\([^()\n]*\\)\\)?)[ \t]+\\[\\[\\(\\(id\\|olp\\):\\([^]\n]+\\)\\)" end t)
|
2009-09-15 18:06:44 +00:00
|
|
|
(catch 'next
|
2012-08-11 17:10:44 +00:00
|
|
|
(let* ((action (match-string 1))
|
|
|
|
(data (and (match-end 3) (match-string 3)))
|
|
|
|
(id-pos (condition-case msg
|
|
|
|
(org-mobile-locate-entry (match-string 4))
|
|
|
|
(error (nth 1 msg))))
|
|
|
|
(bos (point-at-bol))
|
|
|
|
(eos (save-excursion (org-end-of-subtree t t)))
|
|
|
|
(cmd (if (equal action "")
|
|
|
|
'(progn
|
|
|
|
(incf cnt-flag)
|
|
|
|
(org-toggle-tag "FLAGGED" 'on)
|
|
|
|
(and note
|
|
|
|
(org-entry-put nil "THEFLAGGINGNOTE" note)))
|
|
|
|
(incf cnt-edit)
|
|
|
|
(cdr (assoc action org-mobile-action-alist))))
|
|
|
|
(note (and (equal action "")
|
|
|
|
(buffer-substring (1+ (point-at-eol)) eos)))
|
|
|
|
(org-inhibit-logging 'note) ;; Do not take notes interactively
|
|
|
|
old new)
|
|
|
|
|
|
|
|
(goto-char bos)
|
|
|
|
(when (and (markerp id-pos)
|
|
|
|
(not (member (marker-buffer id-pos) buf-list)))
|
|
|
|
(org-mobile-timestamp-buffer (marker-buffer id-pos))
|
|
|
|
(push (marker-buffer id-pos) buf-list))
|
|
|
|
(unless (markerp id-pos)
|
|
|
|
(goto-char (+ 2 (point-at-bol)))
|
|
|
|
(if (stringp id-pos)
|
|
|
|
(insert id-pos " ")
|
|
|
|
(insert "BAD REFERENCE "))
|
|
|
|
(incf cnt-error)
|
|
|
|
(throw 'next t))
|
|
|
|
(unless cmd
|
|
|
|
(insert "BAD FLAG ")
|
|
|
|
(incf cnt-error)
|
|
|
|
(throw 'next t))
|
|
|
|
(move-marker bos-marker (point))
|
|
|
|
(if (re-search-forward "^** Old value[ \t]*$" eos t)
|
|
|
|
(setq old (buffer-substring
|
|
|
|
(1+ (match-end 0))
|
|
|
|
(progn (outline-next-heading) (point)))))
|
|
|
|
(if (re-search-forward "^** New value[ \t]*$" eos t)
|
|
|
|
(setq new (buffer-substring
|
|
|
|
(1+ (match-end 0))
|
|
|
|
(progn (outline-next-heading)
|
|
|
|
(if (eobp) (org-back-over-empty-lines))
|
|
|
|
(point)))))
|
|
|
|
(setq old (and old (if (string-match "\\S-" old) old nil)))
|
|
|
|
(setq new (and new (if (string-match "\\S-" new) new nil)))
|
|
|
|
(if (and note (> (length note) 0))
|
|
|
|
;; Make Note into a single line, to fit into a property
|
|
|
|
(setq note (mapconcat 'identity
|
|
|
|
(org-split-string (org-trim note) "\n")
|
|
|
|
"\\n")))
|
|
|
|
(unless (equal data "body")
|
|
|
|
(setq new (and new (org-trim new))
|
|
|
|
old (and old (org-trim old))))
|
|
|
|
(goto-char (+ 2 bos-marker))
|
|
|
|
;; Remember this place so that we can return
|
|
|
|
(move-marker marker (point))
|
|
|
|
(setq org-mobile-error nil)
|
|
|
|
(save-excursion
|
|
|
|
(condition-case msg
|
|
|
|
(org-with-point-at id-pos
|
|
|
|
(progn
|
|
|
|
(eval cmd)
|
|
|
|
(unless (member data (list "delete" "archive" "archive-sibling" "addheading"))
|
|
|
|
(if (member "FLAGGED" (org-get-tags))
|
|
|
|
(add-to-list 'org-mobile-last-flagged-files
|
|
|
|
(buffer-file-name (current-buffer)))))))
|
|
|
|
(error (setq org-mobile-error msg))))
|
|
|
|
(when org-mobile-error
|
|
|
|
(org-pop-to-buffer-same-window (marker-buffer marker))
|
|
|
|
(goto-char marker)
|
|
|
|
(incf cnt-error)
|
|
|
|
(insert (if (stringp (nth 1 org-mobile-error))
|
|
|
|
(nth 1 org-mobile-error)
|
|
|
|
"EXECUTION FAILED")
|
|
|
|
" ")
|
|
|
|
(throw 'next t))
|
|
|
|
;; If we get here, the action has been applied successfully
|
|
|
|
;; So remove the entry
|
|
|
|
(goto-char bos-marker)
|
|
|
|
(delete-region (point) (org-end-of-subtree t t)))))
|
2009-10-22 15:50:29 +00:00
|
|
|
(save-buffer)
|
2009-09-15 18:06:44 +00:00
|
|
|
(move-marker marker nil)
|
2009-10-19 10:50:47 +00:00
|
|
|
(move-marker end nil)
|
|
|
|
(message "%d new, %d edits, %d flags, %d errors" cnt-new
|
|
|
|
cnt-edit cnt-flag cnt-error)
|
|
|
|
(sit-for 1)))
|
2009-09-15 18:06:44 +00:00
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defun org-mobile-timestamp-buffer (buf)
|
|
|
|
"Time stamp buffer BUF, just to make sure its checksum will change."
|
|
|
|
(with-current-buffer buf
|
|
|
|
(save-excursion
|
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
2009-11-12 23:22:18 +00:00
|
|
|
(if (re-search-forward
|
|
|
|
"^\\([ \t]*\\)#\\+LAST_MOBILE_CHANGE:.*\n?" nil t)
|
|
|
|
(progn
|
|
|
|
(goto-char (match-end 1))
|
|
|
|
(delete-region (point) (match-end 0)))
|
|
|
|
(if (looking-at ".*?-\\*-.*-\\*-")
|
|
|
|
(forward-line 1)))
|
2009-10-05 15:13:56 +00:00
|
|
|
(insert "#+LAST_MOBILE_CHANGE: "
|
|
|
|
(format-time-string "%Y-%m-%d %T") "\n")))))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(defun org-mobile-smart-read ()
|
|
|
|
"Parse the entry at point for shortcuts and expand them.
|
|
|
|
These shortcuts are meant for fast and easy typing on the limited
|
|
|
|
keyboards of a mobile device. Below we show a list of the shortcuts
|
|
|
|
currently implemented.
|
|
|
|
|
|
|
|
The entry is expected to contain an inactive time stamp indicating when
|
|
|
|
the entry was created. When setting dates and
|
|
|
|
times (for example for deadlines), the time strings are interpreted
|
|
|
|
relative to that creation date.
|
2009-11-12 12:39:29 +00:00
|
|
|
Abbreviations are expected to take up entire lines, just because it is so
|
2009-09-15 18:06:44 +00:00
|
|
|
easy to type RET on a mobile device. Abbreviations start with one or two
|
|
|
|
letters, followed immediately by a dot and then additional information.
|
|
|
|
Generally the entire shortcut line is removed after action have been taken.
|
|
|
|
Time stamps will be constructed using `org-read-date'. So for example a
|
|
|
|
line \"dd. 2tue\" will set a deadline on the second Tuesday after the
|
|
|
|
creation date.
|
|
|
|
|
|
|
|
Here are the shortcuts currently implemented:
|
|
|
|
|
|
|
|
dd. string set deadline
|
|
|
|
ss. string set scheduling
|
|
|
|
tt. string set time tamp, here.
|
|
|
|
ti. string set inactive time
|
|
|
|
|
|
|
|
tg. tag1 tag2 tag3 set all these tags, change case where necessary
|
|
|
|
td. kwd set this todo keyword, change case where necessary
|
|
|
|
|
|
|
|
FIXME: Hmmm, not sure if we can make his work against the
|
|
|
|
auto-correction feature. Needs a bit more thinking. So this function
|
|
|
|
is currently a noop.")
|
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defun org-mobile-locate-entry (link)
|
|
|
|
(if (string-match "\\`id:\\(.*\\)$" link)
|
|
|
|
(org-id-find (match-string 1 link) 'marker)
|
|
|
|
(if (not (string-match "\\`olp:\\(.*?\\):\\(.*\\)$" link))
|
2012-08-11 17:10:44 +00:00
|
|
|
; not found with path, but maybe it is to be inserted
|
|
|
|
; in top level of the file?
|
2012-05-22 11:32:27 +00:00
|
|
|
(if (not (string-match "\\`olp:\\(.*?\\)$" link))
|
|
|
|
nil
|
|
|
|
(let ((file (match-string 1 link)))
|
|
|
|
(setq file (org-link-unescape file))
|
|
|
|
(setq file (expand-file-name file org-directory))
|
|
|
|
(save-excursion
|
|
|
|
(find-file file)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(newline)
|
|
|
|
(goto-char (point-max))
|
|
|
|
(move-marker (make-marker) (point)))))
|
2009-10-05 15:13:56 +00:00
|
|
|
(let ((file (match-string 1 link))
|
2010-11-21 10:51:31 +00:00
|
|
|
(path (match-string 2 link)))
|
|
|
|
(setq file (org-link-unescape file))
|
2009-10-18 00:53:51 +00:00
|
|
|
(setq file (expand-file-name file org-directory))
|
2010-11-21 10:51:31 +00:00
|
|
|
(setq path (mapcar 'org-link-unescape
|
2009-10-05 15:13:56 +00:00
|
|
|
(org-split-string path "/")))
|
|
|
|
(org-find-olp (cons file path))))))
|
|
|
|
|
|
|
|
(defun org-mobile-edit (what old new)
|
2009-11-12 12:39:29 +00:00
|
|
|
"Edit item WHAT in the current entry by replacing OLD with NEW.
|
2009-10-05 15:13:56 +00:00
|
|
|
WHAT can be \"heading\", \"todo\", \"tags\", \"priority\", or \"body\".
|
|
|
|
The edit only takes place if the current value is equal (except for
|
|
|
|
white space) the OLD. If this is so, OLD will be replace by NEW
|
|
|
|
and the command will return t. If something goes wrong, a string will
|
|
|
|
be returned that indicates what went wrong."
|
2012-07-06 07:35:43 +00:00
|
|
|
(let (current old1 new1 level)
|
2009-10-05 15:13:56 +00:00
|
|
|
(if (stringp what) (setq what (intern what)))
|
2009-10-15 05:59:15 +00:00
|
|
|
|
|
|
|
(cond
|
|
|
|
|
|
|
|
((memq what '(todo todostate))
|
|
|
|
(setq current (org-get-todo-state))
|
|
|
|
(cond
|
|
|
|
((equal new "DONEARCHIVE")
|
|
|
|
(org-todo 'done)
|
|
|
|
(org-archive-subtree-default))
|
|
|
|
((equal new current) t) ; nothing needs to be done
|
|
|
|
((or (equal current old)
|
|
|
|
(eq org-mobile-force-mobile-change t)
|
|
|
|
(memq 'todo org-mobile-force-mobile-change))
|
2009-10-19 10:50:47 +00:00
|
|
|
(org-todo (or new 'none)) t)
|
2009-10-15 05:59:15 +00:00
|
|
|
(t (error "State before change was expected as \"%s\", but is \"%s\""
|
|
|
|
old current))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2009-10-15 05:59:15 +00:00
|
|
|
((eq what 'tags)
|
|
|
|
(setq current (org-get-tags)
|
|
|
|
new1 (and new (org-split-string new ":+"))
|
|
|
|
old1 (and old (org-split-string old ":+")))
|
|
|
|
(cond
|
|
|
|
((org-mobile-tags-same-p current new1) t) ; no change needed
|
|
|
|
((or (org-mobile-tags-same-p current old1)
|
|
|
|
(eq org-mobile-force-mobile-change t)
|
|
|
|
(memq 'tags org-mobile-force-mobile-change))
|
|
|
|
(org-set-tags-to new1) t)
|
|
|
|
(t (error "Tags before change were expected as \"%s\", but are \"%s\""
|
|
|
|
(or old "") (or current "")))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2009-10-15 05:59:15 +00:00
|
|
|
((eq what 'priority)
|
|
|
|
(when (looking-at org-complex-heading-regexp)
|
|
|
|
(setq current (and (match-end 3) (substring (match-string 3) 2 3)))
|
|
|
|
(cond
|
|
|
|
((equal current new) t) ; no action required
|
|
|
|
((or (equal current old)
|
|
|
|
(eq org-mobile-force-mobile-change t)
|
|
|
|
(memq 'tags org-mobile-force-mobile-change))
|
|
|
|
(org-priority (and new (string-to-char new))))
|
|
|
|
(t (error "Priority was expected to be %s, but is %s"
|
|
|
|
old current)))))
|
|
|
|
|
|
|
|
((eq what 'heading)
|
|
|
|
(when (looking-at org-complex-heading-regexp)
|
|
|
|
(setq current (match-string 4))
|
|
|
|
(cond
|
|
|
|
((equal current new) t) ; no action required
|
|
|
|
((or (equal current old)
|
|
|
|
(eq org-mobile-force-mobile-change t)
|
|
|
|
(memq 'heading org-mobile-force-mobile-change))
|
|
|
|
(goto-char (match-beginning 4))
|
|
|
|
(insert new)
|
|
|
|
(delete-region (point) (+ (point) (length current)))
|
|
|
|
(org-set-tags nil 'align))
|
|
|
|
(t (error "Heading changed in MobileOrg and on the computer")))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2012-05-22 11:32:27 +00:00
|
|
|
((eq what 'addheading)
|
|
|
|
(if (org-on-heading-p) ; if false we are in top-level of file
|
|
|
|
(progn
|
|
|
|
(end-of-line 1)
|
|
|
|
(org-insert-heading-respect-content)
|
|
|
|
(org-demote))
|
|
|
|
(beginning-of-line)
|
|
|
|
(insert "* "))
|
|
|
|
(insert new))
|
|
|
|
|
|
|
|
((eq what 'refile)
|
|
|
|
(org-copy-subtree)
|
|
|
|
(org-with-point-at (org-mobile-locate-entry new)
|
|
|
|
(if (org-on-heading-p) ; if false we are in top-level of file
|
|
|
|
(progn
|
|
|
|
(setq level (org-get-valid-level (funcall outline-level) 1))
|
|
|
|
(org-end-of-subtree t t)
|
|
|
|
(org-paste-subtree level))
|
2012-08-11 17:10:44 +00:00
|
|
|
(org-paste-subtree 1)))
|
|
|
|
(org-cut-subtree))
|
2012-05-22 11:32:27 +00:00
|
|
|
|
|
|
|
((eq what 'delete)
|
|
|
|
(org-cut-subtree))
|
|
|
|
|
|
|
|
((eq what 'archive)
|
|
|
|
(org-archive-subtree))
|
|
|
|
|
|
|
|
((eq what 'archive-sibling)
|
|
|
|
(org-archive-to-archive-sibling))
|
|
|
|
|
2009-10-15 05:59:15 +00:00
|
|
|
((eq what 'body)
|
|
|
|
(setq current (buffer-substring (min (1+ (point-at-eol)) (point-max))
|
|
|
|
(save-excursion (outline-next-heading)
|
|
|
|
(point))))
|
|
|
|
(if (not (string-match "\\S-" current)) (setq current nil))
|
|
|
|
(cond
|
2009-11-12 12:39:29 +00:00
|
|
|
((org-mobile-bodies-same-p current new) t) ; no action necessary
|
2009-10-15 05:59:15 +00:00
|
|
|
((or (org-mobile-bodies-same-p current old)
|
|
|
|
(eq org-mobile-force-mobile-change t)
|
|
|
|
(memq 'body org-mobile-force-mobile-change))
|
|
|
|
(save-excursion
|
|
|
|
(end-of-line 1)
|
|
|
|
(insert "\n" new)
|
|
|
|
(or (bolp) (insert "\n"))
|
|
|
|
(delete-region (point) (progn (org-back-to-heading t)
|
|
|
|
(outline-next-heading)
|
|
|
|
(point))))
|
|
|
|
t)
|
|
|
|
(t (error "Body was changed in MobileOrg and on the computer")))))))
|
2010-04-01 11:11:54 +00:00
|
|
|
|
2009-10-05 15:13:56 +00:00
|
|
|
(defun org-mobile-tags-same-p (list1 list2)
|
|
|
|
"Are the two tag lists the same?"
|
|
|
|
(not (or (org-delete-all list1 list2)
|
|
|
|
(org-delete-all list2 list1))))
|
|
|
|
|
|
|
|
(defun org-mobile-bodies-same-p (a b)
|
|
|
|
"Compare if A and B are visually equal strings.
|
|
|
|
We first remove leading and trailing white space from the entire strings.
|
|
|
|
Then we split the strings into lines and remove leading/trailing whitespace
|
|
|
|
from each line. Then we compare.
|
|
|
|
A and B must be strings or nil."
|
|
|
|
(cond
|
|
|
|
((and (not a) (not b)) t)
|
|
|
|
((or (not a) (not b)) nil)
|
|
|
|
(t (setq a (org-trim a) b (org-trim b))
|
|
|
|
(setq a (mapconcat 'identity (org-split-string a "[ \t]*\n[ \t]*") "\n"))
|
|
|
|
(setq b (mapconcat 'identity (org-split-string b "[ \t]*\n[ \t]*") "\n"))
|
|
|
|
(equal a b))))
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
(provide 'org-mobile)
|
|
|
|
|
2012-10-02 06:50:46 +00:00
|
|
|
;; Local variables:
|
|
|
|
;; generated-autoload-file: "org-loaddefs.el"
|
|
|
|
;; End:
|
|
|
|
|
2009-09-15 18:06:44 +00:00
|
|
|
;;; org-mobile.el ends here
|