From c95b4e7f86d2d4d96564c4c196b7dc956698f410 Mon Sep 17 00:00:00 2001 From: gdlbo <41114720+gdlbo@users.noreply.github.com> Date: Tue, 2 May 2023 00:47:15 +0300 Subject: [PATCH] added new cache insert track method --- app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java | 6 +++++- .../ru/vtosters/lite/music/downloader/TrackDownloader.java | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java index cbd10af88..c3130cf5d 100644 --- a/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/music/M3UDownloader.java @@ -6,6 +6,7 @@ import java8.util.concurrent.CompletableFuture; import okhttp3.OkHttpClient; import okhttp3.Request; import ru.vtosters.lite.di.singleton.VtOkHttpClient; +import ru.vtosters.lite.music.cache.CacheDatabaseDelegate; import ru.vtosters.lite.music.converter.ts.FFMpeg; import ru.vtosters.lite.music.converter.ts.TSMerger; import ru.vtosters.lite.music.downloader.ThumbnailDownloader; @@ -117,7 +118,10 @@ public class M3UDownloader implements ITrackDownloader { callback.onProgress(10 + Math.round(80.0f * progress.addAndGet(1) / parser.mTransportStreams.size())); else callback.onFailure(); return convertResult; - }).thenRun(() -> IOUtils.deleteRecursive(tsesDir)).thenRun(callback::onSuccess); + }).thenRun(() -> IOUtils.deleteRecursive(tsesDir)).thenRun(() -> { + callback.onSuccess(); + if (cache) CacheDatabaseDelegate.insertTrack(track); + }); } // Initialization-on-demand diff --git a/app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java b/app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java index fc5c3bc2c..8fd9ae0d4 100644 --- a/app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java +++ b/app/src/main/java/ru/vtosters/lite/music/downloader/TrackDownloader.java @@ -35,7 +35,6 @@ public class TrackDownloader { var path = FileCacheImplementation.getTrackFolder(LibVKXClient.asId(track)).getAbsolutePath(); download(track, path, callback, M3UDownloader.getInstance(), true); - CacheDatabaseDelegate.insertTrack(track); } private static void download(MusicTrack track, String path, Callback callback, ITrackDownloader downloader, boolean cache) {