From mboxrd@z Thu Jan 1 00:00:00 1970 From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Subject: [PATCH 1/3] org-datetree.el: Code cleanup. Date: Wed, 02 Sep 2015 09:06:04 +0100 Message-ID: <3775628.BqEO9YxpYl@descartes> References: Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7Bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:40384) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX33g-0003R3-5h for emacs-orgmode@gnu.org; Wed, 02 Sep 2015 04:06:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZX33b-0003gR-Tk for emacs-orgmode@gnu.org; Wed, 02 Sep 2015 04:06:16 -0400 Received: from ptmx.org ([178.63.28.110]:42176) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZX33b-0003gN-Jw for emacs-orgmode@gnu.org; Wed, 02 Sep 2015 04:06:11 -0400 In-Reply-To: List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: emacs-orgmode@gnu.org * lisp/org-datetree.el (org-datetree--find-create): New function. (org-datetree-find-year-create, org-datetree-find-month-create, org-datetree-find-day-create): Removed functions (org-datetree-find-date-create): Use `org-datetree--find-create' instead of removed functions. Use calendar extract functions. (org-datetree-insert-line): Do more formatting in `format-time-string' since we call it anyway * testing/lisp/test-org-datetree.el (test-org-datetree/find-date-create): Test if new entries are put at the right place. --- lisp/org-datetree.el | 77 +++++++++------------------------------ testing/lisp/test-org-datetree.el | 9 +++++ 2 files changed, 27 insertions(+), 59 deletions(-) diff --git a/lisp/org-datetree.el b/lisp/org-datetree.el index a97a9d0..3620bbd 100644 --- a/lisp/org-datetree.el +++ b/lisp/org-datetree.el @@ -64,67 +64,30 @@ (defun org-datetree-find-date-create (date &optional keep-restriction) (org-get-valid-level (org-current-level) 1)) (org-narrow-to-subtree))) (goto-char (point-min)) - (let ((year (nth 2 date)) - (month (car date)) - (day (nth 1 date))) - (org-datetree-find-year-create year) - (org-datetree-find-month-create year month) - (org-datetree-find-day-create year month day)))) - -(defun org-datetree-find-year-create (year) - "Find the YEAR datetree or create it." - (let ((re "^\\*+[ \t]+\\([12][0-9]\\{3\\}\\)\\(\\s-*?\\([ \t]:[[:alnum:]:_@#%]+:\\)?\\s-*$\\)") + (let ((year (calendar-extract-year date)) + (month (calendar-extract-month date)) + (day (calendar-extract-day date))) + (org-datetree--find-create "^\\*+[ \t]+\\([12][0-9]\\{3\\}\\)\\(\\s-*?\\([ \t]:[[:alnum:]:_@#%%]+:\\)?\\s-*$\\)" + year) + (org-datetree--find-create "^\\*+[ \t]+%d-\\([01][0-9]\\) \\w+$" + year month) + (org-datetree--find-create "^\\*+[ \t]+%d-%02d-\\([0123][0-9]\\) \\w+$" + year month day)))) + +(defun org-datetree--find-create (regex year &optional month day) + "Find the datetree matched by REGEX for YEAR, MONTH, or DAY." + (let ((re (format regex year month day)) match) (goto-char (point-min)) (while (and (setq match (re-search-forward re nil t)) (goto-char (match-beginning 1)) - (< (string-to-number (match-string 1)) year))) + (< (string-to-number (match-string 1)) (or day month year)))) (cond ((not match) (goto-char (point-max)) - (or (bolp) (newline)) - (org-datetree-insert-line year)) - ((= (string-to-number (match-string 1)) year) - (goto-char (point-at-bol))) - (t - (beginning-of-line 1) - (org-datetree-insert-line year))))) - -(defun org-datetree-find-month-create (year month) - "Find the datetree for YEAR and MONTH or create it." - (org-narrow-to-subtree) - (let ((re (format "^\\*+[ \t]+%d-\\([01][0-9]\\) \\w+$" year)) - match) - (goto-char (point-min)) - (while (and (setq match (re-search-forward re nil t)) - (goto-char (match-beginning 1)) - (< (string-to-number (match-string 1)) month))) - (cond - ((not match) - (goto-char (point-max)) - (or (bolp) (newline)) - (org-datetree-insert-line year month)) - ((= (string-to-number (match-string 1)) month) - (goto-char (point-at-bol))) - (t - (beginning-of-line 1) - (org-datetree-insert-line year month))))) - -(defun org-datetree-find-day-create (year month day) - "Find the datetree for YEAR, MONTH and DAY or create it." - (org-narrow-to-subtree) - (let ((re (format "^\\*+[ \t]+%d-%02d-\\([0123][0-9]\\) \\w+$" year month)) - match) - (goto-char (point-min)) - (while (and (setq match (re-search-forward re nil t)) - (goto-char (match-beginning 1)) - (< (string-to-number (match-string 1)) day))) - (cond - ((not match) - (goto-char (point-max)) - (or (bolp) (newline)) + (unless (bolp) (newline)) (org-datetree-insert-line year month day)) - ((= (string-to-number (match-string 1)) day) + ((= (string-to-number (match-string 1)) (or day month year)) (goto-char (point-at-bol))) (t (beginning-of-line 1) @@ -139,13 +102,9 @@ (defun org-datetree-insert-line (year &optional month day) (insert (format "%d" year)) (when month (insert - (format "-%02d" month) (if day - (format "-%02d %s" - day - (format-time-string "%A" (encode-time 0 0 0 day month year))) - (format " %s" - (format-time-string "%B" (encode-time 0 0 0 1 month year)))))) + (format-time-string "-%m-%d %A" (encode-time 0 0 0 day month year)) + (format-time-string "-%m %B" (encode-time 0 0 0 1 month year))))) (when (and day org-datetree-add-timestamp) (save-excursion (insert "\n") diff --git a/testing/lisp/test-org-datetree.el b/testing/lisp/test-org-datetree.el index d500130..0135ab9 100644 --- a/testing/lisp/test-org-datetree.el +++ b/testing/lisp/test-org-datetree.el @@ -55,6 +55,15 @@ (ert-deftest test-org-datetree/find-date-create () (let ((org-datetree-add-timestamp nil)) (org-datetree-find-date-create '(3 29 2012))) (org-trim (buffer-string))))) + ;; Sort new entry in right place + (should + (string-match + "\\`\\* 2012\n\\*\\* 2012-02 .*\n\\*\\*\\* 2012-02-01 .*\n\n\\*\\* 2012-03 .*\n\\*\\*\\* 2012-03-29 .*\\'" + (org-test-with-temp-text "* 2012\n** 2012-03 month\n*** 2012-03-29 day" + (let ((org-datetree-add-timestamp nil)) + (org-datetree-find-date-create '(3 29 2012)) + (org-datetree-find-date-create '(2 1 2012))) + (org-trim (buffer-string))))) ;; When `org-datetree-add-timestamp' is non-nil, insert a timestamp ;; in entry. When set to `inactive', insert an inactive one. (should -- 2.5.1