mirror
/
OpenDroneMap-NodeODM
kopia lustrzana https://github.com/OpenDroneMap/NodeODM
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Progress simplified to global progress only, drop stages reporting

pull/82/head
Piero Toffanin 2019-05-19 16:58:45 -04:00
rodzic 3ef22efb2c
commit 52156b18de
6 zmienionych plików z 901 dodań i 975 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1780
index.js
Wyświetl plik

Plik diff jest za duży Load Diff

9
libs/ProgressReceiver.js
Wyświetl plik

@ -31,15 +31,14 @@ module.exports = class ProgressReceiver{
server.on('message', (msg) => {
const parts = String(msg).split("/");
if (parts.length === 6){
if (parts.length === 4){
const cmd = parts[0];
if (cmd === 'PGUP'){
let [_, pid, uuid, globalProgress, stageProgress, stage] = parts;
let [_, pid, uuid, globalProgress] = parts;
globalProgress = parseFloat(globalProgress);
stageProgress = parseFloat(stageProgress);
if (!isNaN(globalProgress) && !isNaN(stageProgress)){
this.callbacks.forEach(callback => callback(uuid, globalProgress, stageProgress, stage));
if (!isNaN(globalProgress)){
this.callbacks.forEach(callback => callback(uuid, globalProgress));
}
}
}

62
libs/Task.js
Wyświetl plik

@ -83,19 +83,6 @@ module.exports = class Task{
cb(null);
}
});
},
// Populate stage progress
cb => {
odmInfo.getPipelineStages((err, pstages) => {
if (!err) this.stages = pstages.map(ps => { return {
id: ps,
status: statusCodes.QUEUED,
progress: 0
}});
else this.stages = [];
cb();
});
}
], err => {
done(err, this);
@ -103,9 +90,6 @@ module.exports = class Task{
}
static CreateFromSerialized(taskJson, done){
// TODO: serialize progress
// TODO: on task start, reset progress
// TODO: handle on complete, on fail, on cancel progress update
new Task(taskJson.uuid,
taskJson.name,
taskJson.options,
@ -181,47 +165,14 @@ module.exports = class Task{
}
}
updateProgress(globalProgress, stageProgress, stage){
updateProgress(globalProgress){
globalProgress = Math.min(100, Math.max(0, globalProgress));
stageProgress = Math.min(100, Math.max(0, stageProgress));
// Progress updates are asynchronous (via UDP)
// so things could be out of order. We ignore all progress
// updates that are lower than what we might have previously received.
if (globalProgress >= this.progress){
this.progress = globalProgress;
// Process only if we don't know what the stages are
if (this.stages.length){
let i = 0;
for (i = 0; i < this.stages.length; i++){
let s = this.stages[i];
if (s.id === stage){
// Update progress
s.progress = stageProgress;
// If this one completed, make sure previous stages are also completed
// and that the next stage (if any) is running
if (stageProgress === 100){
s.status = statusCodes.COMPLETED;
for (let j = i; j >= 0; j--){
this.stages[j].status = s.status;
this.stages[j].progress = 100
}
if (i < this.stages.length - 1){
this.stages[i + 1].status = statusCodes.RUNNING;
this.stages[i + 1].progress = 0
}
}else{
s.status = statusCodes.RUNNING;
}
return;
}
}
// This should never happen
logger.warn(`Invalid progress update for stage: ${stage}|${globalProgress}|${stageProgress}`);
}
}
}
@ -286,6 +237,7 @@ module.exports = class Task{
// This will spawn a new process.
start(done){
const finished = err => {
this.updateProgress(100);
this.stopTrackingProcessingTime();
done(err);
};
@ -301,6 +253,7 @@ module.exports = class Task{
});
archive.on('finish', () => {
this.updateProgress(97);
// TODO: is this being fired twice?
done();
});
@ -372,8 +325,10 @@ module.exports = class Task{
}, (err, code, signal) => {
if (err) done(err);
else{
if (code === 0) done();
else done(new Error(`Process exited with code ${code}`));
if (code === 0){
this.updateProgress(93);
done();
}else done(new Error(`Process exited with code ${code}`));
}
}, output => {
this.output.push(output);
@ -526,8 +481,7 @@ module.exports = class Task{
status: this.status,
options: this.options,
imagesCount: this.images.length,
progress: this.progress,
stages: this.stages
progress: this.progress
};
}

4
libs/TaskManager.js
Wyświetl plik

@ -65,11 +65,11 @@ class TaskManager{
], done);
}
onProgressUpdate(uuid, globalProgress, stageProgress, stage){
onProgressUpdate(uuid, globalProgress){
const task = this.tasks[uuid];
// Keep 10% for special postprocessing step
if (task) task.updateProgress(globalProgress * 0.9, stageProgress, stage);
if (task) task.updateProgress(globalProgress * 0.9);
}
// Removes old tasks that have either failed, are completed, or

17
libs/odmInfo.js
Wyświetl plik

@ -135,23 +135,6 @@ module.exports = {
});
},
// Returns a list of stages that tasks go through
// In OpenDroneMap this is the same as the --rerun-from domain,
// plus a special "postprocess" step
getPipelineStages: function(done){
this.getOptions((err, odmOptions) => {
if (err) done(err);
else{
const rerunFrom = odmOptions.find(opt => opt.name === 'rerun-from' && opt.type === 'enum');
if (rerunFrom){
let stages = rerunFrom.domain.filter(d => d !== "");
stages.push("postprocess");
done(null, stages);
}else done(null, []);
}
});
},
// Checks that the options (as received from the rest endpoint)
// Are valid and within proper ranges.
// The result of filtering is passed back via callback

4
public/index.html
Wyświetl plik

@ -157,6 +157,10 @@
<span data-bind="css: 'statusIcon glyphicon ' + icon()"></span>
<div data-bind="visible: info().status && info().status.code === 20" class="progress" style="margin-top: 12px;">
<div class="progress-bar progress-bar-info" role="progressbar" data-bind="text: parseInt(info().progress) + '%', style: {width: info().progress + '%'}"></div>
</div>
<div class="actionButtons">
<button data-bind="click: cancel, visible: showCancel()" type="button" class="btn btn-primary btn-sm">
<span class="glyphicon glyphicon-remove-circle"></span> Cancel