sqrtminusone/lyrics-fetcher.el
1
0
Fork 0
mirror of https://github.com/SqrtMinusOne/lyrics-fetcher.el.git synced 2025-12-10 17:03:03 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: byte-compilation and checkdoc

Browse source
This commit is contained in:
Pavel Korytov 2022-02-07 14:51:09 +03:00
parent f49d4dc054
commit 27f12fc8c1
1 changed files with 34 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
lyrics-fetcher-neteasecloud.el
View file

@ -28,6 +28,8 @@
;; Fetch song lyrics from genius.com. ;; Fetch song lyrics from genius.com.
;;; Code: ;;; Code:
(require 'lyrics-fetcher)
(require 'emms)
(require 'request) (require 'request)
(require 'cl-lib) (require 'cl-lib)
(require 'json) (require 'json)
@ -71,7 +73,9 @@ information in the title."
edit)) edit))
(defun lyrics-fetcher-neteasecloud--fetch-lyrics (song-id callback &optional sync) (defun lyrics-fetcher-neteasecloud--fetch-lyrics (song-id callback &optional sync)
"Fetch lyrics from 'music.163.com' page at URL and call CALLBACK with the result. "Fetch lyrics from 'music.163.com' page at URL.
CALLBACK is called with the result.
SONG-ID is a sequence of number which indicates a song, it can be SONG-ID is a sequence of number which indicates a song, it can be
returned by 'lyrics-fetcher-neteasecloud--get-song-id' If SYNC is returned by 'lyrics-fetcher-neteasecloud--get-song-id' If SYNC is
@ -82,8 +86,8 @@ non-nil, the request will be performed synchronously."
:parser 'json-read :parser 'json-read
:sync sync :sync sync
:success (cl-function :success (cl-function
(lambda (&key data &allow-other-keys) (lambda (&key data &allow-other-keys)
(funcall callback (alist-get 'lyric (alist-get 'lrc data))))) (funcall callback (alist-get 'lyric (alist-get 'lrc data)))))
:error :error
(cl-function (cl-function
(lambda (&key error-thrown &allow-other-keys) (lambda (&key error-thrown &allow-other-keys)
@ -105,11 +109,11 @@ When EDIT is non-nil, edit the query in minibuffer before search."
(request "http://music.163.com/api/search/get/" (request "http://music.163.com/api/search/get/"
:type "POST" :type "POST"
:data `(("s" . ,(lyrics-fetcher-neteasecloud--maybe-edit-query :data `(("s" . ,(lyrics-fetcher-neteasecloud--maybe-edit-query
(lyrics-fetcher-neteasecloud--format-query track) (lyrics-fetcher-neteasecloud--format-query track)
edit)) edit))
("limit" . "10") ("limit" . "10")
("type" . "1") ("type" . "1")
("offset" . "0")) ("offset" . "0"))
:parser 'json-read :parser 'json-read
:sync sync :sync sync
:success (cl-function :success (cl-function
@ -137,9 +141,9 @@ contains `info-artist' or `info-title'"
(if (stringp track) (if (stringp track)
track track
(let ((query (concat (let ((query (concat
(cdr (assoc 'info-title track)) (cdr (assoc 'info-title track))
" " " "
(cdr (assoc 'info-artist track))))) (cdr (assoc 'info-artist track)))))
(when lyrics-fetcher-neteasecloud-strip-parens-from-query (when lyrics-fetcher-neteasecloud-strip-parens-from-query
(setq query (replace-regexp-in-string (setq query (replace-regexp-in-string
(rx (or (: "(" (* nonl) ")") (rx (or (: "(" (* nonl) ")")
@ -156,29 +160,29 @@ first song."
(error "ERROR: %s" (alist-get 'code data)) (error "ERROR: %s" (alist-get 'code data))
(let* ((results (alist-get 'songs (alist-get 'result data)))) (let* ((results (alist-get 'songs (alist-get 'result data))))
(if (seq-empty-p results) (if (seq-empty-p results)
(error "ERROR: no results!") (error "ERROR: no results!")
(cdr (cdr
(if ask (if ask
(let ((results-songs-for-select (let ((results-songs-for-select
(mapcar (mapcar
(lambda (entry) (lambda (entry)
(cons (lyrics-fetcher-neteasecloud--format-song-title entry) (cons (lyrics-fetcher-neteasecloud--format-song-title entry)
(assoc 'id entry))) (assoc 'id entry)))
results))) results)))
(cdr (cdr
(assoc (assoc
(completing-read (completing-read
"Pick a result: " "Pick a result: "
results-songs-for-select results-songs-for-select
nil t) nil t)
results-songs-for-select))) results-songs-for-select)))
(assoc 'id (aref results 0)))))))) (assoc 'id (aref results 0))))))))
(defun lyrics-fetcher-neteasecloud--format-song-title (entry) (defun lyrics-fetcher-neteasecloud--format-song-title (entry)
"Convert a 'music.163.com' search ENTRY to a string, which can be used in selection." "Convert a 'music.163.com' search ENTRY to a string, which can be used in selection."
(format "%s by %s" (format "%s by %s"
(cdr (assoc 'name entry)) (cdr (assoc 'name entry))
(cdr (assoc 'name (aref (alist-get 'artists entry) 0))))) (cdr (assoc 'name (aref (alist-get 'artists entry) 0)))))
(defun lyrics-fetcher-neteasecloud-format-file-name (track) (defun lyrics-fetcher-neteasecloud-format-file-name (track)
"TRACK should be either a string or EMMS alist. "TRACK should be either a string or EMMS alist.
@ -202,7 +206,7 @@ TRACK should be either a string or EMMS alist."
(if (stringp track) (if (stringp track)
track track
(format "%s %s" (format "%s %s"
(cdr (assoc 'info-title track)) (cdr (assoc 'info-title track))
(cdr (assoc 'info-artist track))))) (cdr (assoc 'info-artist track)))))
(provide 'lyrics-fetcher-neteasecloud) (provide 'lyrics-fetcher-neteasecloud)