[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/emms f9f2bab 30/80: Trim trailing whitespace from id3v2
From: |
Stefan Monnier |
Subject: |
[elpa] externals/emms f9f2bab 30/80: Trim trailing whitespace from id3v2 strings |
Date: |
Wed, 17 Mar 2021 18:42:24 -0400 (EDT) |
branch: externals/emms
commit f9f2bab6acc2b078f1b0031f2c626b8f3dfbdbd0
Author: Petteri Hintsanen <petterih@iki.fi>
Commit: Petteri Hintsanen <petterih@iki.fi>
Trim trailing whitespace from id3v2 strings
---
emms-info-native.el | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/emms-info-native.el b/emms-info-native.el
index bca21b1..4aaafed 100644
--- a/emms-info-native.el
+++ b/emms-info-native.el
@@ -728,15 +728,17 @@ 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. Return the text as
-string."
+Remove the terminating null byte, if any, and trim trailing
+whitespace.
+
+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)
- (if (equal (substring decoded -1) "\0")
- (substring decoded 0 -1)
- decoded))))
+ (string-trim-right (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."
- [elpa] externals/emms 17e5c6a 05/80: * doc/emms.texinfo: setup examples, (continued)
- [elpa] externals/emms 17e5c6a 05/80: * doc/emms.texinfo: setup examples, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 209077e 07/80: * doc/emms.texinfo: update manual, Stefan Monnier, 2021/03/17
- [elpa] externals/emms d0142e7 11/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms b8e1de7 17/80: Clean up Opus code, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 810dd41 18/80: Fix typos in Commentary, Stefan Monnier, 2021/03/17
- [elpa] externals/emms dbcc614 24/80: Fix id3v2 bugs, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 0f11ae1 22/80: Reorder functions and constants, Stefan Monnier, 2021/03/17
- [elpa] externals/emms e89bc15 26/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms fa8f64e 33/80: Fix whitespace trimming, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 5aea8e7 35/80: Fix id3v2 frame id to info-field mapping, Stefan Monnier, 2021/03/17
- [elpa] externals/emms f9f2bab 30/80: Trim trailing whitespace from id3v2 strings,
Stefan Monnier <=
- [elpa] externals/emms 60c9304 32/80: Trim trailing whitespace from all info-fields, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 6e5d477 21/80: Simplify FLAC code, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 757043b 41/80: Merge branch 'info-native', Stefan Monnier, 2021/03/17
- [elpa] externals/emms 7479d7d 19/80: Use lexical binding, Stefan Monnier, 2021/03/17
- [elpa] externals/emms a372976 20/80: Fix Opus channel mapping decoding, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 4a4a358 23/80: Remove emms-info-native return value, Stefan Monnier, 2021/03/17
- [elpa] externals/emms 0fe6100 28/80: Improve id3v2 error handling, Stefan Monnier, 2021/03/17
- [elpa] externals/emms cd437ca 40/80: Fix byte compilation, Stefan Monnier, 2021/03/17
- [elpa] externals/emms a57cc7e 43/80: * emms-bookmarks.el: lexical scoping declaration, Stefan Monnier, 2021/03/17
- [elpa] externals/emms fcdb111 25/80: Add mappings for more id3v2 text frames, Stefan Monnier, 2021/03/17