aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPetteri Hintsanen <petterih@iki.fi>2021-02-21 19:39:10 +0200
committerPetteri Hintsanen <petterih@iki.fi>2021-02-21 19:39:10 +0200
commit60c93048ee2acd557f4c102323b779b5092f6662 (patch)
tree66af3e8881b0741ff38eb0580921dcebc115e606
parentc8f198dd1e8f01ff754d250e8d20d02a196e3828 (diff)
Trim trailing whitespace from all info-fields
-rw-r--r--emms-info-native.el11
1 files changed, 5 insertions, 6 deletions
diff --git a/emms-info-native.el b/emms-info-native.el
index 76e6c0e..d0c9777 100644
--- a/emms-info-native.el
+++ b/emms-info-native.el
@@ -728,17 +728,16 @@ If there is no such identifier, return nil."
(defun emms-info-native--decode-id3v2-string (bytes)
"Decode id3v2 text information from BYTES.
-Remove the terminating null byte, if any, and trim trailing
-whitespace.
+Remove the terminating null byte, if any.
Return the text as string."
(let* ((encoding (emms-info-native--id3v2-text-encoding bytes))
(string (mapconcat #'byte-to-string (seq-rest bytes) ""))
(decoded (decode-coding-string string encoding)))
(when (> (length decoded) 0)
- (string-trim-right (if (equal (substring decoded -1) "\0")
- (substring decoded 0 -1)
- decoded)))))
+ (if (equal (substring decoded -1) "\0")
+ (substring decoded 0 -1)
+ decoded))))
(defun emms-info-native--id3v2-text-encoding (bytes)
"Return the encoding for text information BYTES."
@@ -754,7 +753,7 @@ Supports Ogg Vorbis/Opus, FLAC, and MP3 files."
(info-fields (emms-info-native--decode-info-fields filename)))
(dolist (field info-fields)
(let ((name (intern (concat "info-" (car field))))
- (value (cdr field)))
+ (value (string-trim-right (cdr field))))
(emms-track-set track
name
(if (eq name 'info-playing-time)