Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature: Genre optimization #836

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
Open

Feature: Genre optimization #836

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
00171bd
optimize genres
sludgefeast Jan 2, 2017
002161c
Fix empty/unknown genre
sludgefeast Jan 3, 2017
49e01f2
Use CommandQueue instead of multiple submits for multiple genres
sludgefeast Jan 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion JMPDComm/src/main/java/com/anpmech/mpd/AbstractResponseObject.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ public boolean equals(final Object o) {
isEqual = Boolean.TRUE;
}

return isEqual.booleanValue();
return isEqual;
}

/**
Expand Down
126 changes: 90 additions & 36 deletions JMPDComm/src/main/java/com/anpmech/mpd/MPD.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,10 +70,12 @@
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.ListIterator;
import java.util.Map;
import java.util.Set;

/**
* This is a class containing instantiations of commonly used objects and uses for convenience of
Expand Down Expand Up @@ -338,18 +340,29 @@ public void add(final FilesystemTreeEntry music) throws IOException, MPDExceptio

public void add(final Genre genre, final boolean replace, final boolean play)
throws IOException, MPDException {
add(Collections.singleton(genre), replace, play);
}

public void add(final Set<Genre> genres, final boolean replace, final boolean play)
throws IOException, MPDException {
final CommandQueue commandQueue;

if (isCommandAvailable(MPDCommand.MPD_CMD_FIND_ADD)) {
commandQueue = new CommandQueue();

commandQueue
.add(MPDCommand.MPD_CMD_FIND_ADD, Music.TAG_GENRE, genre.getName());
for (final Genre genre : genres) {
commandQueue
.add(MPDCommand.MPD_CMD_FIND_ADD, Music.TAG_GENRE, genre.getName());
}
} else {
final List<Music> music = new ArrayList<>(find(Music.TAG_GENRE, genre.getName()));
Collections.sort(music);
final Set<Music> music = new HashSet<>();
for (final Genre genre : genres) {
music.addAll(find(Music.TAG_GENRE, genre.getName()));
}
final List<Music> musicList = new ArrayList<>(music);
Collections.sort(musicList);

commandQueue = MPDPlaylist.addAllCommand(music);
commandQueue = MPDPlaylist.addAllCommand(musicList);
}

add(commandQueue, replace, play);
Expand Down Expand Up @@ -405,15 +418,14 @@ private void add(final CommandQueue commandQueue, final boolean replace,
/** Finally, clean up the last playing song. */
if (replace && isPlaying && !isConsume) {
commandQueue.add(MPDPlaylist.MPD_CMD_PLAYLIST_REMOVE, "0");

}

/**
* It's rare, but possible to make it through the add()
* methods without adding to the command queue.
*/
if (!commandQueue.isEmpty()) {
mConnection.send(commandQueue);
mConnection.submit(commandQueue);
}
}

Expand Down Expand Up @@ -549,7 +561,7 @@ public void addToPlaylist(final PlaylistFile playlist, final Album album)
if (mIdleConnection.isCommandAvailable(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST)) {
final String[] artistPair = getAlbumArtistPair(album);

mConnection.send(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
mConnection.submit(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
Music.TAG_ALBUM, album.getName(), artistPair[0], artistPair[1]);
} else {
final List<Music> songs = getSongs(album);
Expand All @@ -564,7 +576,7 @@ public void addToPlaylist(final PlaylistFile playlist, final Album album)
public void addToPlaylist(final PlaylistFile playlist, final Artist artist)
throws IOException, MPDException {
if (mIdleConnection.isCommandAvailable(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST)) {
mConnection.send(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
mConnection.submit(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
Music.TAG_ARTIST, artist.getName());
} else {
final List<Music> songs = getSongs(artist);
Expand All @@ -586,27 +598,40 @@ public void addToPlaylist(final PlaylistFile playlist, final Collection<Music> m
.add(MPDCommand.MPD_CMD_PLAYLIST_ADD, playlist.getFullPath(),
music.getFullPath());
}
mConnection.send(commandQueue);
mConnection.submit(commandQueue);
}
}

@SuppressWarnings("TypeMayBeWeakened")
public void addToPlaylist(final PlaylistFile playlist, final FilesystemTreeEntry entry)
throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_PLAYLIST_ADD, playlist.getFullPath(),
mConnection.submit(MPDCommand.MPD_CMD_PLAYLIST_ADD, playlist.getFullPath(),
entry.getFullPath());
}

public void addToPlaylist(final PlaylistFile playlist, final Genre genre)
throws IOException, MPDException {
addToPlaylist(playlist, Collections.singleton(genre));
}

public void addToPlaylist(final PlaylistFile playlist, final Set<Genre> genres)
throws IOException, MPDException {
if (mIdleConnection.isCommandAvailable(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST)) {
mConnection.send(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
Music.TAG_GENRE, genre.getName());
final CommandQueue commandQueue = new CommandQueue();
for (final Genre genre : genres) {
commandQueue.add(MPDCommand.MPD_CMD_SEARCH_ADD_PLAYLIST, playlist.getFullPath(),
Music.TAG_GENRE, genre.getName());
}
mConnection.submit(commandQueue);
} else {
final List<Music> music = new ArrayList<>(find(Music.TAG_GENRE, genre.getName()));
Collections.sort(music);
final Set<Music> music = new HashSet<>();
for (final Genre genre : genres) {
music.addAll(find(Music.TAG_GENRE, genre.getName()));
}
final List<Music> musicList = new ArrayList<>(music);
Collections.sort(musicList);

addToPlaylist(playlist, music);
addToPlaylist(playlist, musicList);
}
}

Expand All @@ -622,7 +647,7 @@ public void addToPlaylist(final PlaylistFile playlist, final Music music)
* @throws MPDException Thrown if an error occurs as a result of command execution.
*/
public void clearError() throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_CLEARERROR);
mConnection.submit(MPDCommand.MPD_CMD_CLEARERROR);
}

/**
Expand Down Expand Up @@ -687,7 +712,7 @@ public final void connect(final String server) {
}

public void disableOutput(final int id) throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_OUTPUTDISABLE, Integer.toString(id));
mConnection.submit(MPDCommand.MPD_CMD_OUTPUTDISABLE, Integer.toString(id));
}

/**
Expand Down Expand Up @@ -800,10 +825,22 @@ public AlbumArtistResponse getAlbumArtists(final Genre genre) throws IOException
final CommandResult result = mConnection.submit(
MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ALBUM_ARTIST,
Music.TAG_GENRE, genre.getName()).get();

return new AlbumArtistResponse(result);
}

public List<Artist> getAlbumArtists(final Set<Genre> genres) throws IOException, MPDException {
final CommandQueue commands = new CommandQueue();
for (final Genre genre : genres) {
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ALBUM_ARTIST,
Music.TAG_GENRE, genre.getName());
}
final CommandResult result = mConnection.submit(commands).get();

final List<Artist> artists = new ArrayList<>(new AlbumArtistResponse(result));
Item.merge(artists, Collections.<Artist>emptyList());
return artists;
}

public int getAlbumCount(final Artist artist, final boolean useAlbumArtistTag)
throws IOException, MPDException {
return listAlbums(artist, useAlbumArtistTag).size();
Expand Down Expand Up @@ -900,10 +937,22 @@ public ArtistResponse getArtists() throws IOException, MPDException {
public ArtistResponse getArtists(final Genre genre) throws IOException, MPDException {
final CommandResult result = mConnection.submit(MPDCommand.MPD_CMD_LIST_TAG,
Music.TAG_ARTIST, Music.TAG_GENRE, genre.getName()).get();

return new ArtistResponse(result);
}

public List<Artist> getArtists(final Set<Genre> genres) throws IOException, MPDException {
final CommandQueue commands = new CommandQueue();
for (final Genre genre : genres) {
commands.add(MPDCommand.MPD_CMD_LIST_TAG,
Music.TAG_ARTIST, Music.TAG_GENRE, genre.getName());
}
final CommandResult result = mConnection.submit(commands).get();

final List<Artist> artists = new ArrayList<>(new ArtistResponse(result));
Item.merge(artists, Collections.<Artist>emptyList());
return artists;
}

public List<Artist> getArtistsMerged() throws IOException, MPDException {
final CommandQueue commands = new CommandQueue(2);
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ARTIST);
Expand All @@ -913,11 +962,17 @@ public List<Artist> getArtistsMerged() throws IOException, MPDException {
}

public List<Artist> getArtistsMerged(final Genre genre) throws IOException, MPDException {
final CommandQueue commands = new CommandQueue(2);
final String genreName = genre.getName();
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ARTIST, Music.TAG_GENRE, genreName);
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ALBUM_ARTIST, Music.TAG_GENRE,
genreName);
return getArtistsMerged(Collections.singleton(genre));
}

public List<Artist> getArtistsMerged(final Set<Genre> genres) throws IOException, MPDException {
final CommandQueue commands = new CommandQueue();
for (final Genre genre : genres) {
final String genreName = genre.getName();
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ARTIST, Music.TAG_GENRE, genreName);
commands.add(MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ALBUM_ARTIST, Music.TAG_GENRE,
genreName);
}

return getMergedArtists(mConnection, commands);
}
Expand Down Expand Up @@ -1171,7 +1226,6 @@ public Sticker getStickerManager() {
*/
public boolean isAlbumInGenre(final Album album, final Genre genre)
throws IOException, MPDException {
final List<String> response;
final Artist artist = album.getArtist();
String artistName = null;
String artistType = null;
Expand All @@ -1186,13 +1240,13 @@ public boolean isAlbumInGenre(final Album album, final Genre genre)
}
}

response = mConnection.send(MPDCommand.create(
final CommandResult result = mConnection.submit(MPDCommand.create(
MPDCommand.MPD_CMD_LIST_TAG, Music.TAG_ALBUM,
Music.TAG_ALBUM, album.getName(),
artistType, artistName,
Music.TAG_GENRE, genre.getName()));
Music.TAG_GENRE, genre.getName())).get();

return !response.isEmpty();
return !result.isEmpty();
}

/**
Expand Down Expand Up @@ -1382,7 +1436,7 @@ public MusicResponse listAllInfo() throws IOException, MPDException {
@SuppressWarnings("TypeMayBeWeakened")
public void movePlaylistSong(final PlaylistFile playlist, final int from, final int to)
throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_PLAYLIST_MOVE, playlist.getFullPath(),
mConnection.submit(MPDCommand.MPD_CMD_PLAYLIST_MOVE, playlist.getFullPath(),
Integer.toString(from), Integer.toString(to));
}

Expand All @@ -1404,7 +1458,7 @@ public void refresh(final RefreshableItem directory) throws IOException, MPDExce
* @throws MPDException Thrown if an error occurs as a result of command execution.
*/
public void refreshDatabase() throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_REFRESH);
mConnection.submit(MPDCommand.MPD_CMD_REFRESH);
}

/**
Expand All @@ -1415,7 +1469,7 @@ public void refreshDatabase() throws IOException, MPDException {
* @throws MPDException Thrown if an error occurs as a result of command execution.
*/
public void refreshDatabase(final String folder) throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_REFRESH, folder);
mConnection.submit(MPDCommand.MPD_CMD_REFRESH, folder);
}

/**
Expand All @@ -1437,7 +1491,7 @@ public void removeFromPlaylist(final PlaylistFile playlist, final List<Integer>
position.toString());
}

mConnection.send(commandQueue);
mConnection.submit(commandQueue);
}

@SuppressWarnings("TypeMayBeWeakened")
Expand All @@ -1448,15 +1502,15 @@ public void removeFromPlaylist(final PlaylistFile playlist, final int pos)

private void removeFromPlaylist(final String playlist, final int pos)
throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_PLAYLIST_DEL, playlist, Integer.toString(pos));
mConnection.submit(MPDCommand.MPD_CMD_PLAYLIST_DEL, playlist, Integer.toString(pos));
}

public void removeSavedStream(final int pos) throws IOException, MPDException {
removeFromPlaylist(Stream.PLAYLIST_NAME, pos);
}

public void saveStream(final String url, final String name) throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_PLAYLIST_ADD, Stream.PLAYLIST_NAME,
mConnection.submit(MPDCommand.MPD_CMD_PLAYLIST_ADD, Stream.PLAYLIST_NAME,
Stream.addStreamName(url, name));
}

Expand Down Expand Up @@ -1499,6 +1553,6 @@ public final void setDefaultPassword(final CharSequence password) {
* @throws MPDException Thrown if an error occurs as a result of command execution.
*/
public void shutdown() throws IOException, MPDException {
mConnection.send(MPDCommand.MPD_CMD_KILL);
mConnection.submit(MPDCommand.MPD_CMD_KILL);
}
}
Loading