Skip to content

Show filename transfer #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 11, 2024
Merged

Show filename transfer #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
631bcfc
Show filename when transferring files
murilopolese Apr 25, 2024
c49a333
Merge branch 'development' into feature/show-filename-transfer
murilopolese Nov 7, 2024
f6a1cfa
Include file name on folder transfer
murilopolese Nov 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ui/arduino/main.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -652,6 +652,7 @@ button.small .icon {
transition: all 0.25s;
pointer-events: none;
opacity: 0;
text-align: center;
}

#overlay.open {
Expand Down
12 changes: 7 additions & 5 deletions ui/arduino/store.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 = e
(progress) => {
state.transferringProgress = `${file.fileName}: ${progress}`
emitter.emit('render')
}
)
Expand Down Expand Up @@ -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))
}
)
}
}
Expand Down
2 changes: 1 addition & 1 deletion ui/arduino/views/components/overlay.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}