mirrors
/
ambevar-dotfiles
mirror of https://gitlab.com/ambrevar/dotfiles/
1
0
Fork 0
Code Issues Releases Wiki Activity

EMMS: Remove autoload / date-from-year fixes that were merged upstream

master
Pierre Neidhardt 2017-12-01 10:58:50 +01:00
parent 5dbfe1485e
commit a10c4a6f23
3 changed files with 112 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.emacs.d/init.el
View File

@ -112,10 +112,6 @@
;;; Emms
(nconc package-selected-packages '(emms helm-emms emms-player-mpv))
(when (fboundp 'emms-all)
;; TODO: Emms has no autoload to switch to the browser, let's add one.
;; Mail sent to emms-help.
(autoload 'emms-smart-browse "init-emms" nil t))
(with-eval-after-load 'emms (require 'init-emms))
;;; Evil

15
.emacs.d/lisp/init-emms.el
View File

@ -4,8 +4,7 @@
;;; TODO: Change face from purple to white?
;;; TODO: Delete entry from cache? See `emms-cache-del'.
(with-eval-after-load 'emms-browser
(load "patch-emms"))
(load "patch-emms-cover")
(setq emms-directory (concat emacs-cache-folder "emms"))
(emms-all)
@ -171,18 +170,10 @@ This function uses 'info-albumartistsort, 'info-albumartist,
(emms-track-get track 'info-originalyear)
(emms-track-get track 'info-date)
(emms-track-get track 'info-year "<unknown>"))))
(emms-extract-year-from-date date)))
(emms-format-date-to-year date)))
;; (emms-extract-year-from-date date)))
(t (emms-track-get track type "<unknown>"))))
(defun emms-extract-year-from-date (date)
"Try to extract year part from DATE.
Return DATE if the year cannot be extracted."
(let ((year (nth 5 (parse-time-string date))))
(if year (number-to-string year)
(if (string-match "^[ \t]*[0-9]\\{4\\}" date)
(substring date (match-beginning 0) (match-end 0))
date))))
(setq emms-browser-get-track-field-function #'emms-browser-get-track-custom)
(when (require 'helm-emms nil t)

187
.emacs.d/lisp/patch-emms.el
View File

@ -1,88 +1,119 @@
;;; REVIEW: Browser does not display year when it's only stored in 'info-date.
;;; See the mailing list.
(defun emms-browser-format-line (bdata &optional target)
"Return a propertized string to be inserted in the buffer."
(unless target
(setq target 'browser))
(let* ((name (or (emms-browser-bdata-name bdata) "misc"))
(level (emms-browser-bdata-level bdata))
(type (emms-browser-bdata-type bdata))
(indent (emms-browser-make-indent level))
(track (emms-browser-bdata-first-track bdata))
(path (emms-track-get track 'name))
(face (emms-browser-get-face bdata))
(format (emms-browser-get-format bdata target))
(props (list 'emms-browser-bdata bdata))
(format-choices
`(("i" . ,indent)
("n" . ,name)
;; PATCH
;; ("y" . ,(emms-track-get track 'info-year))
("y" . ,(or (emms-track-get track 'info-date) (emms-track-get track 'info-year)))
("A" . ,(emms-track-get track 'info-album))
("a" . ,(emms-track-get track 'info-artist))
("C" . ,(emms-track-get track 'info-composer))
("p" . ,(emms-track-get track 'info-performer))
("t" . ,(emms-track-get track 'info-title))
("D" . ,(emms-browser-disc-number track))
("T" . ,(emms-browser-track-number track))
("d" . ,(emms-browser-track-duration track))))
str)
(when (equal type 'info-album)
(setq format-choices (append format-choices
`(("cS" . ,(emms-browser-get-cover-str path 'small))
("cM" . ,(emms-browser-get-cover-str path 'medium))
("cL" . ,(emms-browser-get-cover-str path 'large))))))
;; ;;; REVIEW: Browser does not display year when it's only stored in 'info-date.
;; ;;; See the mailing list.
;; (defun emms-browser-format-line (bdata &optional target)
;; "Return a propertized string to be inserted in the buffer."
;; (unless target
;; (setq target 'browser))
;; (let* ((name (or (emms-browser-bdata-name bdata) "misc"))
;; (level (emms-browser-bdata-level bdata))
;; (type (emms-browser-bdata-type bdata))
;; (indent (emms-browser-make-indent level))
;; (track (emms-browser-bdata-first-track bdata))
;; (path (emms-track-get track 'name))
;; (face (emms-browser-get-face bdata))
;; (format (emms-browser-get-format bdata target))
;; (props (list 'emms-browser-bdata bdata))
;; (format-choices
;; `(("i" . ,indent)
;; ("n" . ,name)
;; ;; PATCH
;; ;; ("y" . ,(emms-track-get track 'info-year))
;; ("y" . ,(or (emms-track-get track 'info-date) (emms-track-get track 'info-year)))
;; ("A" . ,(emms-track-get track 'info-album))
;; ("a" . ,(emms-track-get track 'info-artist))
;; ("C" . ,(emms-track-get track 'info-composer))
;; ("p" . ,(emms-track-get track 'info-performer))
;; ("t" . ,(emms-track-get track 'info-title))
;; ("D" . ,(emms-browser-disc-number track))
;; ("T" . ,(emms-browser-track-number track))
;; ("d" . ,(emms-browser-track-duration track))))
;; str)
;; (when (equal type 'info-album)
;; (setq format-choices (append format-choices
;; `(("cS" . ,(emms-browser-get-cover-str path 'small))
;; ("cM" . ,(emms-browser-get-cover-str path 'medium))
;; ("cL" . ,(emms-browser-get-cover-str path 'large))))))
(when (functionp format)
;; (message "EMMS bdata %s" bdata)
;; (message "EMMS format-choices %s" format-choices)
(setq format (funcall format bdata format-choices)))
;; (when (functionp format)
;; ;; (message "EMMS bdata %s" bdata)
;; ;; (message "EMMS format-choices %s" format-choices)
;; (setq format (funcall format bdata format-choices)))
(setq str
(with-temp-buffer
(insert format)
(goto-char (point-min))
(let ((start (point-min)))
;; jump over any image
(when (re-search-forward "%c[SML]" nil t)
(setq start (point)))
;; jump over the indent
(when (re-search-forward "%i" nil t)
(setq start (point)))
(add-text-properties start (point-max)
(list 'face face)))
(buffer-string)))
;; (setq str
;; (with-temp-buffer
;; (insert format)
;; (goto-char (point-min))
;; (let ((start (point-min)))
;; ;; jump over any image
;; (when (re-search-forward "%c[SML]" nil t)
;; (setq start (point)))
;; ;; jump over the indent
;; (when (re-search-forward "%i" nil t)
;; (setq start (point)))
;; (add-text-properties start (point-max)
;; (list 'face face)))
;; (buffer-string)))
(setq str (emms-browser-format-spec str format-choices))
;; (setq str (emms-browser-format-spec str format-choices))
;; give tracks a 'boost' if they're not top-level
;; (covers take up an extra space)
(when (and (eq type 'info-title)
(not (string= indent "")))
(setq str (concat " " str)))
;; ;; give tracks a 'boost' if they're not top-level
;; ;; (covers take up an extra space)
;; (when (and (eq type 'info-title)
;; (not (string= indent "")))
;; (setq str (concat " " str)))
;; if we're in playlist mode, add a track
(when (and (eq target 'playlist)
(eq type 'info-title))
(setq props
(append props `(emms-track ,track))))
;; ;; if we're in playlist mode, add a track
;; (when (and (eq target 'playlist)
;; (eq type 'info-title))
;; (setq props
;; (append props `(emms-track ,track))))
;; add properties to the whole string
(add-text-properties 0 (length str) props str)
str))
;; ;; add properties to the whole string
;; (add-text-properties 0 (length str) props str)
;; str))
;;; REVIEW: Sort albums by year in browser.
;;; See the mailing list.
(defun emms-browser-year-number (track)
"Return a string representation of a track's year.
This will be in the form '(1998) '."
(let ((year (or (emms-track-get track 'info-date) (emms-track-get track 'info-year))))
(if (or (not (stringp year)) (string= year "0"))
""
(concat
"(" year ") "))))
;; ;;; REVIEW: Sort albums by year in browser.
;; ;;; See the mailing list.
;; (defun emms-browser-year-number (track)
;; "Return a string representation of a track's year.
;; This will be in the form '(1998) '."
;; (let ((year (or (emms-track-get track 'info-date) (emms-track-get track 'info-year))))
;; (if (or (not (stringp year)) (string= year "0"))
;; ""
;; (concat
;; "(" year ") "))))
(provide 'patch-emms)
;; ;; Then there is the separation between "release date" and "original date".
;; ;; This difference matters eg. for re-releases (anniversaries and such),
;; ;; where the release date is usually much more recent than the original
;; ;; release date. In such cases you probably want to show the original
;; ;; release date. The date accessing code ought to figure that, and also
;; ;; consider that there can be info-date, info-originaldate, info-year and
;; ;; info-originalyear.
;; (defun emms-track-get-year (track)
;; "Get year of TRACK for display.
;; There is the separation between the 'release date' and the
;; 'original date'. This difference matters e.g. for
;; re-releases (anniversaries and such) where the release date is
;; more recent than the original release date. In such cases the
;; user probably wants the original release date so this is what we
;; show."
;; (or
;; (emms-format-date-to-year (emms-track-get track 'info-date))
;; (emms-format-date-to-year (emms-track-get track 'info-originaldate))
;; (emms-track-get track 'info-year)
;; (emms-track-get track 'info-originalyear)))
;; (defun emms-format-date-to-year (date)
;; "Try to extract year part from DATE.
;; Return nil if the year cannot be extracted."
;; (let ((year (nth 5 (parse-time-string date))))
;; (if year (number-to-string year)
;; (let ((date " 1984-34-df"))
;; (when (string-match "^[ \t]*\\([0-9]\\{4\\}\\)" date)
;; (match-string 1 date))))))
;; (provide 'patch-emms)