emacs: Some refactoring

[nimcoon.git] / nimcoon.el

diff --git a/nimcoon.el b/nimcoon.el
index 5146a9198ddaa42bbafc01c3e91ef043afeda68b..c238fc144a1345d69c02e87db31796ce7e16d49f 100644 (file)
--- a/nimcoon.el
+++ b/nimcoon.el
@@ -42,21 +42,22 @@
   (interactive)
   (shell-command "kill `pgrep nimcoon` `pgrep mpv` `pgrep vlc`"))
 
-(defun nimcoon-search-video(query)
-  "Search for a video by QUERY."
-  (interactive "sSearch query: ")
+(defun nimcoon-search(args query)
+  "Search by QUERY with the given ARGS."
   (with-output-to-temp-buffer "*NimCoon search results*"
-    (call-process "nimcoon" nil "*NimCoon search results*" t "--non-interactive" query)
+    (call-process "nimcoon" nil "*NimCoon search results*" t args query)
     (with-current-buffer "*NimCoon search results*"
       (org-mode))))
 
+(defun nimcoon-search-video(query)
+  "Search for a video by QUERY."
+  (interactive "sSearch query: ")
+  (nimcoon-search "-n" query))
+
 (defun nimcoon-search-music(query)
   "Search for a video by QUERY."
   (interactive "sSearch query: ")
-  (with-output-to-temp-buffer "*NimCoon search results*"
-    (call-process "nimcoon" nil "*NimCoon search results*" t "--music" "--non-interactive" query)
-    (with-current-buffer "*NimCoon search results*"
-      (org-mode))))
+  (nimcoon-search "-nm" query))
 
 ;;; Keybindings
 (map! :leader
@@ -68,6 +69,6 @@
        (:prefix ("s" . "Search")
         :desc "Video" "v" #'nimcoon-search-video
         :desc "Music" "m" #'nimcoon-search-music)
-       :desc "Kill"  "k" #'nimcoon-kill-process
+       :desc "Kill"  "k" #'nimcoon-kill-background-processes
        :desc "Video" "v" #'nimcoon-feeling-lucky-video
        :desc "Music" "m" #'nimcoon-feeling-lucky-music))