Skip to content

Commit 4e139e6

Browse files
authored
Merge pull request #120 from arduino/feature/show-filename-transfer
Show filename transfer
2 parents b3b91f5 + f6a1cfa commit 4e139e6

File tree

3 files changed

+9
-6
lines changed

3 files changed

+9
-6
lines changed

ui/arduino/main.css

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -652,6 +652,7 @@ button.small .icon {
652652
transition: all 0.25s;
653653
pointer-events: none;
654654
opacity: 0;
655+
text-align: center;
655656
}
656657

657658
#overlay.open {

ui/arduino/store.js

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1197,16 +1197,16 @@ async function store(state, emitter) {
11971197
if (file.type == 'folder') {
11981198
await uploadFolder(
11991199
srcPath, destPath,
1200-
(e) => {
1201-
state.transferringProgress = e
1200+
(progress, fileName) => {
1201+
state.transferringProgress = `${fileName}: ${progress}`
12021202
emitter.emit('render')
12031203
}
12041204
)
12051205
} else {
12061206
await serial.uploadFile(
12071207
srcPath, destPath,
1208-
(e) => {
1209-
state.transferringProgress = e
1208+
(progress) => {
1209+
state.transferringProgress = `${file.fileName}: ${progress}`
12101210
emitter.emit('render')
12111211
}
12121212
)
@@ -1521,7 +1521,9 @@ async function uploadFolder(srcPath, destPath, dataConsumer) {
15211521
await serial.uploadFile(
15221522
disk.getFullPath(srcPath, relativePath, ''),
15231523
serial.getFullPath(destPath, relativePath, ''),
1524-
dataConsumer
1524+
(progress) => {
1525+
dataConsumer(progress, relativePath.slice(1))
1526+
}
15251527
)
15261528
}
15271529
}

ui/arduino/views/components/overlay.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ function Overlay(state, emit) {
1010
if (state.isConnecting) overlay = html`<div id="overlay" class="open"><p>Connecting...</p></div>`
1111
if (state.isLoadingFiles) overlay = html`<div id="overlay" class="open"><p>Loading files...</p></div>`
1212
if (state.isSaving) overlay = html`<div id="overlay" class="open"><p>Saving file... ${state.savingProgress}</p></div>`
13-
if (state.isTransferring) overlay = html`<div id="overlay" class="open"><p>Transferring file... ${state.transferringProgress}</p></div>`
13+
if (state.isTransferring) overlay = html`<div id="overlay" class="open"><p>Transferring file<br><br>${state.transferringProgress}</p></div>`
1414

1515
return overlay
1616
}

0 commit comments

Comments
 (0)