sfos/ledger
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix ledger-find-slot so that it doesn't require transaction codes

Browse source
This commit is contained in:
Craig Earls 2013-05-14 09:49:27 -07:00
parent a7097c9e41
commit 47142e5846
2 changed files with 60 additions and 60 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lisp/ldg-regex.el
View file

@ -325,7 +325,7 @@
(concat "\\(Y\\s-+\\([0-9]+\\)\\|" ;; Catches a Y directive (concat "\\(Y\\s-+\\([0-9]+\\)\\|" ;; Catches a Y directive
ledger-iso-date-regexp ledger-iso-date-regexp
"\\([ *!]+\\)" ;; mark "\\([ *!]+\\)" ;; mark
"\\((.*)\\)" ;; code "\\((.*)\\)?" ;; code
"\\(.*\\)" ;; desc "\\(.*\\)" ;; desc
"\\)")) "\\)"))

112
lisp/ldg-xact.el
View file

@ -40,28 +40,28 @@ within the transaction."
(save-excursion (save-excursion
(goto-char pos) (goto-char pos)
(list (progn (list (progn
(backward-paragraph) (backward-paragraph)
(if (/= (point) (point-min)) (if (/= (point) (point-min))
(forward-line)) (forward-line))
(line-beginning-position)) (line-beginning-position))
(progn (progn
(forward-paragraph) (forward-paragraph)
(line-beginning-position))))) (line-beginning-position)))))
(defun ledger-highlight-xact-under-point () (defun ledger-highlight-xact-under-point ()
"Move the highlight overlay to the current transaction." "Move the highlight overlay to the current transaction."
(if ledger-highlight-xact-under-point (if ledger-highlight-xact-under-point
(let ((exts (ledger-find-xact-extents (point))) (let ((exts (ledger-find-xact-extents (point)))
(ovl highlight-overlay)) (ovl highlight-overlay))
(if (not highlight-overlay) (if (not highlight-overlay)
(setq ovl (setq ovl
(setq highlight-overlay (setq highlight-overlay
(make-overlay (car exts) (make-overlay (car exts)
(cadr exts) (cadr exts)
(current-buffer) t nil))) (current-buffer) t nil)))
(move-overlay ovl (car exts) (cadr exts))) (move-overlay ovl (car exts) (cadr exts)))
(overlay-put ovl 'face 'ledger-font-xact-highlight-face) (overlay-put ovl 'face 'ledger-font-xact-highlight-face)
(overlay-put ovl 'priority 100)))) (overlay-put ovl 'priority 100))))
(defun ledger-xact-payee () (defun ledger-xact-payee ()
"Return the payee of the transaction containing point or nil." "Return the payee of the transaction containing point or nil."
@ -71,7 +71,7 @@ within the transaction."
(let ((context-info (ledger-context-other-line i))) (let ((context-info (ledger-context-other-line i)))
(if (eq (ledger-context-line-type context-info) 'xact) (if (eq (ledger-context-line-type context-info) 'xact)
(ledger-context-field-value context-info 'payee) (ledger-context-field-value context-info 'payee)
nil)))) nil))))
(defun ledger-time-less-p (t1 t2) (defun ledger-time-less-p (t1 t2)
"Say whether time value T1 is less than time value T2." "Say whether time value T1 is less than time value T2."
@ -87,7 +87,7 @@ MOMENT is an encoded date"
(function (function
(lambda (start date mark desc) (lambda (start date mark desc)
(if (ledger-time-less-p moment date) (if (ledger-time-less-p moment date)
(throw 'found t))))))) (throw 'found t)))))))
(defun ledger-xact-iterate-transactions (callback) (defun ledger-xact-iterate-transactions (callback)
"Iterate through each transaction call CALLBACK for each." "Iterate through each transaction call CALLBACK for each."
@ -99,19 +99,19 @@ MOMENT is an encoded date"
(let ((found-y-p (match-string 2))) (let ((found-y-p (match-string 2)))
(if found-y-p (if found-y-p
(setq current-year (string-to-number found-y-p)) ;; a Y directive was found (setq current-year (string-to-number found-y-p)) ;; a Y directive was found
(let ((start (match-beginning 0)) (let ((start (match-beginning 0))
(year (match-string 4)) (year (match-string 4))
(month (string-to-number (match-string 5))) (month (string-to-number (match-string 5)))
(day (string-to-number (match-string 6))) (day (string-to-number (match-string 6)))
(mark (match-string 7)) (mark (match-string 7))
(code (match-string 8)) (code (match-string 8))
(desc (match-string 9))) (desc (match-string 9)))
(if (and year (> (length year) 0)) (if (and year (> (length year) 0))
(setq year (string-to-number year))) (setq year (string-to-number year)))
(funcall callback start (funcall callback start
(encode-time 0 0 0 day month (encode-time 0 0 0 day month
(or year current-year)) (or year current-year))
mark desc))))) mark desc)))))
(forward-line)))) (forward-line))))
(defsubst ledger-goto-line (line-number) (defsubst ledger-goto-line (line-number)
@ -123,17 +123,17 @@ MOMENT is an encoded date"
(defun ledger-copy-transaction-at-point (date) (defun ledger-copy-transaction-at-point (date)
"Ask for a new DATE and copy the transaction under point to that date. Leave point on the first amount." "Ask for a new DATE and copy the transaction under point to that date. Leave point on the first amount."
(interactive (list (interactive (list
(read-string "Copy to date: " (read-string "Copy to date: "
(concat ledger-year "/" ledger-month "/") 'ledger-minibuffer-history))) (concat ledger-year "/" ledger-month "/") 'ledger-minibuffer-history)))
(let* ((here (point)) (let* ((here (point))
(extents (ledger-find-xact-extents (point))) (extents (ledger-find-xact-extents (point)))
(transaction (buffer-substring-no-properties (car extents) (cadr extents))) (transaction (buffer-substring-no-properties (car extents) (cadr extents)))
encoded-date) encoded-date)
(if (string-match ledger-iso-date-regexp date) (if (string-match ledger-iso-date-regexp date)
(setq encoded-date (setq encoded-date
(encode-time 0 0 0 (string-to-number (match-string 4 date)) (encode-time 0 0 0 (string-to-number (match-string 4 date))
(string-to-number (match-string 3 date)) (string-to-number (match-string 3 date))
(string-to-number (match-string 2 date))))) (string-to-number (match-string 2 date)))))
(ledger-xact-find-slot encoded-date) (ledger-xact-find-slot encoded-date)
(insert transaction "\n") (insert transaction "\n")
(backward-paragraph 2) (backward-paragraph 2)
@ -153,7 +153,7 @@ If INSERT-AT-POINT is non-nil insert the transaction
there, otherwise call `ledger-xact-find-slot' to insert it at the there, otherwise call `ledger-xact-find-slot' to insert it at the
correct chronological place in the buffer." correct chronological place in the buffer."
(interactive (list (interactive (list
(read-string "Transaction: " (concat ledger-year "/" ledger-month "/")))) (read-string "Transaction: " (concat ledger-year "/" ledger-month "/"))))
(let* ((args (with-temp-buffer (let* ((args (with-temp-buffer
(insert transaction-text) (insert transaction-text)
(eshell-parse-arguments (point-min) (point-max)))) (eshell-parse-arguments (point-min) (point-max))))
@ -168,20 +168,20 @@ correct chronological place in the buffer."
(string-to-number (match-string 2 date))))) (string-to-number (match-string 2 date)))))
(ledger-xact-find-slot date))) (ledger-xact-find-slot date)))
(if (> (length args) 1) (if (> (length args) 1)
(save-excursion (save-excursion
(insert (insert
(with-temp-buffer (with-temp-buffer
(setq exit-code (setq exit-code
(apply #'ledger-exec-ledger ledger-buf (current-buffer) "xact" (apply #'ledger-exec-ledger ledger-buf (current-buffer) "xact"
(mapcar 'eval args))) (mapcar 'eval args)))
(goto-char (point-min)) (goto-char (point-min))
(if (looking-at "Error: ") (if (looking-at "Error: ")
(error (concat "Error in ledger-add-transaction: " (buffer-string))) (error (concat "Error in ledger-add-transaction: " (buffer-string)))
(buffer-string))) (buffer-string)))
"\n")) "\n"))
(progn (progn
(insert (car args) " \n\n") (insert (car args) " \n\n")
(end-of-line -1))))) (end-of-line -1)))))
(provide 'ldg-xact) (provide 'ldg-xact)