Skip to content
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

Jump to bottom

Adding a progress bar for CLOUD BUILD progress #3081

Merged
merged 2 commits into from
Nov 14, 2022
Merged

Adding a progress bar for CLOUD BUILD progress #3081

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cadbc1f
Adding simple progress bar for build request
blckmn Nov 14, 2022
e846562
Adding language support.
blckmn Nov 14, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
20 changes: 19 additions & 1 deletion locales/en/messages.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3072,7 +3072,7 @@
"message": "Select commit"
},
"firmwareFlasherReleaseSummaryHead": {
"message": "Release info"
"message": "Release and Build info"
},
"firmwareFlasherReleaseManufacturer": {
"message": "Manufacturer ID:"
Expand Down Expand Up @@ -3104,6 +3104,24 @@
"firmwareFlasherCloudBuildStatus": {
"message": "Status:"
},
"firmwareFlasherCloudBuildPending": {
"message": "pending"
},
"firmwareFlasherCloudBuildProcessing": {
"message": "processing"
},
"firmwareFlasherCloudBuildSuccessCached": {
"message": "success (cached)"
},
"firmwareFlasherCloudBuildSuccess": {
"message": "success"
},
"firmwareFlasherCloudBuildTimedOut": {
"message": "timed out (please retry)"
},
"firmwareFlasherCloudBuildFailed": {
"message": "failed (please check log)"
},
"firmwareFlasherReleaseFileUrl": {
"message": "Download manually."
},
Expand Down
6 changes: 5 additions & 1 deletion src/css/dark-theme.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -354,7 +354,11 @@ button {
}
.release_info {
.target {
color: #98ddff;
color: white;
}
.buildProgress {
border: 1px solid var(--subtleAccent);
border-radius: 2px;
}
}
.cf_table {
Expand Down
30 changes: 20 additions & 10 deletions src/js/tabs/firmware_flasher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -772,11 +772,12 @@ firmware_flasher.initialize = function (callback) {
i18n.localizePage();
}

function updateStatus(status, key) {
if (status === 'success' || status === 'fail') {
$('div.release_info #cloudTargetLog').text('Build Log').prop('href', `https://build.betaflight.com/api/builds/${key}/log`);
function updateStatus(status, key, val, showLog) {
if (showLog === true) {
$('div.release_info #cloudTargetLog').text(i18n.getMessage(`firmwareFlasherCloudBuildLogUrl`)).prop('href', `https://build.betaflight.com/api/builds/${key}/log`);
}
$('div.release_info #cloudTargetStatus').text(status);
$('div.release_info #cloudTargetStatus').text(i18n.getMessage(`firmwareFlasherCloudBuild${status}`));
$('.buildProgress').val(val);
}

function requestCloudBuild(summary) {
Expand Down Expand Up @@ -817,35 +818,44 @@ firmware_flasher.initialize = function (callback) {

analytics.setFirmwareData(analytics.DATA.FIRMWARE_NAME, info.file);

let retries = 0;
updateStatus('Pending', info.key, 0, false);
let retries = 1;
self.releaseLoader.requestBuildStatus(info.key, (status) => {
if (status.status !== "queued") {
updateStatus(status.status, info.key);
// will be cached already, no need to wait.
if (status.status === 'success') {
updateStatus('SuccessCached', info.key, 100, true);
$('.buildProgress').val(100);
self.releaseLoader.loadTargetHex(info.url, (hex) => onLoadSuccess(hex, info.file), onLoadFailed);
} else {
updateStatus('Failed', info.key, 0, true);
onLoadFailed();
}
return;
}

const timer = setInterval(() => {
self.releaseLoader.requestBuildStatus(info.key, (status) => {
if (status.status !== 'queued' || retries > 8) {
updateStatus(status.status, info.key);
if (status.status !== 'queued' || retries > 10) {
clearInterval(timer);
if (status.status === 'success') {
updateStatus('Success', info.key, 100, true);
self.releaseLoader.loadTargetHex(info.url, (hex) => onLoadSuccess(hex, info.file), onLoadFailed);
} else {
if (retries > 10) {
updateStatus('TimedOut', info.key, 0, true);
} else {
updateStatus('Failed', info.key, 0, true);
}
onLoadFailed();
}
return;
}
updateStatus(`${status.status} (${retries})`, info.key);

updateStatus('Processing', info.key, retries * 10, false);
retries = retries + 1;
});
}, 5000);
}, 4000);
});
}, onLoadFailed);
}
Expand Down
7 changes: 5 additions & 2 deletions src/tabs/firmware_flasher.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,11 +244,14 @@
<a i18n_title="firmwareFlasherCloudBuildLogUrl" id="cloudTargetLog" href="#" target="_blank"></a>
<br />
<strong i18n="firmwareFlasherCloudBuildStatus"></strong>
<progress class="buildProgress" value="0" min="0" max="100"></progress>
<span id="cloudTargetStatus"></span>
<br />
</div>
<strong i18n="firmwareFlasherReleaseNotes"></strong>
<div class=notes></div>
<div class="margin-bottom">
<strong i18n="firmwareFlasherReleaseNotes"></strong>
<div class=notes></div>
</div>
</div>
</div>

Expand Down