markil3/UniversalMusicPlayer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Makes some modifications to console output.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files

26
browserCommands/src/main/java/edu/regis/universeplayer/data/Album.java
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) +
// '}';
}
}

11
browserCommands/src/main/java/edu/regis/universeplayer/data/InternetSong.java
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 +
'}';
}
}

11
browserCommands/src/main/java/edu/regis/universeplayer/data/LocalSong.java
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() +
'}';
}
}

33
browserCommands/src/main/java/edu/regis/universeplayer/data/Song.java
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 +
// '}';
}
}

42
interface/src/main/java/edu/regis/universeplayer/PlayerEnvironment.java
View File

@@ -267,7 +267,7 @@ public class PlayerEnvironment
.build();
OPTIONS.addOption(play);
Option pause = Option.builder().longOpt("pause")
.desc("Starts playback.")
.desc("Pauses playback.")
.build();
OPTIONS.addOption(pause);
Option toggle = Option.builder("t").longOpt("toggle")
@@ -326,7 +326,7 @@ public class PlayerEnvironment
{
try
{
out.println(cmd.toString());
// out.println(cmd.toString());
for (Option op : cmd.getOptions())
{
switch (op.getLongOpt())
@@ -476,18 +476,40 @@ public class PlayerEnvironment
.map(Map.Entry::getKey)
.collect(Collectors.toList());
Collections.reverse(songs);
out.println("Playing " + songs);
if (!cmd.hasOption("search"))
{
if (songs.size() > 0)
{
out.print("Playing ");
}
}
if (songs.size() > 0)
{
out.print(songs.get(0));
if (songs.size() > 1)
{
Song song;
ListIterator<Song> iter = songs.listIterator(1);
while (iter.hasNext())
{
song = iter.next();
if (!cmd.hasOption("search"))
{
out.print("; ");
}
else
{
out.println();
}
out.print(song.toString());
}
}
}
out.println();
if (!cmd.hasOption("search"))
{
Queue.getInstance().addAll(songs);
}
else
{
for (Song song : songs)
{
out.println(song);
}
}
}
}
catch (Throwable e)

23
interface/src/main/java/edu/regis/universeplayer/player/PlayerManager.java
View File

@@ -1,18 +1,5 @@
package edu.regis.universeplayer.player;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
import javax.swing.JOptionPane;
import edu.regis.universeplayer.AbstractTask;
import edu.regis.universeplayer.PlaybackListener;
import edu.regis.universeplayer.PlaybackStatus;
@@ -21,9 +8,15 @@ import edu.regis.universeplayer.browserCommands.QueryFuture;
import edu.regis.universeplayer.data.InternetSong;
import edu.regis.universeplayer.data.LocalSong;
import edu.regis.universeplayer.data.PlaybackEvent;
import edu.regis.universeplayer.data.Queue;
import edu.regis.universeplayer.data.Song;
import edu.regis.universeplayer.gui.Interface;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.concurrent.CancellationException;
import java.util.concurrent.ForkJoinTask;
import java.util.concurrent.TimeUnit;
/**
* The PlayerManager serves as the central access point for playing songs of any