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

Improved ledger-report visit source capabilities

Browse source
This commit is contained in:
Craig Earls 2013-02-14 09:49:00 -07:00
parent c031fa4943
commit 1074dec8ad
1 changed files with 48 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
lisp/ldg-report.el
View file

@ -100,6 +100,7 @@ text that should replace the format specifier."
(define-key map [menu-bar ldg-rep lrq] '("Quit" . ledger-report-quit)) (define-key map [menu-bar ldg-rep lrq] '("Quit" . ledger-report-quit))
(define-key map [menu-bar ldg-rep s2] '("--")) (define-key map [menu-bar ldg-rep s2] '("--"))
(define-key map [menu-bar ldg-rep lrd] '("Scroll Down" . scroll-down)) (define-key map [menu-bar ldg-rep lrd] '("Scroll Down" . scroll-down))
(define-key map [menu-bar ldg-rep vis] '("Visit Source" . ledger-report-visit-source))
(define-key map [menu-bar ldg-rep lru] '("Scroll Up" . scroll-up)) (define-key map [menu-bar ldg-rep lru] '("Scroll Up" . scroll-up))
(define-key map [menu-bar ldg-rep s1] '("--")) (define-key map [menu-bar ldg-rep s1] '("--"))
(define-key map [menu-bar ldg-rep lrk] '("Kill Report" . ledger-report-kill)) (define-key map [menu-bar ldg-rep lrk] '("Kill Report" . ledger-report-kill))
@ -240,8 +241,10 @@ the default."
(ledger-read-string-with-default "Account" default))) (ledger-read-string-with-default "Account" default)))
(defun ledger-report-expand-format-specifiers (report-cmd) (defun ledger-report-expand-format-specifiers (report-cmd)
(save-match-data
(let ((expanded-cmd report-cmd)) (let ((expanded-cmd report-cmd))
(while (string-match "%(\\([^)]*\\))" expanded-cmd) (set-match-data (list 0 0))
(while (string-match "%(\\([^)]*\\))" expanded-cmd (match-end 0))
(let* ((specifier (match-string 1 expanded-cmd)) (let* ((specifier (match-string 1 expanded-cmd))
(f (cdr (assoc specifier ledger-report-format-specifiers)))) (f (cdr (assoc specifier ledger-report-format-specifiers))))
(if f (if f
@ -249,11 +252,8 @@ the default."
(save-match-data (save-match-data
(with-current-buffer ledger-buf (with-current-buffer ledger-buf
(shell-quote-argument (funcall f)))) (shell-quote-argument (funcall f))))
t t expanded-cmd)) t t expanded-cmd)))))
(progn expanded-cmd)))
(set-window-configuration ledger-original-window-cfg)
(error "Invalid ledger report format specifier '%s'" specifier)))))
expanded-cmd))
(defun ledger-report-cmd (report-name edit) (defun ledger-report-cmd (report-name edit)
"Get the command line to run the report." "Get the command line to run the report."
@ -282,12 +282,15 @@ the default."
(register-report (string-match " reg\\(ister\\)? " cmd)) (register-report (string-match " reg\\(ister\\)? " cmd))
files-in-report) files-in-report)
(shell-command (shell-command
(if register-report ;; subtotal doe not produce identifiable transactions, so don't
;; prepend location information for them
(if (and register-report
(not (string-match "--subtotal" cmd)))
(concat cmd " --prepend-format='%(filename):%(beg_line):'") (concat cmd " --prepend-format='%(filename):%(beg_line):'")
cmd) t nil) cmd) t nil)
(when register-report (when register-report
(goto-char data-pos) (goto-char data-pos)
(while (re-search-forward "^\\([^:]+\\)?:\\([0-9]+\\)?:" nil t) (while (re-search-forward "^\\(/[^:]+\\)?:\\([0-9]+\\)?:" nil t)
(let ((file (match-string 1)) (let ((file (match-string 1))
(line (string-to-number (match-string 2)))) (line (string-to-number (match-string 2))))
(delete-region (match-beginning 0) (match-end 0)) (delete-region (match-beginning 0) (match-end 0))
@ -296,8 +299,7 @@ the default."
(save-excursion (save-excursion
(find-file file) (find-file file)
(widen) (widen)
(goto-char (point-min)) (ledger-goto-line line)
(forward-line (1- line))
(point-marker)))))) (point-marker))))))
(end-of-line)))) (end-of-line))))
(goto-char data-pos))) (goto-char data-pos)))
@ -305,8 +307,11 @@ the default."
(defun ledger-report-visit-source () (defun ledger-report-visit-source ()
(interactive) (interactive)
(let ((prop (get-text-property (point) 'ledger-source))) (let* ((prop (get-text-property (point) 'ledger-source))
(destructuring-bind (file . line-or-marker) prop (file (if prop (car prop)))
(line-or-marker (if prop (cdr prop))))
(if (and file line-or-marker)
(progn
(find-file-other-window file) (find-file-other-window file)
(widen) (widen)
(if (markerp line-or-marker) (if (markerp line-or-marker)
@ -318,7 +323,7 @@ the default."
(let ((start-of-txn (point))) (let ((start-of-txn (point)))
(forward-paragraph) (forward-paragraph)
(narrow-to-region start-of-txn (point)) (narrow-to-region start-of-txn (point))
(backward-paragraph)))))) (backward-paragraph)))))))
(defun ledger-report-goto () (defun ledger-report-goto ()
"Goto the ledger report buffer." "Goto the ledger report buffer."