From db73978596fac256a711ad0f4465b71e40d1fd68 Mon Sep 17 00:00:00 2001 From: Yahor Berdnikau Date: Tue, 7 Nov 2017 22:03:52 +0100 Subject: [PATCH] Use new subsonic api jukebox control method. Signed-off-by: Yahor Berdnikau --- .../ultrasonic/service/RESTMusicService.java | 130 ++++++++++-------- .../service/parser/JukeboxStatusParser.java | 71 ---------- 2 files changed, 69 insertions(+), 132 deletions(-) delete mode 100644 ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java index 7de681be..7133a0ce 100644 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java +++ b/ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java @@ -56,6 +56,7 @@ import org.apache.http.protocol.HttpContext; import org.moire.ultrasonic.R; import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient; import org.moire.ultrasonic.api.subsonic.models.AlbumListType; +import org.moire.ultrasonic.api.subsonic.models.JukeboxAction; import org.moire.ultrasonic.api.subsonic.models.MusicDirectoryChild; import org.moire.ultrasonic.api.subsonic.response.GetAlbumList2Response; import org.moire.ultrasonic.api.subsonic.response.GetAlbumListResponse; @@ -71,6 +72,7 @@ import org.moire.ultrasonic.api.subsonic.response.GetPodcastsResponse; import org.moire.ultrasonic.api.subsonic.response.GetRandomSongsResponse; import org.moire.ultrasonic.api.subsonic.response.GetStarredResponse; import org.moire.ultrasonic.api.subsonic.response.GetStarredTwoResponse; +import org.moire.ultrasonic.api.subsonic.response.JukeboxResponse; import org.moire.ultrasonic.api.subsonic.response.LicenseResponse; import org.moire.ultrasonic.api.subsonic.response.MusicFoldersResponse; import org.moire.ultrasonic.api.subsonic.response.SearchResponse; @@ -81,6 +83,7 @@ import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse; import org.moire.ultrasonic.data.APIAlbumConverter; import org.moire.ultrasonic.data.APIArtistConverter; import org.moire.ultrasonic.data.APIIndexesConverter; +import org.moire.ultrasonic.data.APIJukeboxConverter; import org.moire.ultrasonic.data.APILyricsConverter; import org.moire.ultrasonic.data.APIMusicDirectoryConverter; import org.moire.ultrasonic.data.APIMusicFolderConverter; @@ -106,7 +109,6 @@ import org.moire.ultrasonic.service.parser.BookmarkParser; import org.moire.ultrasonic.service.parser.ChatMessageParser; import org.moire.ultrasonic.service.parser.ErrorParser; import org.moire.ultrasonic.service.parser.GenreParser; -import org.moire.ultrasonic.service.parser.JukeboxStatusParser; import org.moire.ultrasonic.service.parser.MusicDirectoryParser; import org.moire.ultrasonic.service.parser.RandomSongsParser; import org.moire.ultrasonic.service.parser.ShareParser; @@ -141,8 +143,6 @@ import java.util.concurrent.atomic.AtomicReference; import kotlin.Pair; import retrofit2.Response; -import static java.util.Arrays.asList; - /** * @author Sindre Mehus */ @@ -872,58 +872,80 @@ public class RESTMusicService implements MusicService return url; } - @Override - public JukeboxStatus updateJukeboxPlaylist(List ids, Context context, ProgressListener progressListener) throws Exception - { - int n = ids.size(); - List parameterNames = new ArrayList(n + 1); - parameterNames.add("action"); + @Override + public JukeboxStatus updateJukeboxPlaylist(List ids, + Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.SET, null, null, ids, null) + .execute(); + checkResponseSuccessful(response); - for (String ignored : ids) - { - parameterNames.add("id"); - } + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } - List parameterValues = new ArrayList(); - parameterValues.add("set"); - parameterValues.addAll(ids); + @Override + public JukeboxStatus skipJukebox(int index, + int offsetSeconds, + Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.SKIP, index, offsetSeconds, null, null) + .execute(); + checkResponseSuccessful(response); - return executeJukeboxCommand(context, progressListener, parameterNames, parameterValues); - } + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } - @Override - public JukeboxStatus skipJukebox(int index, int offsetSeconds, Context context, ProgressListener progressListener) throws Exception - { - List parameterNames = asList("action", "index", "offset"); - List parameterValues = Arrays.asList("skip", index, offsetSeconds); - return executeJukeboxCommand(context, progressListener, parameterNames, parameterValues); - } + @Override + public JukeboxStatus stopJukebox(Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.STOP, null, null, null, null) + .execute(); + checkResponseSuccessful(response); - @Override - public JukeboxStatus stopJukebox(Context context, ProgressListener progressListener) throws Exception - { - return executeJukeboxCommand(context, progressListener, Collections.singletonList("action"), Arrays.asList("stop")); - } + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } - @Override - public JukeboxStatus startJukebox(Context context, ProgressListener progressListener) throws Exception - { - return executeJukeboxCommand(context, progressListener, Collections.singletonList("action"), Arrays.asList("start")); - } + @Override + public JukeboxStatus startJukebox(Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.START, null, null, null, null) + .execute(); + checkResponseSuccessful(response); - @Override - public JukeboxStatus getJukeboxStatus(Context context, ProgressListener progressListener) throws Exception - { - return executeJukeboxCommand(context, progressListener, Collections.singletonList("action"), Arrays.asList("status")); - } + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } - @Override - public JukeboxStatus setJukeboxGain(float gain, Context context, ProgressListener progressListener) throws Exception - { - List parameterNames = asList("action", "gain"); - List parameterValues = Arrays.asList("setGain", gain); - return executeJukeboxCommand(context, progressListener, parameterNames, parameterValues); - } + @Override + public JukeboxStatus getJukeboxStatus(Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.STATUS, null, null, null, null) + .execute(); + checkResponseSuccessful(response); + + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } + + @Override + public JukeboxStatus setJukeboxGain(float gain, Context context, + ProgressListener progressListener) throws Exception { + updateProgressListener(progressListener, R.string.parser_reading); + Response response = subsonicAPIClient.getApi() + .jukeboxControl(JukeboxAction.SET_GAIN, null, null, null, gain) + .execute(); + checkResponseSuccessful(response); + + return APIJukeboxConverter.toDomainEntity(response.body().getJukebox()); + } @Override public List getShares(boolean refresh, Context context, ProgressListener progressListener) throws Exception @@ -940,20 +962,6 @@ public class RESTMusicService implements MusicService } } - private JukeboxStatus executeJukeboxCommand(Context context, ProgressListener progressListener, List parameterNames, List parameterValues) throws Exception - { - checkServerVersion(context, "1.7", "Jukebox not supported."); - Reader reader = getReader(context, progressListener, "jukeboxControl", null, parameterNames, parameterValues); - try - { - return new JukeboxStatusParser(context).parse(reader); - } - finally - { - Util.close(reader); - } - } - private Reader getReader(Context context, ProgressListener progressListener, String method, HttpParams requestParams) throws Exception { return getReader(context, progressListener, method, requestParams, Collections.emptyList(), Collections.emptyList()); diff --git a/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java b/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java deleted file mode 100644 index a875e073..00000000 --- a/ultrasonic/src/main/java/org/moire/ultrasonic/service/parser/JukeboxStatusParser.java +++ /dev/null @@ -1,71 +0,0 @@ -/* - This file is part of Subsonic. - - Subsonic is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Subsonic is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Subsonic. If not, see . - - Copyright 2009 (C) Sindre Mehus - */ -package org.moire.ultrasonic.service.parser; - -import android.content.Context; - -import org.moire.ultrasonic.domain.JukeboxStatus; - -import org.xmlpull.v1.XmlPullParser; - -import java.io.Reader; - -/** - * @author Sindre Mehus - */ -public class JukeboxStatusParser extends AbstractParser -{ - - public JukeboxStatusParser(Context context) - { - super(context); - } - - public JukeboxStatus parse(Reader reader) throws Exception - { - - init(reader); - - JukeboxStatus jukeboxStatus = new JukeboxStatus(); - int eventType; - do - { - eventType = nextParseEvent(); - if (eventType == XmlPullParser.START_TAG) - { - String name = getElementName(); - if ("jukeboxPlaylist".equals(name) || "jukeboxStatus".equals(name)) - { - jukeboxStatus.setPositionSeconds(getInteger("position")); - jukeboxStatus.setCurrentIndex(getInteger("currentIndex")); - jukeboxStatus.setPlaying(getBoolean("playing")); - jukeboxStatus.setGain(getFloat("gain")); - } - else if ("error".equals(name)) - { - handleError(); - } - } - } while (eventType != XmlPullParser.END_DOCUMENT); - - validate(); - - return jukeboxStatus; - } -} \ No newline at end of file