From 7cc30ef135f7af3c64240b473abb83283f29891f Mon Sep 17 00:00:00 2001
From: jao <jao@gnu.org>
Date: Thu, 4 Aug 2022 18:19:50 +0100
Subject: jao-recoll not needed with latest consult-recoll
---
init.el | 30 ++-------
lib/doc/jao-recoll.el | 131 ------------------------------------
lib/doc/jao-recoll.el/jao-recoll.el | 131 ++++++++++++++++++++++++++++++++++++
3 files changed, 136 insertions(+), 156 deletions(-)
delete mode 100644 lib/doc/jao-recoll.el
create mode 100644 lib/doc/jao-recoll.el/jao-recoll.el
diff --git a/init.el b/init.el
index 604ef71..978fcfe 100644
--- a/init.el
+++ b/init.el
@@ -933,21 +933,6 @@
(require 'jao-custom-completion)
;;;; recoll
-(use-package jao-recoll :demand t)
-
-(defun jao-recoll-messages ()
- (interactive)
- (jao-recoll "mime:message "))
-
-(defun jao-recoll-docs ()
- (interactive)
- (jao-recoll (format "dir:%s/doc " jao-org-dir)))
-
-(defun jao-recoll-notes ()
- (interactive)
- (jao-recoll (format "dir:%s " jao-org-notes-dir)))
-
-;;;; consult-recoll
(jao-load-path "consult-recoll")
(defun jao-recoll-format (title url mtype)
@@ -998,16 +983,11 @@
(consult-customize consult-recoll :preview-key 'any)
(transient-define-prefix jao-recoll-transient ()
- [["Consult recoll queries"
- ("r" "consult recoll query" consult-recoll)
- ("n" "consult recoll on notes" jao-recoll-consult-notes)
- ("d" "consult recoll on docs" jao-recoll-consult-docs)
- ("m" "consult recoll on messages" jao-recoll-consult-messages)]
- ["Recoll queries"
- ("R" "recoll query" jao-recoll)
- ("N" "recoll on notes" jao-recoll-notes)
- ("D" "consult recoll on docs" jao-recoll-docs)
- ("M" "consult recoll on messages" jao-recoll-messages)]])
+ ["Consult recoll queries"
+ ("r" "everywhere" consult-recoll)
+ ("n" "on notes" jao-recoll-consult-notes)
+ ("d" "on docs" jao-recoll-consult-docs)
+ ("m" "on messages" jao-recoll-consult-messages)])
:bind (("s-r" . #'jao-recoll-transient)))
diff --git a/lib/doc/jao-recoll.el b/lib/doc/jao-recoll.el
deleted file mode 100644
index b23106f..0000000
--- a/lib/doc/jao-recoll.el
+++ /dev/null
@@ -1,131 +0,0 @@
-;;; jao-recoll.el -- Displaying recoll queries -*- lexical-binding: t; -*-
-
-;; Copyright (c) 2017, 2020, 2021, 2022 Jose Antonio Ortega Ruiz
-
-;; This file 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.
-
-;; This file 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 this program. If not, see <http://www.gnu.org/licenses/>.
-
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Wed Nov 01, 2017 18:14
-
-
-;;; Comentary:
-
-;; A simple interactive command to perform recoll queries and display
-;; its results using org markup.
-
-;;; Code:
-
-(require 'org)
-
-(define-derived-mode recoll-mode org-mode "Recoll"
- "Simple mode for showing recoll query results"
- (read-only-mode 1))
-
-(defvar jao-recoll--file-regexp
- "\\(\\w+/.+\\)\t+\\[\\([^]]+\\)\\]\t+\\[\\([^\t]+\\)\\].+")
-
-(defvar jao-recoll-flags "-A -p 5 -n 100")
-
-(defvar jao-recoll-single-buffer t)
-(defvar-local jao-recoll--last-query nil)
-(defvar-local jao-recoll--last-full-query nil)
-
-(defun jao-recoll-show-query ()
- (interactive)
- (message (concat jao-recoll--last-query "\n"
- jao-recoll--last-full-query)))
-
-(defun jao-recoll-requery ()
- (interactive)
- (jao-recoll jao-recoll--last-query))
-
-(defun jao-recoll--buffer (q)
- (get-buffer-create (if jao-recoll-single-buffer
- "*Recoll*"
- (format "*Recoll: '%s'*" q))))
-
-(defun jao-recoll--format-snippets (lnk)
- (when (looking-at-p "SNIPPETS")
- (let ((kill-whole-line t))
- (kill-line)
- (while (and (not (eobp)) (not (looking-at-p "/SNIPPETS")))
- (cond ((looking-at "^\\([1-9][0-9]*\\) : ")
- (replace-match (format " - [[%s::\\1][\\1]] : " lnk)))
- ((looking-at "^0 : \\(.[^\n]+\\)")
- (let ((desc (match-string 1)))
- (replace-match " - ")
- (insert (org-make-link-string lnk desc))))
- (t (insert " - ")))
- (forward-line 1))
- (unless (eobp) (kill-line)))))
-
-(defun jao-recoll--org-link (uri desc mime)
- (cond ((string= mime "application/pdf")
- (concat "doc:" (file-name-nondirectory uri)))
- ((string= mime "message/rfc822") (concat "message:" (substring uri 7)))
- ((string= mime "text/x-orgmode-sub") (concat uri "::*" desc))
- (t uri)))
-
-;;;###autoload
-(defun jao-recoll (&optional prefix-query)
- "Performs a query using recoll and shows the results using org markup."
- (interactive)
- (let* ((query (read-string "Recoll query: " prefix-query))
- (cmd (format "recoll %s -t %s"
- jao-recoll-flags (shell-quote-argument query)))
- (inhibit-read-only t))
- (with-current-buffer (jao-recoll--buffer query)
- (recoll-mode)
- (delete-region (point-min) (point-max))
- (shell-command cmd t)
- (setq jao-recoll--last-query query)
- (goto-char (point-min))
- (when (looking-at-p "Recoll query:")
- (setq jao-recoll--last-full-query
- (string-trim (thing-at-point 'line)))
- (let ((kill-whole-line nil)) (kill-line))
- (insert query)
- (forward-line 2))
- (open-line 1)
- (while (search-forward-regexp jao-recoll--file-regexp nil t)
- (let* ((mime (match-string 1))
- (ref (match-string 2))
- (desc (match-string 3))
- (start (match-beginning 0))
- (end (match-end 0))
- (lnk (jao-recoll--org-link ref desc mime))
- (desc (if (string= mime "text/x-orgmode-sub")
- (org-link-display-format
- (concat (file-name-nondirectory ref) " :: " desc))
- desc)))
- (delete-region start end)
- (insert "* " (org-make-link-string lnk desc) " (" mime ")")
- (forward-line)
- (jao-recoll--format-snippets lnk)))
- (pop-to-buffer (current-buffer))
- (goto-char (point-min))
- (org-next-visible-heading 1)
- (org-overview)
- (jao-recoll-show-query))))
-
-(define-key recoll-mode-map [?n] 'org-next-link)
-(define-key recoll-mode-map [?p] 'org-previous-link)
-(define-key recoll-mode-map [?q] 'bury-buffer)
-(define-key recoll-mode-map [?r] 'jao-recoll-requery)
-(define-key recoll-mode-map [?g] 'jao-recoll-requery)
-(define-key recoll-mode-map [?w] 'jao-recoll-show-query)
-
-;;; .
-(provide 'jao-recoll)
-;;; jao-recoll.el ends here
diff --git a/lib/doc/jao-recoll.el/jao-recoll.el b/lib/doc/jao-recoll.el/jao-recoll.el
new file mode 100644
index 0000000..b23106f
--- /dev/null
+++ b/lib/doc/jao-recoll.el/jao-recoll.el
@@ -0,0 +1,131 @@
+;;; jao-recoll.el -- Displaying recoll queries -*- lexical-binding: t; -*-
+
+;; Copyright (c) 2017, 2020, 2021, 2022 Jose Antonio Ortega Ruiz
+
+;; This file 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.
+
+;; This file 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 this program. If not, see <http://www.gnu.org/licenses/>.
+
+;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
+;; Start date: Wed Nov 01, 2017 18:14
+
+
+;;; Comentary:
+
+;; A simple interactive command to perform recoll queries and display
+;; its results using org markup.
+
+;;; Code:
+
+(require 'org)
+
+(define-derived-mode recoll-mode org-mode "Recoll"
+ "Simple mode for showing recoll query results"
+ (read-only-mode 1))
+
+(defvar jao-recoll--file-regexp
+ "\\(\\w+/.+\\)\t+\\[\\([^]]+\\)\\]\t+\\[\\([^\t]+\\)\\].+")
+
+(defvar jao-recoll-flags "-A -p 5 -n 100")
+
+(defvar jao-recoll-single-buffer t)
+(defvar-local jao-recoll--last-query nil)
+(defvar-local jao-recoll--last-full-query nil)
+
+(defun jao-recoll-show-query ()
+ (interactive)
+ (message (concat jao-recoll--last-query "\n"
+ jao-recoll--last-full-query)))
+
+(defun jao-recoll-requery ()
+ (interactive)
+ (jao-recoll jao-recoll--last-query))
+
+(defun jao-recoll--buffer (q)
+ (get-buffer-create (if jao-recoll-single-buffer
+ "*Recoll*"
+ (format "*Recoll: '%s'*" q))))
+
+(defun jao-recoll--format-snippets (lnk)
+ (when (looking-at-p "SNIPPETS")
+ (let ((kill-whole-line t))
+ (kill-line)
+ (while (and (not (eobp)) (not (looking-at-p "/SNIPPETS")))
+ (cond ((looking-at "^\\([1-9][0-9]*\\) : ")
+ (replace-match (format " - [[%s::\\1][\\1]] : " lnk)))
+ ((looking-at "^0 : \\(.[^\n]+\\)")
+ (let ((desc (match-string 1)))
+ (replace-match " - ")
+ (insert (org-make-link-string lnk desc))))
+ (t (insert " - ")))
+ (forward-line 1))
+ (unless (eobp) (kill-line)))))
+
+(defun jao-recoll--org-link (uri desc mime)
+ (cond ((string= mime "application/pdf")
+ (concat "doc:" (file-name-nondirectory uri)))
+ ((string= mime "message/rfc822") (concat "message:" (substring uri 7)))
+ ((string= mime "text/x-orgmode-sub") (concat uri "::*" desc))
+ (t uri)))
+
+;;;###autoload
+(defun jao-recoll (&optional prefix-query)
+ "Performs a query using recoll and shows the results using org markup."
+ (interactive)
+ (let* ((query (read-string "Recoll query: " prefix-query))
+ (cmd (format "recoll %s -t %s"
+ jao-recoll-flags (shell-quote-argument query)))
+ (inhibit-read-only t))
+ (with-current-buffer (jao-recoll--buffer query)
+ (recoll-mode)
+ (delete-region (point-min) (point-max))
+ (shell-command cmd t)
+ (setq jao-recoll--last-query query)
+ (goto-char (point-min))
+ (when (looking-at-p "Recoll query:")
+ (setq jao-recoll--last-full-query
+ (string-trim (thing-at-point 'line)))
+ (let ((kill-whole-line nil)) (kill-line))
+ (insert query)
+ (forward-line 2))
+ (open-line 1)
+ (while (search-forward-regexp jao-recoll--file-regexp nil t)
+ (let* ((mime (match-string 1))
+ (ref (match-string 2))
+ (desc (match-string 3))
+ (start (match-beginning 0))
+ (end (match-end 0))
+ (lnk (jao-recoll--org-link ref desc mime))
+ (desc (if (string= mime "text/x-orgmode-sub")
+ (org-link-display-format
+ (concat (file-name-nondirectory ref) " :: " desc))
+ desc)))
+ (delete-region start end)
+ (insert "* " (org-make-link-string lnk desc) " (" mime ")")
+ (forward-line)
+ (jao-recoll--format-snippets lnk)))
+ (pop-to-buffer (current-buffer))
+ (goto-char (point-min))
+ (org-next-visible-heading 1)
+ (org-overview)
+ (jao-recoll-show-query))))
+
+(define-key recoll-mode-map [?n] 'org-next-link)
+(define-key recoll-mode-map [?p] 'org-previous-link)
+(define-key recoll-mode-map [?q] 'bury-buffer)
+(define-key recoll-mode-map [?r] 'jao-recoll-requery)
+(define-key recoll-mode-map [?g] 'jao-recoll-requery)
+(define-key recoll-mode-map [?w] 'jao-recoll-show-query)
+
+;;; .
+(provide 'jao-recoll)
+;;; jao-recoll.el ends here
--
cgit v1.2.3