Fixed partial downloads + resume bugs

Author: LagradOst

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadManager.kt

@@ -21,6 +21,7 @@ import androidx.core.net.toUri
 import androidx.preference.PreferenceManager
 import com.lagradost.cloudstream3.APIHolder.getApiFromNameNull
 import com.lagradost.cloudstream3.BuildConfig
+import com.lagradost.cloudstream3.CloudStreamApp.Companion.getKey
 import com.lagradost.cloudstream3.CommonActivity.showToast
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.removeKey
 import com.lagradost.cloudstream3.CloudStreamApp.Companion.setKey
@@ -182,6 +183,13 @@ object VideoDownloadManager {
     /** the process failed due to some reason, so we retry and also try the next mirror */
     private val DOWNLOAD_FAILED = DownloadStatus(retrySame = true, tryNext = true, success = false)
 
+    /** The download only downloaded partial */
+    private val DOWNLOAD_PARTIAL_SUCCESS =
+        DownloadStatus(retrySame = true, tryNext = false, success = true)
+
+    /** 10MB minimum size */
+    const val DOWNLOAD_PARTIAL_MIN_SIZE = 1_048_576L * 10L
+
     /** bad config, skip all mirrors as every call to download will have the same bad config */
     private val DOWNLOAD_BAD_CONFIG =
         DownloadStatus(retrySame = false, tryNext = false, success = false)
@@ -523,6 +531,7 @@ object VideoDownloadManager {
     /** This class handles the notifications, as well as the relevant key */
     data class DownloadMetaData(
         private val id: Int?,
+        private val linkHash : Int,
         var bytesDownloaded: Long = 0,
         var bytesWritten: Long = 0,
 
@@ -534,7 +543,7 @@ object VideoDownloadManager {
         private val createNotificationCallback: (CreateNotificationMetadata) -> Unit,
 
         private var internalType: DownloadType = DownloadType.IsPending,
-
+        val isHLS : Boolean,
         // how many segments that we have downloaded
         var hlsProgress: Int = 0,
         // how many segments that exist
@@ -552,13 +561,17 @@ object VideoDownloadManager {
             lastDownloadedBytes = length
         }
 
+        /** Returns the appropriate failed status based on download progress */
+        fun failedStatus() = if (this.bytesWritten > DOWNLOAD_PARTIAL_MIN_SIZE)
+            DOWNLOAD_PARTIAL_SUCCESS
+        else
+            DOWNLOAD_FAILED
+
         val approxTotalBytes: Long
             get() = totalBytes ?: hlsTotal?.let { total ->
                 (bytesDownloaded * (total / hlsProgress.toFloat())).toLong()
             } ?: bytesDownloaded
 
-        private val isHLS get() = hlsTotal != null
-
         private var stopListener: (() -> Unit)? = null
 
         /** on cancel button pressed or failed invoke this once and only once */
@@ -593,11 +606,32 @@ object VideoDownloadManager {
         private fun updateFileInfo() {
             if (id == null) return
             downloadFileInfoTemplate?.let { template ->
+                /** This looks strange, but fixes an issue where we do an instant retry, and it fails immediately,
+                 * eg. by turning off wifi */
+                val totalBytesValue = if (approxTotalBytes <= bytesDownloaded) {
+                    val prevInfo = getKey<DownloadedFileInfo>(
+                        KEY_DOWNLOAD_INFO,
+                        id.toString()
+                    )
+
+                    /** If this link is the same as the last cached video link metadata */
+                    if (prevInfo != null && prevInfo.linkHash == linkHash) {
+                        /** Try to use totalBytes if it exists, otherwise the max of the prev data,
+                         * and download size to ensure total >= downloaded */
+                        totalBytes ?: maxOf(prevInfo.totalBytes, bytesDownloaded)
+                    } else {
+                        approxTotalBytes
+                    }
+                } else {
+                    approxTotalBytes
+                }
+
                 setKey(
                     KEY_DOWNLOAD_INFO,
                     id.toString(),
                     template.copy(
-                        totalBytes = approxTotalBytes,
+                        linkHash = linkHash,
+                        totalBytes = totalBytesValue,
                         extraInfo = if (isHLS) hlsWrittenProgress.toString() else null
                     )
                 )
@@ -982,6 +1016,8 @@ object VideoDownloadManager {
             bytesDownloaded = 0,
             createNotificationCallback = createNotificationCallback,
             id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = false
         )
         try {
             // get the file path
@@ -1171,7 +1207,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1201,11 +1237,11 @@ object VideoDownloadManager {
             throw e
         } catch (t: Throwable) {
             // some sort of network error, will error
-
+            logError(t)
             // note that when failing we don't want to delete the file,
             // only user interaction has that power
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             //requestStream?.closeQuietly()
@@ -1227,7 +1263,9 @@ object VideoDownloadManager {
 
         val metadata = DownloadMetaData(
             createNotificationCallback = createNotificationCallback,
-            id = parentId
+            id = parentId,
+            linkHash = link.url.hashCode(),
+            isHLS = true
         )
         var fileStream: OutputStream? = null
         try {
@@ -1385,7 +1423,7 @@ object VideoDownloadManager {
             if (!stream.exists) metadata.type = DownloadType.IsStopped
 
             if (metadata.type == DownloadType.IsFailed) {
-                return@withContext DOWNLOAD_FAILED
+                return@withContext metadata.failedStatus()
             }
 
             if (metadata.type == DownloadType.IsStopped) {
@@ -1401,7 +1439,7 @@ object VideoDownloadManager {
         } catch (t: Throwable) {
             logError(t)
             metadata.type = DownloadType.IsFailed
-            return@withContext DOWNLOAD_FAILED
+            return@withContext metadata.failedStatus()
         } finally {
             fileStream?.closeQuietly()
             metadata.close()
@@ -1983,7 +2021,8 @@ object VideoDownloadManager {
             linkLoadingJob?.join()
 
             // Remove link loading notification
-            NotificationManagerCompat.from(context).cancel(DOWNLOAD_NOTIFICATION_TAG, downloadItem.episode.id)
+            NotificationManagerCompat.from(context)
+                .cancel(DOWNLOAD_NOTIFICATION_TAG, downloadItem.episode.id)
 
             if (linkLoadingJob?.isCancelled == true) {
                 // Same as if no links, but no toast.
@@ -2009,8 +2048,10 @@ object VideoDownloadManager {
             }
 
             // Profiles should always contain a download type
-            val profile = QualityDataHelper.getProfiles().first { it.types.contains(
-                QualityDataHelper.QualityProfileType.Download)
+            val profile = QualityDataHelper.getProfiles().first {
+                it.types.contains(
+                    QualityDataHelper.QualityProfileType.Download
+                )
             }
 
             val sortedLinks = currentLinks.sortedBy { link ->

app/src/main/java/com/lagradost/cloudstream3/utils/downloader/DownloadObjects.kt

@@ -133,7 +133,9 @@ object DownloadObjects {
         @JsonProperty("relativePath") val relativePath: String,
         @JsonProperty("displayName") val displayName: String,
         @JsonProperty("extraInfo") val extraInfo: String? = null,
-        @JsonProperty("basePath") val basePath: String? = null // null is for legacy downloads. See getBasePath()
+        @JsonProperty("basePath") val basePath: String? = null, // null is for legacy downloads. See getBasePath()
+        // Hash of the link associated with this DownloadFile, used so not override old data in the DownloadedFileInfo
+        @JsonProperty("linkHash") val linkHash : Int? = null
     )
 
     data class DownloadedFileInfoResult(