sij/khoj
1
0
Fork 0
mirror of https://github.com/khoj-ai/khoj.git synced 2024-11-30 19:03:01 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Rename get-enabled-search-types to get-enabled-content-types as more appropriate

Browse source
This commit is contained in:
Debanjum Singh Solanky 2022-08-07 18:53:14 +03:00
parent 127c6e78df
commit dddc57e132
1 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
src/interface/emacs/khoj.el
View file

@ -80,20 +80,20 @@
"The type of content to perform search on.") "The type of content to perform search on.")
(defun khoj--keybindings-info-message () (defun khoj--keybindings-info-message ()
(let ((enabled-search-types (khoj--get-enabled-search-types))) (let ((enabled-content-types (khoj--get-enabled-content-types)))
(concat (concat
" "
Set Search Type Set Search Type
-------------------------\n" -------------------------\n"
(when (member 'markdown enabled-search-types) (when (member 'markdown enabled-content-types)
"C-x m | markdown\n") "C-x m | markdown\n")
(when (member 'org enabled-search-types) (when (member 'org enabled-content-types)
"C-x o | org-mode\n") "C-x o | org-mode\n")
(when (member 'ledger enabled-search-types) (when (member 'ledger enabled-content-types)
"C-x l | ledger\n") "C-x l | ledger\n")
(when (member 'image enabled-search-types) (when (member 'image enabled-content-types)
"C-x i | images\n") "C-x i | images\n")
(when (member 'music enabled-search-types) (when (member 'music enabled-content-types)
"C-x M | music\n")))) "C-x M | music\n"))))
(defun khoj--search-markdown () (interactive) (setq khoj--search-type "markdown")) (defun khoj--search-markdown () (interactive) (setq khoj--search-type "markdown"))
@ -103,17 +103,17 @@
(defun khoj--search-music () (interactive) (setq khoj--search-type "music")) (defun khoj--search-music () (interactive) (setq khoj--search-type "music"))
(defun khoj--make-search-keymap (&optional existing-keymap) (defun khoj--make-search-keymap (&optional existing-keymap)
"Setup keymap to configure Khoj search" "Setup keymap to configure Khoj search"
(let ((enabled-search-types (khoj--get-enabled-search-types)) (let ((enabled-content-types (khoj--get-enabled-content-types))
(kmap (or existing-keymap (make-sparse-keymap)))) (kmap (or existing-keymap (make-sparse-keymap))))
(when (member 'markdown enabled-search-types) (when (member 'markdown enabled-content-types)
(define-key kmap (kbd "C-x m") #'khoj--search-markdown)) (define-key kmap (kbd "C-x m") #'khoj--search-markdown))
(when (member 'org enabled-search-types) (when (member 'org enabled-content-types)
(define-key kmap (kbd "C-x o") #'khoj--search-org)) (define-key kmap (kbd "C-x o") #'khoj--search-org))
(when (member 'ledger enabled-search-types) (when (member 'ledger enabled-content-types)
(define-key kmap (kbd "C-x l") #'khoj--search-ledger)) (define-key kmap (kbd "C-x l") #'khoj--search-ledger))
(when (member 'image enabled-search-types) (when (member 'image enabled-content-types)
(define-key kmap (kbd "C-x i") #'khoj--search-images)) (define-key kmap (kbd "C-x i") #'khoj--search-images))
(when (member 'music enabled-search-types) (when (member 'music enabled-content-types)
(define-key kmap (kbd "C-x M") #'khoj--search-music)) (define-key kmap (kbd "C-x M") #'khoj--search-music))
kmap)) kmap))
(defun khoj--display-keybinding-info () (defun khoj--display-keybinding-info ()
@ -196,16 +196,17 @@ Use `which-key` if available, else display simple message in echo area"
json-response))))) json-response)))))
(defun khoj--buffer-name-to-search-type (buffer-name) (defun khoj--buffer-name-to-search-type (buffer-name)
(let ((enabled-search-types (khoj--get-enabled-search-types)) (let ((enabled-content-types (khoj--get-enabled-content-types))
(file-extension (file-name-extension buffer-name))) (file-extension (file-name-extension buffer-name)))
(cond (cond
((and (member 'music enabled-search-types) (equal buffer-name "Music.org")) "music") ((and (member 'music enabled-content-types) (equal buffer-name "Music.org")) "music")
((and (member 'ledger enabled-search-types) (or (equal file-extension "bean") (equal file-extension "beancount"))) "ledger") ((and (member 'ledger enabled-content-types) (or (equal file-extension "bean") (equal file-extension "beancount"))) "ledger")
((and (member 'org enabled-search-types) (equal file-extension "org")) "org") ((and (member 'org enabled-content-types) (equal file-extension "org")) "org")
((and (member 'markdown enabled-search-types) (or (equal file-extension "markdown") (equal file-extension "md"))) "markdown") ((and (member 'markdown enabled-content-types) (or (equal file-extension "markdown") (equal file-extension "md"))) "markdown")
(t khoj-default-search-type)))) (t khoj-default-search-type))))
(defun khoj--get-enabled-search-types () (defun khoj--get-enabled-content-types ()
"Get content types enabled for search from API"
(let ((config-url (format "%s/config/data" khoj--server-url))) (let ((config-url (format "%s/config/data" khoj--server-url)))
(with-temp-buffer (with-temp-buffer
(erase-buffer) (erase-buffer)