Compare commits

..

No commits in common. "18650ba7ad03821205b19f18f7cca0bb8921f033" and "6f162102ef7ceca41822d18c3e694abd926f550b" have entirely different histories.

3 changed files with 18 additions and 70 deletions

View File

@ -10,14 +10,7 @@ use Log;
abstract class BaseCompiler implements Responsable abstract class BaseCompiler implements Responsable
{ {
public function __construct(protected ?File $file = null) protected File $file;
{
}
public static function fromFile(string $file): static
{
return new static(new File($file, false));
}
public function compile(Document $document): self public function compile(Document $document): self
{ {
@ -28,7 +21,7 @@ abstract class BaseCompiler implements Responsable
if ($document->template()) { if ($document->template()) {
$templatePath = $document->template()->fullPath(); $templatePath = $document->template()->fullPath();
exec('rsync -av ' . escapeshellarg($templatePath) . '/ ' . escapeshellarg($this->file->getPath())); exec('rsync -av '.escapeshellarg($templatePath).'/ '.escapeshellarg($this->file->getPath()));
} }
exec($this->command($document), $output, $returnVar); exec($this->command($document), $output, $returnVar);
@ -48,41 +41,15 @@ abstract class BaseCompiler implements Responsable
return $this; return $this;
} }
/**
* @param array<int, Documents> $documents
*/
public function merge(array $documents): self
{
$outfile = '/tmp/' . Str::uuid()->toString() . '.pdf';
$paths = array_map(fn ($document) => static::compile($document)->getPath(), $documents);
$command = collect([
'pdfjam --nup 1x1 --outfile ' . $outfile,
...array_map(fn ($path) => escapeshellarg($path), $paths),
])->implode(' ');
exec($command, $output, $returnVar);
foreach ($paths as $path) {
@unlink($path);
}
if (0 !== $returnVar) {
Log::error('Merging failed', ['output' => $output]);
throw (new CompilerException('Compilation failed.'))->setOutput($output);
}
return static::fromFile($outfile);
}
public function storeAs(string $directory, string $name, string $disk): string public function storeAs(string $directory, string $name, string $disk): string
{ {
$contents = $this->file->getContent(); $contents = $this->file->getContent();
Storage::disk($disk)->put($directory . '/' . $name, $contents); Storage::disk($disk)->put($directory.'/'.$name, $contents);
$this->cleanup(); $this->cleanup();
return $directory . '/' . $name; return $directory.'/'.$name;
} }
public function storeIn(string $directory, string $disk): string public function storeIn(string $directory, string $disk): string
@ -105,9 +72,9 @@ abstract class BaseCompiler implements Responsable
protected function prepareForCompilation(Document $document): void protected function prepareForCompilation(Document $document): void
{ {
$workDir = '/tmp/' . Str::uuid()->toString(); $workDir = '/tmp/'.Str::random(32);
mkdir($workDir, 0777, true); mkdir($workDir, 0777, true);
$this->file = new File($workDir . '/' . $document->compiledFilename(), false); $this->file = new File($workDir.'/'.$document->compiledFilename(), false);
} }
private function refreshFile(): void private function refreshFile(): void
@ -118,14 +85,14 @@ abstract class BaseCompiler implements Responsable
private function command(Document $document): string private function command(Document $document): string
{ {
return collect([ return collect([
'cd ' . escapeshellarg($this->file->getPath()), 'cd '.escapeshellarg($this->file->getPath()),
$document->getEngine()->binary() . ' --halt-on-error ' . escapeshellarg($document->filename()), $document->getEngine()->binary().' --halt-on-error '.escapeshellarg($document->filename()),
$document->getEngine()->binary() . ' --halt-on-error ' . escapeshellarg($document->filename()), $document->getEngine()->binary().' --halt-on-error '.escapeshellarg($document->filename()),
])->implode(' && '); ])->implode(' && ');
} }
private function cleanup(): void private function cleanup(): void
{ {
exec('rm -R ' . $this->file->getPath()); exec('rm -R '.$this->file->getPath());
} }
} }

View File

@ -8,9 +8,8 @@ use PHPUnit\Framework\Assert;
use ReflectionClass; use ReflectionClass;
use ReflectionMethod; use ReflectionMethod;
use ReflectionProperty; use ReflectionProperty;
use Spatie\LaravelData\Data;
abstract class Document extends Data abstract class Document
{ {
abstract public function basename(): string; abstract public function basename(): string;
@ -36,15 +35,6 @@ abstract class Document extends Data
); );
} }
public function assertIsContent(string $content): void
{
Assert::assertEquals(
$content,
$this->renderBody(),
"Failed asserting that Content is {$content}"
);
}
/** /**
* @param array<int, string> $content * @param array<int, string> $content
*/ */
@ -90,12 +80,12 @@ abstract class Document extends Data
public function filename(): string public function filename(): string
{ {
return $this->basename() . '.tex'; return $this->basename().'.tex';
} }
public function compiledFilename(): string public function compiledFilename(): string
{ {
return $this->basename() . '.pdf'; return $this->basename().'.pdf';
} }
/** /**

View File

@ -22,21 +22,12 @@ trait FakesCompilation
Assert::assertFalse( Assert::assertFalse(
$compilations->isEmpty(), $compilations->isEmpty(),
'The TeX Document "' . $documentClass . '" has not been compiled.' 'The TeX Document "'.$documentClass.'" has not been compiled.'
); );
$validDocuments = $compilations->filter(fn ($compilation) => $check($compilation)); $validDocuments = $compilations->filter(fn ($compilation) => $check($compilation));
Assert::assertNotEmpty($validDocuments, 'Failed that TeX Document "' . $documentClass . '" has been compiled with given check.'); Assert::assertNotEmpty($validDocuments, 'Failed that TeX Document "'.$documentClass.'" has been compiled with given check.');
}
/**
* @param class-string<Document> $documentClass
* @param callable(Document): bool $check
*/
public function assertCompiledContent(string $documentClass, string $content): void
{
$this->assertCompiled($documentClass, fn ($document) => $document->renderBody() === $content);
} }
/** /**
@ -48,7 +39,7 @@ trait FakesCompilation
Assert::assertTrue( Assert::assertTrue(
$compilations->isEmpty(), $compilations->isEmpty(),
'The TeX Document "' . $documentClass . '" should not have been compiled.' 'The TeX Document "'.$documentClass.'" should not have been compiled.'
); );
} }