Use new subsonic api search2 call in RestMusicService.
Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
parent
e730347985
commit
6649ba806b
|
@ -64,6 +64,7 @@ import org.moire.ultrasonic.api.subsonic.response.GetMusicDirectoryResponse;
|
||||||
import org.moire.ultrasonic.api.subsonic.response.LicenseResponse;
|
import org.moire.ultrasonic.api.subsonic.response.LicenseResponse;
|
||||||
import org.moire.ultrasonic.api.subsonic.response.MusicFoldersResponse;
|
import org.moire.ultrasonic.api.subsonic.response.MusicFoldersResponse;
|
||||||
import org.moire.ultrasonic.api.subsonic.response.SearchResponse;
|
import org.moire.ultrasonic.api.subsonic.response.SearchResponse;
|
||||||
|
import org.moire.ultrasonic.api.subsonic.response.SearchTwoResponse;
|
||||||
import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse;
|
import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse;
|
||||||
import org.moire.ultrasonic.data.APIConverter;
|
import org.moire.ultrasonic.data.APIConverter;
|
||||||
import org.moire.ultrasonic.domain.Bookmark;
|
import org.moire.ultrasonic.domain.Bookmark;
|
||||||
|
@ -437,24 +438,23 @@ public class RESTMusicService implements MusicService
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Search using the "search2" REST method, available in 1.4.0 and later.
|
* Search using the "search2" REST method, available in 1.4.0 and later.
|
||||||
*/
|
*/
|
||||||
private SearchResult search2(SearchCriteria criteria, Context context, ProgressListener progressListener) throws Exception
|
private SearchResult search2(SearchCriteria criteria,
|
||||||
{
|
Context context,
|
||||||
checkServerVersion(context, "1.4", "Search2 not supported.");
|
ProgressListener progressListener) throws Exception {
|
||||||
|
if (criteria.getQuery() == null) {
|
||||||
|
throw new IllegalArgumentException("Query param is null");
|
||||||
|
}
|
||||||
|
|
||||||
List<String> parameterNames = asList("query", "artistCount", "albumCount", "songCount");
|
updateProgressListener(progressListener, R.string.parser_reading);
|
||||||
List<Object> parameterValues = Arrays.<Object>asList(criteria.getQuery(), criteria.getArtistCount(), criteria.getAlbumCount(), criteria.getSongCount());
|
Response<SearchTwoResponse> response = subsonicAPIClient.getApi().search2(criteria.getQuery(),
|
||||||
Reader reader = getReader(context, progressListener, "search2", null, parameterNames, parameterValues);
|
criteria.getArtistCount(), null, criteria.getAlbumCount(), null,
|
||||||
try
|
criteria.getSongCount(), null).execute();
|
||||||
{
|
checkResponseSuccessful(response);
|
||||||
return new SearchResult2Parser(context).parse(reader, progressListener, false);
|
|
||||||
}
|
return APIConverter.toDomainEntity(response.body().getSearchResult());
|
||||||
finally
|
}
|
||||||
{
|
|
||||||
Util.close(reader);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private SearchResult search3(SearchCriteria criteria, Context context, ProgressListener progressListener) throws Exception
|
private SearchResult search3(SearchCriteria criteria, Context context, ProgressListener progressListener) throws Exception
|
||||||
{
|
{
|
||||||
|
|
Loading…
Reference in New Issue