Add downloaded bytes info & get/clear by status #33

ketch/src/main/java/com/ketch/DownloadModel.kt

@@ -11,6 +11,7 @@ package com.ketch
  * @property headers Optional headers sent when making api call for file download
  * @property timeQueued First time in millisecond when download was queued into the database
  * @property status Current [Status] of the download
+ * @property downloaded Downloaded size of file in bytes
  * @property total Total size of file in bytes
  * @property progress Current download progress in Int between 0 and 100
  * @property speedInBytePerMs Current speed of download in bytes per second
@@ -29,6 +30,7 @@ data class DownloadModel(
     val headers: HashMap<String, String>,
     val timeQueued: Long,
     val status: Status,
+    val downloaded: Long,
     val total: Long,
     val progress: Int,
     val speedInBytePerMs: Float,

ketch/src/main/java/com/ketch/Ketch.kt

@@ -367,6 +367,16 @@ class Ketch private constructor(
         downloadManager.clearDbAsync(id, deleteFile)
     }
 
+    /**
+     * Clear entries from database and delete files with given [status]
+     *
+     * @param status Status associated with the download
+     * @param deleteFile delete the actual file from the system
+     */
+    fun clearDb(status: Status, deleteFile: Boolean = true) {
+        downloadManager.clearDbAsync(status, deleteFile)
+    }
+
     /**
      * Clear entries from database and delete files with given [tag]
      *
@@ -418,4 +428,12 @@ class Ketch private constructor(
      */
     suspend fun getAllDownloads() = downloadManager.getAllDownloads()
 
+    /**
+     * Suspend function to get list of all Downloads with given [status]
+     *
+     * @param status Status associated with the download
+     * @return List of [DownloadModel]
+     */
+    suspend fun getAllDownloads(status: Status) = downloadManager.getAllDownloads(status)
+
 }

ketch/src/main/java/com/ketch/internal/database/DownloadDao.kt

@@ -5,6 +5,7 @@ import androidx.room.Insert
 import androidx.room.OnConflictStrategy
 import androidx.room.Query
 import androidx.room.Update
+import com.ketch.Status
 import kotlinx.coroutines.flow.Flow
 
 @Dao
@@ -30,6 +31,9 @@ internal interface DownloadDao {
     @Query("SELECT * FROM downloads WHERE lastModified <= :timeMillis ORDER BY timeQueued ASC")
     fun getEntityTillTimeFlow(timeMillis: Long): Flow<List<DownloadEntity>>
 
+    @Query("SELECT * FROM downloads WHERE status = :status ORDER BY timeQueued ASC")
+    fun getAllEntityByStatusFlow(status: Status): Flow<List<DownloadEntity>>
+
     @Query("SELECT * FROM downloads WHERE tag = :tag ORDER BY timeQueued ASC")
     fun getAllEntityByTagFlow(tag: String): Flow<List<DownloadEntity>>
 
@@ -42,6 +46,9 @@ internal interface DownloadDao {
     @Query("SELECT * FROM downloads WHERE lastModified <= :timeMillis ORDER BY timeQueued ASC")
     suspend fun getEntityTillTime(timeMillis: Long): List<DownloadEntity>
 
+    @Query("SELECT * FROM downloads WHERE status = :status ORDER BY timeQueued ASC")
+    suspend fun getAllEntityByStatus(status: Status): List<DownloadEntity>
+
     @Query("SELECT * FROM downloads WHERE tag = :tag ORDER BY timeQueued ASC")
     suspend fun getAllEntityByTag(tag: String): List<DownloadEntity>
 }

ketch/src/main/java/com/ketch/internal/download/DownloadManager.kt

@@ -424,6 +424,23 @@ internal class DownloadManager(
         }
     }
 
+    fun clearDbAsync(status: Status, deleteFile: Boolean) {
+        scope.launch {
+            downloadDao.getAllEntityByStatus(status).forEach {
+                workManager.cancelUniqueWork(it.id.toString())
+                val downloadEntity = downloadDao.find(it.id)
+                val path = downloadEntity?.path
+                val fileName = downloadEntity?.fileName
+                if (path != null && fileName != null && deleteFile) {
+                    deleteFileIfExists(path, fileName)
+                }
+                downloadDao.remove(it.id)
+                removeNotification(context, it.id) // In progress notification
+                removeNotification(context, it.id + 1) // Cancelled, Paused, Failed, Success notification
+            }
+        }
+    }
+
     fun clearAllDbAsync(deleteFile: Boolean) {
         scope.launch {
             downloadDao.getAllEntity().forEach {
@@ -478,6 +495,14 @@ internal class DownloadManager(
         }
     }
 
+    fun observeDownloadsByStatus(status: Status): Flow<List<DownloadModel>> {
+        return downloadDao.getAllEntityByStatusFlow(status).map { entityList ->
+            entityList.map { entity ->
+                entity.toDownloadModel()
+            }
+        }
+    }
+
     fun observeAllDownloads(): Flow<List<DownloadModel>> {
         return downloadDao.getAllEntityFlow().map { entityList ->
             entityList.map { entity ->
@@ -486,10 +511,15 @@ internal class DownloadManager(
         }
     }
 
+    suspend fun getAllDownloads(status: Status): List<DownloadModel> {
+        return downloadDao.getAllEntityByStatus(status).map { entity ->
+            entity.toDownloadModel()
+        }
+    }
+
     suspend fun getAllDownloads(): List<DownloadModel> {
         return downloadDao.getAllEntity().map { entity ->
             entity.toDownloadModel()
         }
     }
-
 }

ketch/src/main/java/com/ketch/internal/utils/MapperUtil.kt

@@ -15,6 +15,7 @@ internal fun DownloadEntity.toDownloadModel() =
         headers = WorkUtil.jsonToHashMap(headersJson),
         timeQueued = timeQueued,
         status = Status.entries.find { it.name == status } ?: Status.DEFAULT,
+        downloaded = downloadedBytes,
         total = totalBytes,
         progress = if (totalBytes.toInt() != 0) ((downloadedBytes * 100) / totalBytes).toInt() else 0,
         speedInBytePerMs = speedInBytePerMs,