new enqueue option part 1

Author: tonyofrancis

fetch2/src/main/java/com/tonyodev/fetch2/EnqueueAction.kt

@@ -15,7 +15,16 @@ enum class EnqueueAction(val value: Int) {
     INCREMENT_FILE_NAME(1),
 
     /** Fetch will not enqueue the new request if a request already managed by Fetch has the same file path. */
-    DO_NOT_ENQUEUE_IF_EXISTING(2);
+    DO_NOT_ENQUEUE_IF_EXISTING(2),
+
+    /** If Fetch is already managing an existing request with the same file path do one the following:
+     * 1: If existing download is completed, Fetch will call onComplete method on attached Fetch Listeners
+     * 2: If existing download is not completed, resume download normally
+     * 3: If not downloaded, download will proceed normally.
+     * Note: If download is existing, Fetch will not update the existing download with the settings from
+     * the new passed in request.
+     * */
+    UPDATE_ACCORDINGLY(3);
 
     companion object {
 
@@ -24,6 +33,7 @@ enum class EnqueueAction(val value: Int) {
             return when (value) {
                 1 -> INCREMENT_FILE_NAME
                 2 -> DO_NOT_ENQUEUE_IF_EXISTING
+                3 -> UPDATE_ACCORDINGLY
                 else -> REPLACE_EXISTING
             }
         }

fetch2/src/main/java/com/tonyodev/fetch2/database/DownloadInfo.kt

@@ -175,6 +175,27 @@ class DownloadInfo : Download {
         dest.writeSerializable(HashMap(extras.map))
     }
 
+    fun copyFrom(downloadInfo: DownloadInfo) {
+        id = downloadInfo.id
+        namespace = downloadInfo.namespace
+        url = downloadInfo.url
+        file = downloadInfo.file
+        group = downloadInfo.group
+        priority = downloadInfo.priority
+        headers = downloadInfo.headers
+        downloaded = downloadInfo.downloaded
+        total = downloadInfo.total
+        status = downloadInfo.status
+        error = downloadInfo.error
+        networkType = downloadInfo.networkType
+        created = downloadInfo.created
+        tag = downloadInfo.tag
+        enqueueAction = downloadInfo.enqueueAction
+        identifier = downloadInfo.identifier
+        downloadOnEnqueue = downloadInfo.downloadOnEnqueue
+        extras = downloadInfo.extras
+    }
+
     override fun describeContents(): Int {
         return 0
     }

fetch2/src/main/java/com/tonyodev/fetch2/fetch/FetchHandlerImpl.kt

@@ -48,30 +48,46 @@ class FetchHandlerImpl(private val namespace: String,
     }
 
     private fun enqueueRequests(requests: List<Request>): List<Download> {
-        val results = requests.distinctBy { it.file }
+        val results = requests.asSequence().distinctBy { it.file }
                 .map {
                     val downloadInfo = it.toDownloadInfo()
                     downloadInfo.namespace = namespace
                     prepareDownloadInfoForEnqueue(downloadInfo)
-                    downloadInfo.status = if (it.downloadOnEnqueue) {
-                        Status.QUEUED
+                    if (downloadInfo.status != Status.COMPLETED) {
+                        downloadInfo.status = if (it.downloadOnEnqueue) {
+                            Status.QUEUED
+                        } else {
+                            Status.ADDED
+                        }
+                        val downloadPair = databaseManager.insert(downloadInfo)
+                        logger.d("Enqueued download ${downloadPair.first}")
+                        downloadPair.first
                     } else {
-                        Status.ADDED
+                        logger.d("Updating download $downloadInfo")
+                        databaseManager.update(downloadInfo)
+                        downloadInfo
                     }
-                    val downloadPair = databaseManager.insert(downloadInfo)
-                    logger.d("Enqueued download ${downloadPair.first}")
-                    downloadPair.first
-                }
+                }.toList()
         startPriorityQueueIfNotStarted()
         return results
     }
 
     private fun prepareDownloadInfoForEnqueue(downloadInfo: DownloadInfo) {
-        val existingDownload = databaseManager.getByFile(downloadInfo.file)
+        var existingDownload = databaseManager.getByFile(downloadInfo.file)
         if (existingDownload == null) {
             createFileIfPossible(File(downloadInfo.file))
         }
-        if (downloadInfo.enqueueAction == EnqueueAction.DO_NOT_ENQUEUE_IF_EXISTING && existingDownload != null) {
+        if (downloadInfo.enqueueAction == EnqueueAction.UPDATE_ACCORDINGLY && existingDownload != null) {
+            cancelDownloadsIfDownloading(listOf(existingDownload.id))
+            existingDownload = databaseManager.getByFile(downloadInfo.file)
+            if (existingDownload != null) {
+                if (existingDownload.status != Status.COMPLETED) {
+                    existingDownload.status = Status.QUEUED
+                    existingDownload.error = defaultNoError
+                }
+                downloadInfo.copyFrom(existingDownload)
+            }
+        } else if (downloadInfo.enqueueAction == EnqueueAction.DO_NOT_ENQUEUE_IF_EXISTING && existingDownload != null) {
             throw FetchException(REQUEST_WITH_FILE_PATH_ALREADY_EXIST)
         } else if (downloadInfo.enqueueAction == EnqueueAction.REPLACE_EXISTING && existingDownload != null) {
             deleteDownloads(listOf(downloadInfo.id))
@@ -275,14 +291,9 @@ class FetchHandlerImpl(private val namespace: String,
         val oldDownloadInfo = databaseManager.get(requestId)
         if (oldDownloadInfo != null) {
             val newDownloadInfo = newRequest.toDownloadInfo()
-            newDownloadInfo.status = if (newRequest.downloadOnEnqueue) {
-                Status.QUEUED
-            } else {
-                Status.ADDED
-            }
             newDownloadInfo.namespace = namespace
             val enqueueAction = newDownloadInfo.enqueueAction
-            if (enqueueAction == EnqueueAction.REPLACE_EXISTING) {
+            if (enqueueAction == EnqueueAction.REPLACE_EXISTING || enqueueAction == EnqueueAction.UPDATE_ACCORDINGLY) {
                 if (newRequest.file == oldDownloadInfo.file) {
                     newDownloadInfo.downloaded = oldDownloadInfo.downloaded
                     newDownloadInfo.total = oldDownloadInfo.total
@@ -291,6 +302,15 @@ class FetchHandlerImpl(private val namespace: String,
             } else {
                 delete(listOf(requestId))
             }
+            if (oldDownloadInfo.status == Status.COMPLETED) {
+
+            } else {
+                newDownloadInfo.status = if (newRequest.downloadOnEnqueue) {
+                    Status.QUEUED
+                } else {
+                    Status.ADDED
+                }
+            }
             prepareDownloadInfoForEnqueue(newDownloadInfo)
             startPriorityQueueIfNotStarted()
             databaseManager.insert(newDownloadInfo)