floss/empc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Rewrite `empc-response-get-status' to use a temporary variable to store the new status.

Browse source
This commit is contained in:
Renaud Casenave-Péré 2011-07-07 18:49:38 +09:00
parent e2806e442c
commit 1ad38c8e2d
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
empc.el
View file

@ -120,21 +120,22 @@ form '('error (error-code . error-message))."
(defun empc-response-get-status (data)
"Arrange data into a plist and store it into EMPC-CURRENT-STATUS."
(setq empc-current-status nil)
(dolist (cell data)
(let ((attr (intern (concat ":" (car cell)))))
(setq empc-current-status
(cond
((member attr '(:volume :repeat :random :single :consume :playlist
:playlistlength :song :songid :nextsong :nextsongid
:bitrate :xfade :mixrampdb :mixrampdelay :updating_db))
(plist-put empc-current-status attr (string-to-number (cdr cell))))
((and (eq attr :state) (member (cdr cell) '("play" "pause" "stop")))
(plist-put empc-current-status :state (intern (cdr cell))))
((and (eq attr :time) (string-match "^\\([0-9]*\\):\\([0-9]*\\)$" (cdr cell)))
(plist-put empc-current-status :time-elapsed (string-to-number (match-string 1 (cdr cell))))
(plist-put empc-current-status :time-total (string-to-number (match-string 2 (cdr cell)))))
(t (plist-put empc-current-status attr (cdr cell))))))))
(let ((new-status nil))
(dolist (cell data)
(let ((attr (intern (concat ":" (car cell)))))
(setq new-status
(cond
((member attr '(:volume :repeat :random :single :consume :playlist
:playlistlength :song :songid :nextsong :nextsongid
:bitrate :xfade :mixrampdb :mixrampdelay :updating_db))
(plist-put new-status attr (string-to-number (cdr cell))))
((and (eq attr :state) (member (cdr cell) '("play" "pause" "stop")))
(plist-put new-status :state (intern (cdr cell))))
((and (eq attr :time) (string-match "^\\([0-9]*\\):\\([0-9]*\\)$" (cdr cell)))
(plist-put new-status :time-elapsed (string-to-number (match-string 1 (cdr cell))))
(plist-put new-status :time-total (string-to-number (match-string 2 (cdr cell)))))
(t (plist-put new-status attr (cdr cell)))))))
(setq empc-current-status new-status)))
(defun empc-response-get-playlist (data)
"Arrange data into a list of plists representing the current playlist and store it into EMPC-CURRENT-PLAYLIST."