Create a customized myers diff based system for snip content

This commit is contained in:
Tim
2025-04-14 23:25:11 +02:00
parent a18eda6748
commit 2db9c5f1d9
8 changed files with 317 additions and 88 deletions

View File

@ -7,8 +7,8 @@ use App\Form\ConfirmationType;
use App\Form\SnipType;
use App\Repository\SnipRepository;
use App\Security\Voter\SnipVoter;
use App\Service\SnipContent\SnipContentService;
use App\Service\SnipParser\Pipeline;
use App\Service\SnipServiceFactory;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\Form\Extension\Core\Type\SubmitType;
use Symfony\Component\HttpFoundation\Request;
@ -20,10 +20,8 @@ class SnipController extends AbstractController
{
public function __construct(
private readonly SnipRepository $repository,
private readonly SnipServiceFactory $snipServiceFactory,
)
{
}
private readonly SnipContentService $contentService,
) {}
#[Route('/', name: '_index')]
public function index(): Response
@ -48,11 +46,9 @@ class SnipController extends AbstractController
{
$this->denyAccessUnlessGranted(SnipVoter::VIEW, $snip);
$snipService = $this->snipServiceFactory->create($snip);
return $this->render('snip/single.html.twig', [
'snip' => $snip,
'content' => $pl->parse($snipService->getActiveText()),
'content' => $pl->parse($this->contentService->getActiveText($snip)),
]);
}
@ -62,7 +58,7 @@ class SnipController extends AbstractController
$this->denyAccessUnlessGranted(SnipVoter::VIEW, $snip);
$response = new Response(
$pl->clean($this->snipServiceFactory->create($snip)->getActiveText()),
$pl->clean($this->contentService->getActiveText($snip)),
Response::HTTP_OK,
['Content-Type' => 'text/html']
);
@ -70,7 +66,8 @@ class SnipController extends AbstractController
->setVary(['Accept', 'Accept-Encoding'])
->setEtag(md5($response->getContent()))
->setTtl(3600)
->setClientTtl(300);
->setClientTtl(300)
;
if (!$request->isNoCache()) {
$response->isNotModified($request);
@ -87,13 +84,13 @@ class SnipController extends AbstractController
$form = $this->createForm(SnipType::class, $snip);
$form->add('Save', SubmitType::class);
if ($snip->getId()) {
$form->get('content')->setData($this->snipServiceFactory->create($snip)->getActiveText());
$form->get('content')->setData($this->contentService->getActiveText($snip));
}
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->repository->save($snip);
$this->snipServiceFactory->create($snip)->update($form->get('content')->getData());
$this->contentService->update($snip, $form->get('content')->getData());
$this->addFlash('success', sprintf('Snip "%s" saved', $snip));
@ -113,7 +110,8 @@ class SnipController extends AbstractController
{
$snip = new Snip();
$snip->setCreatedAtNow()
->setCreatedBy($this->getUser());
->setCreatedBy($this->getUser())
;
return $this->edit($snip, $request);
}
@ -126,7 +124,7 @@ class SnipController extends AbstractController
$form = $this->createForm(ConfirmationType::class);
$form->handleRequest($request);
if ($form->isSubmitted() && $form->isValid()) {
$this->snipServiceFactory->create($snip)->delete();
$this->contentService->delete($snip);
$this->repository->remove($snip);
$this->addFlash('success', sprintf('Snip "%s" deleted', $snip));
return $this->redirectToRoute('snip_index');

View File

@ -5,7 +5,7 @@ namespace App\Controller;
use App\Entity\Snip;
use App\Entity\SnipContent;
use App\Security\Voter\SnipVoter;
use App\Service\SnipServiceFactory;
use App\Service\SnipContent\SnipContentService;
use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
use Symfony\Component\HttpFoundation\Response;
use Symfony\Component\Routing\Attribute\Route;
@ -14,7 +14,7 @@ use Symfony\Component\Routing\Attribute\Route;
class VersionController extends AbstractController
{
public function __construct(
private readonly SnipServiceFactory $snipServiceFactory,
private readonly SnipContentService $contentService,
) {}
#[Route('/', name: '_index')]
@ -32,7 +32,7 @@ class VersionController extends AbstractController
{
$this->denyAccessUnlessGranted(SnipVoter::EDIT, $snip);
$this->snipServiceFactory->create($snip)->setVersion($version);
$this->contentService->setVersion($snip, $version);
$this->addFlash('success', 'Snip version set to ' . $version->getId());
return $this->redirectToRoute('snip_single', ['snip' => $snip->getId()]);
}