in app file uploading status enhanced

danishjamal104 · danishjamal104 · commit 061f31d52e59 · 2021-06-07T22:51:54.000+05:30
rebase
diff --git a/app/src/main/java/com/github/code/gambit/backgroundtask/FileUploadWorker.kt b/app/src/main/java/com/github/code/gambit/backgroundtask/FileUploadWorker.kt
@@ -16,7 +16,6 @@ import androidx.work.WorkerParameters
 import androidx.work.workDataOf
 import com.github.code.gambit.R
 import com.github.code.gambit.data.entity.chache.FileCacheEntity
-import com.github.code.gambit.data.entity.chache.FileMetaDataCacheEntity
 import com.github.code.gambit.data.entity.network.FileNetworkEntity
 import com.github.code.gambit.data.local.Database
 import com.github.code.gambit.data.mapper.cache.FileCacheMapper
@@ -36,7 +35,6 @@ import retrofit2.converter.gson.GsonConverterFactory
 import timber.log.Timber
 import java.io.File
 import java.lang.Exception
-import java.util.Calendar
 import kotlin.math.pow
 
 class FileUploadWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker(ctx, params) {
@@ -62,19 +60,6 @@ class FileUploadWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker
         val fmd = FileMetaData.fromString(fileMetaDataString)
         val uid = System.currentTimeMillis().toInt()
         val size = String.format("%.2f", fmd.size.div(10.0.pow(6.0)))
-        try {
-            val data = FileMetaDataCacheEntity(
-                id.toString(),
-                Calendar.getInstance().timeInMillis,
-                fmd.path,
-                fmd.name,
-                fmd.size
-            )
-            fileMetaDataDao.insertFileMetaData(data)
-            Timber.tag("worker").i("added file in db")
-        } catch (err: Exception) {
-            Timber.tag("worker").i(err.localizedMessage)
-        }
         setForeground(
             makeStatusNotification(
                 uid,
@@ -94,7 +79,6 @@ class FileUploadWorker(ctx: Context, params: WorkerParameters) : CoroutineWorker
         }*/
         val file = File(fmd.path)
         val res = InfuraIPFS().add.file(file, fmd.name, fmd.name).Hash
-        val fileDao = fileDao
         val fileService = getFileService()
         val fne = FileNetworkEntity("", "", res, fmd.name, fmd.size, fmd.name.split(".")[1])
         val task = fileService.uploadFile(fne)
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSource.kt
@@ -12,8 +12,7 @@ interface CacheDataSource {
     suspend fun deleteFiles(): Int
     suspend fun insertUrls(urls: List<Url>): Long
     suspend fun getUrls(fileId: String): List<Url>
-    suspend fun insertFileMetaData(fileMetaData: FileMetaData, uuid: String)
-    suspend fun getFileMetaData(uuid: String): FileMetaData
+    suspend fun insertFileMetaData(fileMetaData: FileMetaData): Long
     suspend fun getAllFileMetaData(): List<FileMetaData>
     suspend fun deleteFileMetaData(uuid: String)
     suspend fun clearAllFileMetaData()
diff --git a/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt b/app/src/main/java/com/github/code/gambit/data/local/CacheDataSourceImpl.kt
@@ -7,7 +7,6 @@ import com.github.code.gambit.data.mapper.cache.UrlCacheMapper
 import com.github.code.gambit.data.model.File
 import com.github.code.gambit.data.model.FileMetaData
 import com.github.code.gambit.data.model.Url
-import java.util.Calendar
 
 class CacheDataSourceImpl
 constructor(
@@ -50,17 +49,11 @@ constructor(
         return urlCacheMapper.mapFromEntityList(urls)
     }
 
-    override suspend fun insertFileMetaData(fileMetaData: FileMetaData, uuid: String) {
+    override suspend fun insertFileMetaData(fileMetaData: FileMetaData): Long {
         val data: FileMetaDataCacheEntity = fileMetaDataMapper.mapToEntity(fileMetaData)
-        data.timestamp = Calendar.getInstance().timeInMillis
         return fileWorkerDao.insertFileMetaData(data)
     }
 
-    override suspend fun getFileMetaData(uuid: String): FileMetaData {
-        val res = fileWorkerDao.getFileMetaData(uuid)[0]
-        return FileMetaData(res.path, res.name, res.size)
-    }
-
     override suspend fun getAllFileMetaData(): List<FileMetaData> {
         return fileMetaDataMapper.mapFromEntityList(fileWorkerDao.getAllFileMetaData())
     }
diff --git a/app/src/main/java/com/github/code/gambit/data/local/Database.kt b/app/src/main/java/com/github/code/gambit/data/local/Database.kt
@@ -6,7 +6,7 @@ import com.github.code.gambit.data.entity.chache.FileCacheEntity
 import com.github.code.gambit.data.entity.chache.FileMetaDataCacheEntity
 import com.github.code.gambit.data.entity.chache.UrlCacheEntity
 
-@Database(entities = [FileCacheEntity::class, UrlCacheEntity::class, FileMetaDataCacheEntity::class], version = 2)
+@Database(entities = [FileCacheEntity::class, UrlCacheEntity::class, FileMetaDataCacheEntity::class], version = 4)
 abstract class Database : RoomDatabase() {
 
     abstract fun fileDao(): FileDao
diff --git a/app/src/main/java/com/github/code/gambit/data/local/FileMetaDataDao.kt b/app/src/main/java/com/github/code/gambit/data/local/FileMetaDataDao.kt
@@ -10,10 +10,7 @@ import com.github.code.gambit.data.entity.chache.FileMetaDataCacheEntity
 interface FileMetaDataDao {
 
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun insertFileMetaData(fileMetaDataCacheEntity: FileMetaDataCacheEntity)
-
-    @Query("SELECT * FROM fileMetaData WHERE uuid = :uuid")
-    suspend fun getFileMetaData(uuid: String): List<FileMetaDataCacheEntity>
+    suspend fun insertFileMetaData(fileMetaDataCacheEntity: FileMetaDataCacheEntity): Long
 
     @Query("SELECT * FROM fileMetaData ORDER BY timestamp DESC")
     suspend fun getAllFileMetaData(): List<FileMetaDataCacheEntity>
diff --git a/app/src/main/java/com/github/code/gambit/data/mapper/cache/FileMetaDataMapper.kt b/app/src/main/java/com/github/code/gambit/data/mapper/cache/FileMetaDataMapper.kt
@@ -10,14 +10,13 @@ class FileMetaDataMapper
 constructor() : EntityMapper<FileMetaDataCacheEntity, FileMetaData> {
 
     override fun mapFromEntity(entity: FileMetaDataCacheEntity): FileMetaData {
-        return FileMetaData(entity.path, entity.name, entity.size, entity.uuid)
+        return FileMetaData(entity.path, entity.name, entity.size, entity.timestamp, entity.uuid)
     }
 
     override fun mapToEntity(domainModel: FileMetaData): FileMetaDataCacheEntity {
-        val uuid = domainModel.uuid?.let { domainModel.uuid } ?: ""
         return FileMetaDataCacheEntity(
-            uuid,
-            0L,
+            domainModel.uuid,
+            domainModel.timestamp,
             domainModel.path,
             domainModel.name,
             domainModel.size
diff --git a/app/src/main/java/com/github/code/gambit/data/model/FileMetaData.kt b/app/src/main/java/com/github/code/gambit/data/model/FileMetaData.kt
@@ -2,25 +2,19 @@ package com.github.code.gambit.data.model
 
 import java.lang.IndexOutOfBoundsException
 
-class FileMetaData(val path: String, val name: String, val size: Int, var uuid: String? = null) {
+class FileMetaData(val path: String, val name: String, val size: Int, val timestamp: Long, var uuid: String) {
 
     companion object {
         fun fromString(string: String): FileMetaData {
             val arr = string.split("\n")
-            if (arr.size < 3) {
+            if (arr.size < 5) {
                 throw throw IndexOutOfBoundsException("Invalid string")
             }
-            if (arr.size == 4) {
-                return FileMetaData(arr[0], arr[1], arr[2].toInt(), arr[3])
-            }
-            return FileMetaData(arr[0], arr[1], arr[2].toInt())
+            return FileMetaData(arr[0], arr[1], arr[2].toInt(), arr[3].toLong(), arr[4])
         }
     }
 
     override fun toString(): String {
-        if (uuid != null) {
-            return "$path\n$name\n$size\n$uuid"
-        }
-        return "$path\n$name\n$size"
+        return "$path\n$name\n$size\n$timestamp\n$uuid"
     }
 }
diff --git a/app/src/main/java/com/github/code/gambit/helper/file/FileUploadState.kt b/app/src/main/java/com/github/code/gambit/helper/file/FileUploadState.kt
@@ -5,6 +5,7 @@ import com.github.code.gambit.data.entity.network.FileNetworkEntity
 import com.github.code.gambit.data.model.FileUploadStatus
 
 sealed class FileUploadState {
+    data class Error(val message: String) : FileUploadState()
     data class UploadStarted(val fileName: String) : FileUploadState()
     data class UploadSuccess(val file: FileNetworkEntity) : FileUploadState()
     data class UpdateFileState(val uuid: String, val newState: WorkInfo.State) : FileUploadState()
diff --git a/app/src/main/java/com/github/code/gambit/repositories/fileupload/FileUploadRepository.kt b/app/src/main/java/com/github/code/gambit/repositories/fileupload/FileUploadRepository.kt
@@ -2,15 +2,10 @@ package com.github.code.gambit.repositories.fileupload
 
 import com.github.code.gambit.data.model.FileMetaData
 import com.github.code.gambit.helper.ServiceResult
-import java.util.UUID
 
 interface FileUploadRepository {
 
-    suspend fun getFileMetaData(uuid: String): ServiceResult<FileMetaData>
+    suspend fun getAllFileMetaData(): ServiceResult<List<FileMetaData>>
 
-    suspend fun getFilesMetaData(uuids: List<String>): ServiceResult<List<FileMetaData>>
-
-    suspend fun insertFileUploadInfo(fileMetaData: FileMetaData, uuid: UUID): ServiceResult<Unit>
-
-    suspend fun deleteFileMetaData(uuid: UUID): ServiceResult<Unit>
+    suspend fun insertFileMetaData(fileMetaData: FileMetaData): ServiceResult<Unit>
 }
diff --git a/app/src/main/java/com/github/code/gambit/repositories/fileupload/FileUploadRepositoryImpl.kt b/app/src/main/java/com/github/code/gambit/repositories/fileupload/FileUploadRepositoryImpl.kt
@@ -3,50 +3,26 @@ package com.github.code.gambit.repositories.fileupload
 import com.github.code.gambit.data.local.CacheDataSource
 import com.github.code.gambit.data.model.FileMetaData
 import com.github.code.gambit.helper.ServiceResult
+import timber.log.Timber
 import java.lang.Exception
-import java.util.UUID
 
 class FileUploadRepositoryImpl(
     private val cacheDataSource: CacheDataSource
 ) : FileUploadRepository {
 
-    override suspend fun getFileMetaData(uuid: String): ServiceResult<FileMetaData> {
+    override suspend fun getAllFileMetaData(): ServiceResult<List<FileMetaData>> {
         return try {
-            val res = cacheDataSource.getFileMetaData(uuid)
-            ServiceResult.Success(res)
+            val data = cacheDataSource.getAllFileMetaData()
+            ServiceResult.Success(data)
         } catch (err: Exception) {
             ServiceResult.Error(err)
         }
     }
 
-    override suspend fun getFilesMetaData(uuids: List<String>): ServiceResult<List<FileMetaData>> {
+    override suspend fun insertFileMetaData(fileMetaData: FileMetaData): ServiceResult<Unit> {
         return try {
-            val res = mutableListOf<FileMetaData>()
-            uuids.forEach {
-                val dt = cacheDataSource.getFileMetaData(it)
-                res.add(dt)
-            }
-            ServiceResult.Success(res)
-        } catch (err: Exception) {
-            ServiceResult.Error(err)
-        }
-    }
-
-    override suspend fun insertFileUploadInfo(
-        fileMetaData: FileMetaData,
-        uuid: UUID
-    ): ServiceResult<Unit> {
-        return try {
-            cacheDataSource.insertFileMetaData(fileMetaData, uuid.toString())
-            ServiceResult.Success(Unit)
-        } catch (err: Exception) {
-            ServiceResult.Error(err)
-        }
-    }
-
-    override suspend fun deleteFileMetaData(uuid: UUID): ServiceResult<Unit> {
-        return try {
-            cacheDataSource.deleteFileMetaData(uuid.toString())
+            val res = cacheDataSource.insertFileMetaData(fileMetaData)
+            Timber.tag("work").i("inserted $res")
             ServiceResult.Success(Unit)
         } catch (err: Exception) {
             ServiceResult.Error(err)
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/FileMetaDataAdapter.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/FileMetaDataAdapter.kt
@@ -8,6 +8,8 @@ import com.github.code.gambit.data.model.FileUploadStatus
 import com.github.code.gambit.databinding.FileMetaDataListItemBinding
 import com.github.code.gambit.ui.BaseAdapter
 import com.github.code.gambit.ui.OnItemClickListener
+import com.github.code.gambit.utility.extention.byteToMb
+import timber.log.Timber
 
 class FileMetaDataAdapter(val context: Context) :
     BaseAdapter<FileUploadStatus, FileMetaDataListItemBinding, OnItemClickListener<FileUploadStatus>>(
@@ -24,7 +26,7 @@ class FileMetaDataAdapter(val context: Context) :
         binding: FileMetaDataListItemBinding
     ) {
         binding.fileName.text = item.fileMetaData.name
-        binding.fileSize.text = item.fileMetaData.size.toString()
+        binding.fileSize.text = item.fileMetaData.size.byteToMb()
         binding.filePath.text = item.state.toString()
     }
 
@@ -38,8 +40,11 @@ class FileMetaDataAdapter(val context: Context) :
     }
 
     fun updateStatus(uuid: String, state: WorkInfo.State) {
-        val item = getDataList.find { it.fileMetaData.uuid == uuid }
-        item?.state = state
-        notifyDataSetChanged()
+        val dt = getDataList
+        dt.find { it.fileMetaData.uuid == uuid }?.let {
+            it.state = state
+            Timber.tag("work").i("${it.fileMetaData.uuid} updated to $state")
+            notifyDataSetChanged()
+        }
     }
 }
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/MainActivity.kt
@@ -108,6 +108,9 @@ class MainActivity : AppCompatActivity(), BottomNavController {
                 is FileUploadState.UpdateFileState -> {
                     adapter.updateStatus(it.uuid, it.newState)
                 }
+                is FileUploadState.Error -> {
+                    Toast.makeText(this, it.message, Toast.LENGTH_LONG).show()
+                }
             }
         }
         setUpRecyclerView()
diff --git a/app/src/main/java/com/github/code/gambit/ui/activity/main/MainViewModel.kt b/app/src/main/java/com/github/code/gambit/ui/activity/main/MainViewModel.kt

Original file line number	Diff line number	Diff line change
`@@ -2,25 +2,19 @@ package com.github.code.gambit.data.model`
`2`	`2`
`3`	`3`	`import java.lang.IndexOutOfBoundsException`
`4`	`4`
`5`		`-class FileMetaData(val path: String, val name: String, val size: Int, var uuid: String? = null) {`
	`5`	`+class FileMetaData(val path: String, val name: String, val size: Int, val timestamp: Long, var uuid: String) {`
`6`	`6`
`7`	`7`	`companion object {`
`8`	`8`	`fun fromString(string: String): FileMetaData {`
`9`	`9`	`val arr = string.split("\n")`
`10`		`- if (arr.size < 3) {`
	`10`	`+ if (arr.size < 5) {`
`11`	`11`	`throw throw IndexOutOfBoundsException("Invalid string")`
`12`	`12`	`}`
`13`		`- if (arr.size == 4) {`
`14`		`- return FileMetaData(arr[0], arr[1], arr[2].toInt(), arr[3])`
`15`		`- }`
`16`		`- return FileMetaData(arr[0], arr[1], arr[2].toInt())`
	`13`	`+ return FileMetaData(arr[0], arr[1], arr[2].toInt(), arr[3].toLong(), arr[4])`
`17`	`14`	`}`
`18`	`15`	`}`
`19`	`16`
`20`	`17`	`override fun toString(): String {`
`21`		`- if (uuid != null) {`
`22`		`- return "$path\n$name\n$size\n$uuid"`
`23`		`- }`
`24`		`- return "$path\n$name\n$size"`
	`18`	`+ return "$path\n$name\n$size\n$timestamp\n$uuid"`
`25`	`19`	`}`
`26`	`20`	`}`