From 2265f89bad65592dc8af2b3b431b2cbc9a7fba8c Mon Sep 17 00:00:00 2001 From: Daniel Borchmann Date: Sat, 26 Aug 2017 11:38:20 +0200 Subject: [PATCH] [EMMS] Simplify description of current track --- site-lisp/db-emms.el | 41 ++++++++++++++++++----------------------- 1 file changed, 18 insertions(+), 23 deletions(-) diff --git a/site-lisp/db-emms.el b/site-lisp/db-emms.el index a13e475..b8a5748 100644 --- a/site-lisp/db-emms.el +++ b/site-lisp/db-emms.el @@ -123,29 +123,24 @@ This function can be used as a value for `emms-track-description-function’." (performer (propertize (emms-track-get track 'info-performer "") 'face 'emms-browser-performer-face)) (title (propertize (emms-track-get track 'info-title "") - 'face 'emms-browser-track-face)) - (note (emms-track-get track 'info-note ""))) - (let ((main-description (if (not (seq-empty-p title)) - (cond - ((and (not (seq-empty-p composer)) - (not (seq-empty-p performer))) - (if (string= composer performer) - (format "“%s” by %s" - title composer) - (format "“%s” by %s, performed by %s" - title - composer - performer))) - ((not (seq-empty-p artist)) - (format "“%s” by %s" title artist)) - (t - title)) - (string-remove-prefix (expand-file-name emms-source-file-default-directory) - (emms-track-simple-description track)))) - (note (if (seq-empty-p note) - "" - (concat " [" note "]")))) - (concat main-description note)))) + 'face 'emms-browser-track-face))) + (if (not (seq-empty-p title)) + (cond + ((and (not (seq-empty-p composer)) + (not (seq-empty-p performer))) + (if (string= composer performer) + (format "“%s” by %s" + title composer) + (format "“%s” by %s, performed by %s" + title + composer + performer))) + ((not (seq-empty-p artist)) + (format "“%s” by %s" title artist)) + (t + title)) + (string-remove-prefix (expand-file-name emms-source-file-default-directory) + (emms-track-simple-description track))))) (setq emms-track-description-function 'db/emms-track-description)