Don’t call the accessor but access the encoding directly.

[sonitus.git] / src / main / java / net / pterodactylus / sonitus / data / Metadata.java

diff --git a/src/main/java/net/pterodactylus/sonitus/data/Metadata.java b/src/main/java/net/pterodactylus/sonitus/data/Metadata.java
index e99d378..01223af 100644 (file)
--- a/src/main/java/net/pterodactylus/sonitus/data/Metadata.java
+++ b/src/main/java/net/pterodactylus/sonitus/data/Metadata.java
@@ -160,7 +160,7 @@ public class Metadata {
         * @return New metadata with a changed artist
         */
        public Metadata artist(String artist) {
-               return new Metadata(channels, frequency, encoding, artist, this.artist.orNull());
+               return new Metadata(channels, frequency, encoding, (artist != null) ? artist.trim() : artist, name.orNull());
        }
 
        /**
@@ -181,7 +181,7 @@ public class Metadata {
         * @return New metadata with a changed name
         */
        public Metadata name(String name) {
-               return new Metadata(channels, frequency, encoding, name, this.name.orNull());
+               return new Metadata(channels, frequency, encoding, artist.orNull(), (name != null) ? name.trim() : name);
        }
 
        //
@@ -206,7 +206,7 @@ public class Metadata {
                        return false;
                }
                Metadata metadata = (Metadata) object;
-               if ((metadata.channels != channels) || (metadata.frequency != frequency) || !metadata.encoding.equalsIgnoreCase(encoding())) {
+               if ((metadata.channels != channels) || (metadata.frequency != frequency) || !metadata.encoding.equalsIgnoreCase(encoding)) {
                        return false;
                }
                if (artist.equals(metadata.artist)) {