optimized saving progress update to the database

tonyofrancis · Apr 25, 2018 · 535a5b5 · 535a5b5
1 parent f64236f
commit 535a5b5
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 7 deletions.
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/database/DatabaseManagerImpl.kt
@@ -1,5 +1,6 @@
 package com.tonyodev.fetch2.database
 
+import android.arch.persistence.db.SupportSQLiteDatabase
 import android.arch.persistence.room.Room
 import android.content.Context
 import android.database.sqlite.SQLiteException
@@ -38,6 +39,8 @@ class DatabaseManagerImpl constructor(context: Context,
         builder.build()
     }()
 
+    val database: SupportSQLiteDatabase = requestDatabase.openHelper.writableDatabase
+
     override fun insert(downloadInfo: DownloadInfo): Pair<DownloadInfo, Boolean> {
         synchronized(lock) {
             throwExceptionIfClosed()
@@ -101,7 +104,6 @@ class DatabaseManagerImpl constructor(context: Context,
     override fun updateFileBytesInfoAndStatusOnly(downloadInfo: DownloadInfo) {
         synchronized(lock) {
             throwExceptionIfClosed()
-            val database = requestDatabase.openHelper.writableDatabase
             try {
                 database.beginTransaction()
                 database.execSQL("UPDATE ${DownloadDatabase.TABLE_NAME} SET "

diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/FileDownloader.kt b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/FileDownloader.kt
@@ -23,6 +23,9 @@ interface FileDownloader : Runnable {
         fun onError(download: Download)
 
         fun onComplete(download: Download)
+
+        fun saveDownloadProgress(download: Download)
+
     }
 
 }
diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/downloader/FileDownloaderImpl.kt b/fetch2/src/main/java/com/tonyodev/fetch2/downloader/FileDownloaderImpl.kt
@@ -173,6 +173,8 @@ class FileDownloaderImpl(private val initialDownload: Download,
             downloaderOutputStream?.write(buffer, 0, read)
             if (!terminated) {
                 downloaded += read
+                downloadInfo.downloaded = downloaded
+                downloadInfo.total = total
                 downloadSpeedStopTime = System.nanoTime()
                 val downloadSpeedCheckTimeElapsed = hasIntervalTimeElapsed(downloadSpeedStartTime,
                         downloadSpeedStopTime, DEFAULT_DOWNLOAD_SPEED_REPORTING_INTERVAL_IN_MILLISECONDS)
@@ -187,15 +189,19 @@ class FileDownloaderImpl(private val initialDownload: Download,
                             totalBytes = total,
                             downloadedBytesPerSecond = getAverageDownloadedBytesPerSecond())
                     downloadedBytesPerSecond = downloaded
+                    if (progressReportingIntervalMillis > DEFAULT_DOWNLOAD_SPEED_REPORTING_INTERVAL_IN_MILLISECONDS) {
+                        delegate?.saveDownloadProgress(downloadInfo)
+                    }
                 }
 
                 reportingStopTime = System.nanoTime()
                 val hasReportingTimeElapsed = hasIntervalTimeElapsed(reportingStartTime,
                         reportingStopTime, progressReportingIntervalMillis)
 
                 if (hasReportingTimeElapsed) {
-                    downloadInfo.downloaded = downloaded
-                    downloadInfo.total = total
+                    if (progressReportingIntervalMillis <= DEFAULT_DOWNLOAD_SPEED_REPORTING_INTERVAL_IN_MILLISECONDS) {
+                        delegate?.saveDownloadProgress(downloadInfo)
+                    }
                     if (!terminated) {
                         delegate?.onProgress(
                                 download = downloadInfo,

diff --git a/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt b/fetch2/src/main/java/com/tonyodev/fetch2/helper/FileDownloaderDelegate.kt
@@ -30,17 +30,14 @@ class FileDownloaderDelegate(private val downloadInfoUpdater: DownloadInfoUpdate
         }
     }
 
-    private val progressRunnable = object: DownloadReportingRunnable() {
+    private val progressRunnable = object : DownloadReportingRunnable() {
         override fun run() {
             fetchListener.onProgress(download, etaInMilliSeconds, downloadedBytesPerSecond)
         }
     }
 
     override fun onProgress(download: Download, etaInMilliSeconds: Long, downloadedBytesPerSecond: Long) {
         try {
-            val downloadInfo = download as DownloadInfo
-            downloadInfo.status = Status.DOWNLOADING
-            downloadInfoUpdater.updateFileBytesInfoAndStatusOnly(downloadInfo)
             progressRunnable.download = download
             progressRunnable.etaInMilliSeconds = etaInMilliSeconds
             progressRunnable.downloadedBytesPerSecond = downloadedBytesPerSecond
@@ -85,4 +82,13 @@ class FileDownloaderDelegate(private val downloadInfoUpdater: DownloadInfoUpdate
         }
     }
 
+    override fun saveDownloadProgress(download: Download) {
+        try {
+            val downloadInfo = download as DownloadInfo
+            downloadInfo.status = Status.DOWNLOADING
+            downloadInfoUpdater.updateFileBytesInfoAndStatusOnly(downloadInfo)
+        } catch (e: Exception) {
+            logger.e("DownloadManagerDelegate", e)
+        }
+    }
 }