This commit is contained in:
Guillaume Marteau 2024-06-27 15:30:47 +02:00
parent 28110acedd
commit 819a058345

View file

@ -38,53 +38,12 @@ public function __construct(ProjectMosaic $mosaic)
/**
* Execute the job.
*/
public function handleNew(): void
{
//$weeksAgo = ProjectReport::weeksAgoForYearAndWeek($this->mosaic->year, $this->mosaic->week);
//TODO change to end_date and offset
$projectFolder = base_path('../');
$command = [
sprintf('%sbuild_mosaic.sh', $projectFolder),
sprintf('--end_date=%s', $this->mosaic->end_date),
sprintf('--offset=%s', $this->mosaic->offset),
sprintf('--data_dir=%s', $this->mosaic->project->download_path),
];
$process = new Process($command);
$process->setTimeout(220);
$currentPath = '/usr/bin:/usr/gnu/bin:/usr/local/bin:/bin:/usr/bin/Users/mfolkerts/anaconda3/bin:/Library/Apple/usr/bin';
$process->setEnv(['PATH' => $currentPath.':/usr/local/Cellar/pandoc/3.1.8/bin/pandoc']);
// $process->setTimeout(36000); // stel een geschikte timeout in
$process->start();
try {
$myOutput = [];
$process->wait(function ($type, $buffer) use (&$myOutput) {
// $this->stream(to: 'processOutput', content: $buffer);
$myOutput[] = $buffer;
logger($buffer);
});
$this->processOutput = collect($myOutput)->join('\n');
$this->mosaic->setStatusSuccess();
} catch (ProcessFailedException $exception) {
echo $exception->getMessage();
$this->mosaic->setStatusFailed();
}
}
/**
* Execute the job.
*/
public function handle(): void
{
//$weeksAgo = ProjectReport::weeksAgoForYearAndWeek($this->mosaic->year, $this->mosaic->week);
$projectFolder = base_path('../');
$command = [
@ -111,32 +70,6 @@ public function handle(): void
}
}
// public static function handleFor(Project $project, $year, $startWeekNumber)
// {
// logger("ProjectMosiacGeneratorJob::handleFor(week $startWeekNumber, year $year)");
// if ($project->hasInvalidMosaicFor($year, $startWeekNumber)) {
// logger("ProjecMosaicGeneratorJob::handleFor(week $startWeekNumber, year $year): InvalidMosaic.");
// return new NullJob();
// }
//
// $mosaic = $project->mosaics()->updateOrCreate(
// [
// 'year' => $year,
// 'week' => $startWeekNumber,
// ],
// [
// 'name' => sprintf('Week %d, %d', $startWeekNumber, $year),
// 'path' => sprintf('%s/%s/%s',
// $project->download_path,
// 'mosaics',
// ProjectMosaic::getFilenameForYearAndWeek($year, $startWeekNumber)
// ),
// 'year' => $year,
// 'week' => $startWeekNumber,
// ]);
// return new self($mosaic);
// }
/**
* Check if the project has a mosaic for given period.
*/