From 631bcfcc2a2d039f2bc09f47a78692feb51e6a8f Mon Sep 17 00:00:00 2001
From: Murilo Polese <murilopolese@gmail.com>
Date: Thu, 25 Apr 2024 11:44:47 +0200
Subject: [PATCH 1/2] Show filename when transferring files

---
 ui/arduino/main.css                    | 1 +
 ui/arduino/store.js                    | 2 +-
 ui/arduino/views/components/overlay.js | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/ui/arduino/main.css b/ui/arduino/main.css
index 3a2eca0..2c94b7d 100644
--- a/ui/arduino/main.css
+++ b/ui/arduino/main.css
@@ -652,6 +652,7 @@ button.small .icon {
   transition: all 0.25s;
   pointer-events: none;
   opacity: 0;
+  text-align: center;
 }
 
 #overlay.open {
diff --git a/ui/arduino/store.js b/ui/arduino/store.js
index 93ed063..42bf00f 100644
--- a/ui/arduino/store.js
+++ b/ui/arduino/store.js
@@ -1198,7 +1198,7 @@ async function store(state, emitter) {
         await serial.uploadFile(
           srcPath, destPath,
           (e) => {
-            state.transferringProgress = e
+            state.transferringProgress = `${file.fileName}: ${e}`
             emitter.emit('render')
           }
         )
diff --git a/ui/arduino/views/components/overlay.js b/ui/arduino/views/components/overlay.js
index 1b9389c..3f34507 100644
--- a/ui/arduino/views/components/overlay.js
+++ b/ui/arduino/views/components/overlay.js
@@ -10,7 +10,7 @@ function Overlay(state, emit) {
   if (state.isConnecting) overlay = html`<div id="overlay" class="open"><p>Connecting...</p></div>`
   if (state.isLoadingFiles) overlay = html`<div id="overlay" class="open"><p>Loading files...</p></div>`
   if (state.isSaving) overlay = html`<div id="overlay" class="open"><p>Saving file... ${state.savingProgress}</p></div>`
-  if (state.isTransferring) overlay = html`<div id="overlay" class="open"><p>Transferring file... ${state.transferringProgress}</p></div>`
+  if (state.isTransferring) overlay = html`<div id="overlay" class="open"><p>Transferring file<br><br>${state.transferringProgress}</p></div>`
 
   return overlay
 }

From f6a1cfa6e18ced5c80d8cdf1218aeef3be56c940 Mon Sep 17 00:00:00 2001
From: Murilo Polese <murilopolese@gmail.com>
Date: Thu, 7 Nov 2024 08:50:35 -0300
Subject: [PATCH 2/2] Include file name on folder transfer

---
 ui/arduino/store.js | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/ui/arduino/store.js b/ui/arduino/store.js
index 6c51a84..1c8b107 100644
--- a/ui/arduino/store.js
+++ b/ui/arduino/store.js
@@ -1197,16 +1197,16 @@ async function store(state, emitter) {
       if (file.type == 'folder') {
         await uploadFolder(
           srcPath, destPath,
-          (e) => {
-            state.transferringProgress = e
+          (progress, fileName) => {
+            state.transferringProgress = `${fileName}: ${progress}`
             emitter.emit('render')
           }
         )
       } else {
         await serial.uploadFile(
           srcPath, destPath,
-          (e) => {
-            state.transferringProgress = `${file.fileName}: ${e}`
+          (progress) => {
+            state.transferringProgress = `${file.fileName}: ${progress}`
             emitter.emit('render')
           }
         )
@@ -1521,7 +1521,9 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
       await serial.uploadFile(
         disk.getFullPath(srcPath, relativePath, ''),
         serial.getFullPath(destPath, relativePath, ''),
-        dataConsumer
+        (progress) => {
+          dataConsumer(progress, relativePath.slice(1))
+        }
       )
     }
   }