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

Store loaded artists in persistent file store. 

Signed-off-by: Yahor Berdnikau <egorr.berd@gmail.com>
This commit is contained in:
Yahor Berdnikau 2018-03-12 21:19:46 +01:00
parent 423461c3ba
commit fa7b8b1c88
1 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -106,7 +106,6 @@ import java.io.InputStream;
import java.io.OutputStream; import java.io.OutputStream;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;
import java.util.Locale;
import java.util.concurrent.CountDownLatch; import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@ -121,6 +120,7 @@ public class RESTMusicService implements MusicService {
private static final String MUSIC_FOLDER_STORAGE_NAME = "music_folder"; private static final String MUSIC_FOLDER_STORAGE_NAME = "music_folder";
private static final String INDEXES_STORAGE_NAME = "indexes"; private static final String INDEXES_STORAGE_NAME = "indexes";
private static final String ARTISTS_STORAGE_NAME = "artists";
private final SubsonicAPIClient subsonicAPIClient; private final SubsonicAPIClient subsonicAPIClient;
private final PermanentFileStorage fileStorage; private final PermanentFileStorage fileStorage;
@ -198,36 +198,22 @@ public class RESTMusicService implements MusicService {
public Indexes getArtists(boolean refresh, public Indexes getArtists(boolean refresh,
Context context, Context context,
ProgressListener progressListener) throws Exception { ProgressListener progressListener) throws Exception {
Indexes cachedArtists = readCachedArtists(context); Indexes cachedArtists = fileStorage
if (cachedArtists != null && .load(ARTISTS_STORAGE_NAME, DomainSerializers.getIndexesSerializer());
!refresh) { if (cachedArtists != null && !refresh) {
return cachedArtists; return cachedArtists;
} }
updateProgressListener(progressListener, R.string.parser_reading); updateProgressListener(progressListener, R.string.parser_reading);
Response<GetArtistsResponse> response = subsonicAPIClient.getApi().getArtists(null).execute(); Response<GetArtistsResponse> response = subsonicAPIClient.getApi()
.getArtists(null).execute();
checkResponseSuccessful(response); checkResponseSuccessful(response);
Indexes indexes = APIIndexesConverter.toDomainEntity(response.body().getIndexes()); Indexes indexes = APIIndexesConverter.toDomainEntity(response.body().getIndexes());
writeCachedArtists(context, indexes); fileStorage.store(ARTISTS_STORAGE_NAME, indexes, DomainSerializers.getIndexesSerializer());
return indexes; return indexes;
} }
private static Indexes readCachedArtists(Context context) {
String filename = getCachedArtistsFilename(context);
return FileUtil.deserialize(context, filename);
}
private static void writeCachedArtists(Context context, Indexes artists) {
String filename = getCachedArtistsFilename(context);
FileUtil.serialize(context, artists, filename);
}
private static String getCachedArtistsFilename(Context context) {
String s = Util.getRestUrl(context, null);
return String.format(Locale.US, "indexes-%d.ser", Math.abs(s.hashCode()));
}
@Override @Override
public void star(String id, public void star(String id,
String albumId, String albumId,