Skip to content

added new files to export #237

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
pierotofy merged 1 commit into from
Jun 29, 2025
Merged

added new files to export #237

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
61 changes: 32 additions & 29 deletions libs/Task.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,10 +148,10 @@ module.exports = class Task{
}

static CreateFromSerialized(taskJson, done){
const task = new Task(taskJson.uuid,
taskJson.name,
const task = new Task(taskJson.uuid,
taskJson.name,
taskJson.options,
taskJson.webhook,
taskJson.webhook,
taskJson.skipPostProcessing,
taskJson.outputs,
taskJson.dateCreated);
Expand Down Expand Up @@ -200,7 +200,7 @@ module.exports = class Task{
}else{
return false; // Invalid
}

return path.join(this.getProjectFolderPath(), filename);
}

Expand All @@ -223,7 +223,7 @@ module.exports = class Task{

updateProgress(globalProgress){
globalProgress = Math.min(100, Math.max(0, globalProgress));

// 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.
Expand Down Expand Up @@ -279,7 +279,7 @@ module.exports = class Task{
// the process will immediately terminate.
// For eaxmple in the case of the ODM process, the process will continue running for a while
// This might need to be fixed on ODM's end.

// During testing, proc is undefined
if (proc) kill(proc.pid);
});
Expand All @@ -301,15 +301,15 @@ module.exports = class Task{
this.stopTrackingProcessingTime();
done(err);
};

const postProcess = () => {
const createZipArchive = (outputFilename, files) => {
return (done) => {
this.output.push(`Compressing ${outputFilename}\n`);

const zipFile = path.resolve(this.getAssetsArchivePath(outputFilename));
const sourcePath = !config.test ?
this.getProjectFolderPath() :
const sourcePath = !config.test ?
this.getProjectFolderPath() :
path.join("tests", "processing_results");

const pathsToArchive = [];
Expand Down Expand Up @@ -359,15 +359,15 @@ module.exports = class Task{

archive.pipe(output);
let globs = [];
const sourcePath = !config.test ?
this.getProjectFolderPath() :

const sourcePath = !config.test ?
this.getProjectFolderPath() :
path.join("tests", "processing_results");

// Process files and directories first
files.forEach(file => {
let filePath = path.join(sourcePath, file);

// Skip non-existing items
if (!fs.existsSync(filePath)) return;

Expand Down Expand Up @@ -415,7 +415,7 @@ module.exports = class Task{
return (done) => {
this.runningProcesses.push(
processRunner.runPostProcessingScript({
projectFolderPath: this.getProjectFolderPath()
projectFolderPath: this.getProjectFolderPath()
}, (err, code, _) => {
if (err) done(err);
else{
Expand All @@ -441,25 +441,28 @@ module.exports = class Task{
}

// All paths are relative to the project directory (./data/<uuid>/)
let allPaths = ['odm_orthophoto/odm_orthophoto.tif',
let allPaths = ['odm_orthophoto/odm_orthophoto.tif',
'odm_orthophoto/odm_orthophoto.tfw',
'odm_orthophoto/odm_orthophoto.png',
'odm_orthophoto/odm_orthophoto.wld',
'odm_orthophoto/odm_orthophoto.mbtiles',
'odm_orthophoto/odm_orthophoto.kmz',
'odm_orthophoto/odm_orthophoto_extent.dxf',
'odm_orthophoto/cutline.gpkg',
'odm_georeferencing', 'odm_texturing',
'odm_dem/dsm.tif', 'odm_dem/dtm.tif', 'dsm_tiles', 'dtm_tiles',
'odm_dem/dsm.euclideand.tif', 'odm_dem/dtm.euclideand.tif',
'orthophoto_tiles', 'potree_pointcloud', 'entwine_pointcloud',
'orthophoto_tiles', 'potree_pointcloud', 'entwine_pointcloud',
'3d_tiles',
'images.json', 'cameras.json',
'task_output.txt', 'log.json',
'odm_report'];

// Did the user request different outputs than the default?
if (this.outputs.length > 0) allPaths = this.outputs;

let tasks = [];

if (config.test){
if (config.testSkipOrthophotos){
logger.info("Test mode will skip orthophoto generation");
Expand All @@ -469,7 +472,7 @@ module.exports = class Task{
allPaths.splice(allPaths.indexOf(dir), 1);
});
}

if (config.testSkipDems){
logger.info("Test mode will skip DEMs generation");

Expand All @@ -490,7 +493,7 @@ module.exports = class Task{
}

}

// postprocess.sh is still here for legacy/backward compatibility
// purposes, but we might remove it in the future. The new logic
// instructs the processing engine to do the necessary processing
Expand All @@ -500,13 +503,13 @@ module.exports = class Task{
if (os.platform() !== "win32" && !this.skipPostProcessing){
tasks.push(runPostProcessingScript());
}

const taskOutputFile = path.join(this.getProjectFolderPath(), 'task_output.txt');
tasks.push(saveTaskOutput(taskOutputFile));

const archiveFunc = config.has7z ? createZipArchive : createZipArchiveLegacy;
tasks.push(archiveFunc('all.zip', allPaths));

// Upload to S3 all paths + all.zip file (if config says so)
if (S3.enabled()){
tasks.push((done) => {
Expand All @@ -516,8 +519,8 @@ module.exports = class Task{
}else{
s3Paths = ['all.zip'];
}
S3.uploadPaths(this.getProjectFolderPath(), config.s3Bucket, this.uuid, s3Paths,

S3.uploadPaths(this.getProjectFolderPath(), config.s3Bucket, this.uuid, s3Paths,
err => {
if (!err) this.output.push("Done uploading to S3!");
done(err);
Expand Down Expand Up @@ -664,14 +667,14 @@ module.exports = class Task{
getOutput(startFromLine = 0){
return this.output.slice(startFromLine, this.output.length);
}
// Reads the contents of the tasks's

// Reads the contents of the tasks's
// images.json and returns its JSON representation
readImagesDatabase(callback){
const imagesDbPath = !config.test ?
const imagesDbPath = !config.test ?
path.join(this.getProjectFolderPath(), 'images.json') :
path.join('tests', 'processing_results', 'images.json');

fs.readFile(imagesDbPath, 'utf8', (err, data) => {
if (err) callback(err);
else{
Expand All @@ -686,7 +689,7 @@ module.exports = class Task{
}

callWebhooks(){
// Hooks can be passed via command line
// Hooks can be passed via command line
// or for each individual task
const hooks = [this.webhook, config.webhook];

Expand Down
Loading