#496 - transfers ui tweaks, progress bar, mark dl complete if RequestedRangeNotSatisfiable http error

Author: sentinelweb

net/src/commonMain/kotlin/uk/co/sentinelweb/cuer/net/client/ServiceExecutor.kt

@@ -229,7 +229,10 @@ internal class ServiceExecutor(
                             fileChannel?.close(null)
                         }
                     }
-
+                    response.status == HttpStatusCode.RequestedRangeNotSatisfiable && fileSize > 0 -> {
+                        progressCallback?.invoke(TransferProgress(100f, fileSize))
+                        false
+                    }
                     else -> {
                         // Handle unsuccessful response
                         log.e("Failed to download file. Status: ${response.status.value} ${response.status.description}")
@@ -265,6 +268,11 @@ internal class ServiceExecutor(
         val updateIntervalMs = 1000L
         var lastUpdateTime = 0L
 
+        if (initialSize > 0 && initialSize >= totalSize) {
+            progressCallback?.invoke(TransferProgress(100f, totalSize))
+            return
+        }
+
         while (true) {
             bytesRead = responseChannel.readAvailable(buffer, 0, buffer.size)
             if (bytesRead < 0) break

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersComposeables.kt

@@ -194,56 +194,77 @@ object TransfersComposeables {
                 .padding(4.dp)
                 .background(MaterialTheme.colorScheme.surface)
         ) {
+
             TransferHeader(transfer)
+
+            TransferNodeTags(transfer)
+
             transfer.sourceFile?.let { item ->
                 Row {
                     FileRowContent(item)
                 }
             }
-            TransferNodeTags(transfer)
+
             LabelRow(Res.drawable.ic_target, transfer.target, iconSize = 32.dp)
         }
     }
 
     @Composable
     private fun TransferHeader(transfer: Transfer) {
-        Row(
-            verticalAlignment = CenterVertically,
-            modifier = Modifier
-                .padding(4.dp)
-        ) {
-
-            Image(
-                painter = painterResource(transfer.statusIcon),
-                contentDescription = null,
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+        Box {
+            Box(
                 modifier = Modifier
-                    .size(36.dp)
-                    .padding(horizontal = 4.dp)
+                    .align(Alignment.BottomStart)
+                    .background(Color.Red)
+                    .fillMaxWidth(transfer.progressPercent / 100f)
+                    .height(4.dp)
             )
-
-            Image(
-                painter = painterResource(transfer.directionIcon),
-                contentDescription = null,
-                colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+            Row(
+                verticalAlignment = CenterVertically,
                 modifier = Modifier
-                    .size(36.dp)
                     .padding(4.dp)
-            )
+            ) {
 
-            Text(
-                text = transfer.directionText,
-                style = MaterialTheme.typography.titleMedium,
-                modifier = Modifier
-                    .padding(4.dp)
-            )
+                Image(
+                    painter = painterResource(transfer.statusIcon),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+                    modifier = Modifier
+                        .size(36.dp)
+                        .padding(horizontal = 4.dp)
+                )
 
-            Text(
-                text = transfer.progress,
-                modifier = Modifier
-                    .weight(1f)
-                    .padding(horizontal = 8.dp)
-            )
+                Image(
+                    painter = painterResource(transfer.directionIcon),
+                    contentDescription = null,
+                    colorFilter = ColorFilter.tint(MaterialTheme.colorScheme.onSurface),
+                    modifier = Modifier
+                        .size(36.dp)
+                        .padding(4.dp)
+                )
+
+                Text(
+                    text = transfer.directionText,
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier
+                        .padding(4.dp)
+                )
+
+                Text(
+                    text = transfer.statusText,
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier
+                        .padding(4.dp)
+                )
+
+                Text(
+                    text = transfer.progress,
+                    style = MaterialTheme.typography.titleMedium,
+                    modifier = Modifier
+                        .weight(1f)
+                        .padding(horizontal = 8.dp)
+                )
+            }
         }
     }
 
@@ -261,18 +282,18 @@ object TransfersComposeables {
                 model.current?.let { transfer ->
                     TransferHeader(transfer)
 
-                    transfer.sourceFile?.let { item ->
-                        Row(modifier = Modifier.clickable(onClick = viewModel::onSetSource)) {
-                            FileRowContent(item)
-                        }
-                    }
-
                     TransferNodeTags(
                         transfer,
                         onSetSource = viewModel::onSetSource,
                         onSetTarget = viewModel::onSetTarget
                     )
 
+                    transfer.sourceFile?.let { item ->
+                        Row(modifier = Modifier.clickable(onClick = viewModel::onSetSource)) {
+                            FileRowContent(item)
+                        }
+                    }
+
                     StatusLabelRow(transfer)
 
                     LabelRowSmall(

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersContract.kt

@@ -70,6 +70,7 @@ interface TransfersContract {
             val sourceErrors: List<ValidatorResult.ValidatorFieldModel>?,
             val targetErrors: List<ValidatorResult.ValidatorFieldModel>?,
             val isValid: Boolean,
+            val progressPercent: Float = 0f,
         )
 
         companion object {

shared/src/commonMain/kotlin/uk/co/sentinelweb/cuer/app/ui/filebrowser/transfers/TransfersModelMapper.kt

@@ -36,7 +36,10 @@ class TransfersModelMapper(
         targetFile = transfer.target?.path?.let { filesModelMapper.mapItem(it).first },
         directionText = mapDirectionText(state, transfer),
         directionIcon = mapDirectionIcon(state, transfer),
-        progress = ((transfer.progress * 100.0).toInt() / 100.0).toString() + "%",
+        progress = ((transfer.progress
+                /** 100.0*/
+                ).toInt()/* / 100.0*/).toString() + "%",
+        progressPercent = transfer.progress,
         transferErrors = state.validation?.fieldValidations?.filter { it.field == Transfer },
         sourceErrors = state.validation?.fieldValidations?.filter { it.field == Source },
         targetErrors = state.validation?.fieldValidations?.filter { it.field == Target },