Makes some modifications to console output.

This should hopefully make things easier to parse for the end user.
This commit is contained in:
Markil3
2021-10-31 16:00:14 -06:00
parent 66d803e301
commit 8022104373
6 changed files with 90 additions and 56 deletions

View File

@@ -74,9 +74,27 @@ public class Album implements Comparable<Album>, Serializable
@Override
public String toString()
{
return "Album{" +
"name='" + name + '\'' +
", artists=" + Arrays.toString(artists) +
'}';
StringBuilder builder = new StringBuilder();
builder.append('"');
builder.append(this.name);
builder.append('"');
if (this.artists != null && this.artists.length > 0)
{
builder.append(" by ");
builder.append(this.artists[0]);
if (this.artists.length > 1)
{
for (int i = 1; i < this.artists.length; i++)
{
builder.append(", ");
builder.append(this.artists[i]);
}
}
}
return builder.toString();
// return "Album{" +
// "name='" + name + '\'' +
// ", artists=" + Arrays.toString(artists) +
// '}';
}
}

View File

@@ -73,15 +73,4 @@ public class InternetSong extends Song
}
return compare;
}
@Override
public String toString()
{
return "Song{" +
"title='" + title + '\'' +
", artists=" + Arrays.toString(artists) +
", album=" + album +
", url=" + location +
'}';
}
}

View File

@@ -68,15 +68,4 @@ public class LocalSong extends Song
}
return compare;
}
@Override
public String toString()
{
return "Song{" +
"title='" + title + '\'' +
", artists=" + Arrays.toString(artists) +
", album=" + album +
", url=" + file.getAbsolutePath() +
'}';
}
}

View File

@@ -99,10 +99,33 @@ public class Song implements Comparable<Song>, Serializable
@Override
public String toString()
{
return "Song{" +
"title='" + title + '\'' +
", artists=" + Arrays.toString(artists) +
", album=" + album +
'}';
StringBuilder builder = new StringBuilder();
builder.append('"');
builder.append(this.title);
builder.append('"');
if (this.artists != null && this.artists.length > 0)
{
builder.append(" by ");
builder.append(this.artists[0]);
if (this.artists.length > 1)
{
for (int i = 1; i < this.artists.length; i++)
{
builder.append(", ");
builder.append(this.artists[i]);
}
}
}
if (this.album != null)
{
builder.append(" in ");
builder.append(this.album.name);
}
return builder.toString();
// return "Song{" +
// "title='" + title + '\'' +
// ", artists=" + Arrays.toString(artists) +
// ", album=" + album +
// '}';
}
}