Funkwhale
/
ultrasonic-app-subsonic-android
mirror of https://github.com/ultrasonic/ultrasonic
1
0
Fork 0
Code Issues Releases Wiki Activity

Use new api call to get music directory. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2017-08-20 14:54:08 +02:00
parent 768616d14a
commit ab7f39e667
1 changed files with 18 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ultrasonic/src/main/java/org/moire/ultrasonic/service/RESTMusicService.java
View File

@ -58,6 +58,7 @@ import org.moire.ultrasonic.R;
import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient; import org.moire.ultrasonic.api.subsonic.SubsonicAPIClient;
import org.moire.ultrasonic.api.subsonic.response.GetArtistsResponse; import org.moire.ultrasonic.api.subsonic.response.GetArtistsResponse;
import org.moire.ultrasonic.api.subsonic.response.GetIndexesResponse; import org.moire.ultrasonic.api.subsonic.response.GetIndexesResponse;
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.SubsonicResponse; import org.moire.ultrasonic.api.subsonic.response.SubsonicResponse;
@ -350,19 +351,23 @@ public class RESTMusicService implements MusicService
checkResponseSuccessful(response); checkResponseSuccessful(response);
} }
@Override @Override
public MusicDirectory getMusicDirectory(String id, String name, boolean refresh, Context context, ProgressListener progressListener) throws Exception public MusicDirectory getMusicDirectory(String id,
{ String name,
Reader reader = getReader(context, progressListener, "getMusicDirectory", null, "id", id); boolean refresh,
try Context context,
{ ProgressListener progressListener) throws Exception {
return new MusicDirectoryParser(context).parse(name, reader, progressListener, false); if (id == null) {
} throw new IllegalArgumentException("Id should not be null!");
finally }
{
Util.close(reader); updateProgressListener(progressListener, R.string.parser_reading);
} Response<GetMusicDirectoryResponse> response = subsonicAPIClient.getApi()
} .getMusicDirectory(Long.valueOf(id)).execute();
checkResponseSuccessful(response);
return APIConverter.toDomainEntity(response.body().getMusicDirectory());
}
@Override @Override
public MusicDirectory getArtist(String id, String name, boolean refresh, Context context, ProgressListener progressListener) throws Exception public MusicDirectory getArtist(String id, String name, boolean refresh, Context context, ProgressListener progressListener) throws Exception