ardent/Snips
1
0
Fork 0
Code Issues 5 Pull Requests 1 Packages Projects Releases Wiki Activity

Integrate snipContent more tightly into snip and cleanup old code

Browse Source
This commit is contained in:
Tim
2023-12-20 22:37:06 +01:00
parent 64bd7e3642
commit 5624fc3a74
9 changed files with 67 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Service/SnipContent/SnipContentService.php
View File

@ -28,7 +28,7 @@ readonly class SnipContentService
$this->em->persist($content);
$this->em->flush();
$this->snip->setActiveCommit($content->getId());
$this->snip->setActiveVersion($content->getId());
$this->em->persist($this->snip);
$this->em->flush();
}
@ -37,38 +37,18 @@ readonly class SnipContentService
public function getActiveText(): string
{
$contentRepo = $this->em->getRepository(SnipContent::class);
return $contentRepo->find($this->snip->getActiveCommit())->getText();
return $contentRepo->find($this->snip->getActiveVersion())->getText();
}
/** @return array{id: string, name: string} */
public function getVersions(): array
public function setVersion(SnipContent $version): void
{
// Return all snipContent entities (by parent)
return array_map(fn(SnipContent $content) => [
'id' => (string)$content->getId(),
'name' => $content->getId()->getDateTime()->format('Y-m-d H:i:s'),
], $this->snip->getSnipContents()->toArray());
}
public function setVersion(string $version): void
{
$this->snip->setActiveCommit($version);
$this->snip->setActiveVersion($version);
$this->em->persist($this->snip);
$this->em->flush();
}
public function getActiveVersion(): string
{
return $this->snip->getActiveCommit();
}
public function delete(): void
{
// Cleanup the versions
}
public function getLatestVersion(): string
{
return $this->snip->getSnipContents()->last()->getId();
}
}

2
src/Service/SnipParser/Stages/IncludeReferenceStage.php
View File

@ -41,7 +41,7 @@ class IncludeReferenceStage implements StageInterface
} else {
$snip = $this->snipRepository->find($id);
if ($snip) {
$content = $this->snipContentRepository->find($snip->getActiveCommit());
$content = $this->snipContentRepository->find($snip->getActiveVersion());
}
}
if ($content === null) {