remove/disable download options

app/state/cache.ts

@@ -5,7 +5,8 @@ import RNFS from 'react-native-fs'
 import { GetState, SetState } from 'zustand'
 import { Store } from './store'
 
-const imageDownloadQueue = new PromiseQueue(10)
+const imageDownloadQueue = new PromiseQueue(20)
+const songDownloadQueue = new PromiseQueue(1)
 
 export type CacheDownload = CacheFile & CacheRequest
 
@@ -13,7 +14,7 @@ export type CacheDirsByServer = Record<string, Record<CacheItemTypeKey, string>>
 export type CacheFilesByServer = Record<string, Record<CacheItemTypeKey, Record<string, CacheFile>>>
 export type CacheRequestsByServer = Record<string, Record<CacheItemTypeKey, Record<string, CacheRequest>>>
 
-// export type CacheItemsDb = Record<
+// export type DownloadedItemsByServer = Record<
 //   string,
 //   {
 //     songs: { [songId: string]: DownloadedSong }
@@ -26,22 +27,30 @@ export type CacheRequestsByServer = Record<string, Record<CacheItemTypeKey, Reco
 export type CacheSlice = {
   cacheItem: (key: CacheItemTypeKey, itemId: string, url: string | (() => string | Promise<string>)) => Promise<void>
 
-  // cache: CacheItemsDb
+  // cache: DownloadedItemsByServer
   cacheDirs: CacheDirsByServer
   cacheFiles: CacheFilesByServer
   cacheRequests: CacheRequestsByServer
 
-  getCoverArtPath: (coverArt: string) => Promise<string | undefined>
+  fetchCoverArtFilePath: (coverArt: string) => Promise<string | undefined>
 }
 
 export const selectCache = {
   cacheItem: (store: CacheSlice) => store.cacheItem,
-  getCoverArtPath: (store: CacheSlice) => store.getCoverArtPath,
+  fetchCoverArtFilePath: (store: CacheSlice) => store.fetchCoverArtFilePath,
+
+  songCacheDir: (store: Store) => {
+    const activeServerId = store.settings.activeServer
+    if (!activeServerId) {
+      return
+    }
+
+    return store.cacheDirs[activeServerId].song
+  },
 }
 
 export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): CacheSlice => ({
   // cache: {},
-
   cacheDirs: {},
   cacheFiles: {},
   cacheRequests: {},
@@ -58,12 +67,8 @@ export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): Ca
     }
 
     const inProgress = get().cacheRequests[activeServerId][key][itemId]
-    if (inProgress) {
-      if (inProgress.promise !== undefined) {
-        return await inProgress.promise
-      } else {
-        return
-      }
+    if (inProgress && inProgress.promise !== undefined) {
+      return await inProgress.promise
     }
 
     const existing = get().cacheFiles[activeServerId][key][itemId]
@@ -75,22 +80,41 @@ export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): Ca
     const urlResult = typeof url === 'string' ? url : url()
     const fromUrl = typeof urlResult === 'string' ? urlResult : await urlResult
 
-    const promise = imageDownloadQueue
-      .enqueue(
-        () =>
-          RNFS.downloadFile({
-            fromUrl,
-            toFile: path,
-          }).promise,
-      )
-      .then(() => {
-        set(
-          produce<CacheSlice>(state => {
-            state.cacheRequests[activeServerId][key][itemId].progress = 1
-            delete state.cacheRequests[activeServerId][key][itemId].promise
-          }),
-        )
+    const queue = key === 'song' ? songDownloadQueue : imageDownloadQueue
+
+    const promise = queue.enqueue(() =>
+      RNFS.downloadFile({
+        fromUrl,
+        toFile: path,
+        progressInterval: 100,
+        progress: res => {
+          set(
+            produce<CacheSlice>(state => {
+              state.cacheRequests[activeServerId][key][itemId].progress = Math.max(
+                1,
+                res.bytesWritten / (res.contentLength || 1),
+              )
+            }),
+          )
+        },
       })
+        .promise.then(() => {
+          set(
+            produce<CacheSlice>(state => {
+              state.cacheRequests[activeServerId][key][itemId].progress = 1
+              delete state.cacheRequests[activeServerId][key][itemId].promise
+            }),
+          )
+        })
+        .catch(() => {
+          set(
+            produce<CacheSlice>(state => {
+              delete state.cacheFiles[activeServerId][key][itemId]
+              delete state.cacheRequests[activeServerId][key][itemId]
+            }),
+          )
+        }),
+    )
     set(
       produce<Store>(state => {
         state.cacheFiles[activeServerId][key][itemId] = {
@@ -107,7 +131,7 @@ export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): Ca
     return await promise
   },
 
-  getCoverArtPath: async coverArt => {
+  fetchCoverArtFilePath: async coverArt => {
     const client = get().client
     if (!client) {
       return
@@ -128,6 +152,6 @@ export const createCacheSlice = (set: SetState<Store>, get: GetState<Store>): Ca
     }
 
     await get().cacheItem('coverArt', coverArt, () => client.getCoverArtUri({ id: coverArt }))
-    return get().cacheFiles[activeServerId].coverArt[coverArt].path
+    return `file://${get().cacheFiles[activeServerId].coverArt[coverArt].path}`
   },
 })