mummert/meilisearch-bundle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bugfix

Browse Source
This commit is contained in:
Jürgen Mummert
2025-12-26 22:18:55 +01:00
parent 640cccc928
commit 4cd1913079
1 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/EventListener/IndexPageListener.php
+33 -22
View File
@@ -3,22 +3,24 @@
namespace MummertMedia\ContaoMeilisearchBundle\EventListener; namespace MummertMedia\ContaoMeilisearchBundle\EventListener;
use Contao\Config; use Contao\Config;
use Contao\System;
use MummertMedia\ContaoMeilisearchBundle\Service\PdfIndexService; use MummertMedia\ContaoMeilisearchBundle\Service\PdfIndexService;
use MummertMedia\ContaoMeilisearchBundle\Service\OfficeIndexService; use MummertMedia\ContaoMeilisearchBundle\Service\OfficeIndexService;
class IndexPageListener class IndexPageListener
{ {
private ?PdfIndexService $pdfIndexService = null; public function __construct(
private ?OfficeIndexService $officeIndexService = null; private readonly PdfIndexService $pdfIndexService,
private readonly OfficeIndexService $officeIndexService,
) {}
public function onIndexPage(string $content, array &$data, array &$set): void public function onIndexPage(string $content, array &$data, array &$set): void
{ {
// ✅ IMMER: Service einmal pro Crawl holen + Tabelle einmal leeren /*
if ($this->pdfIndexService === null) { * =====================
$this->pdfIndexService = System::getContainer()->get(PdfIndexService::class); * PDF: Reset genau 1× pro Crawl
$this->pdfIndexService->resetTableOnce(); // darf NICHT von Checkboxen abhängen * =====================
} */
$this->pdfIndexService->resetTableOnce();
/* /*
* ===================== * =====================
@@ -70,7 +72,7 @@ class IndexPageListener
} }
/* /*
* IMAGEPATH * IMAGEPATH (UUID)
*/ */
$image = $image =
$parsed['event']['searchimage'] ?? null ?? $parsed['event']['searchimage'] ?? null ??
@@ -83,7 +85,7 @@ class IndexPageListener
} }
/* /*
* STARTDATE * STARTDATE (für Sortierung)
*/ */
$date = $date =
$parsed['event']['date'] ?? null ?? $parsed['event']['date'] ?? null ??
@@ -103,11 +105,11 @@ class IndexPageListener
* PDF-INDEXIERUNG (OPTIONAL) * PDF-INDEXIERUNG (OPTIONAL)
* ===================== * =====================
*/ */
$pdfEnabled = (bool) Config::get('meilisearch_index_pdfs'); if (
if ($pdfEnabled && (int) ($data['protected'] ?? 0) === 0) { (bool) Config::get('meilisearch_index_pdfs')
&& (int) ($data['protected'] ?? 0) === 0
) {
$pdfLinks = $this->findPdfLinks($content); $pdfLinks = $this->findPdfLinks($content);
if ($pdfLinks !== []) { if ($pdfLinks !== []) {
$this->pdfIndexService->handlePdfLinks($pdfLinks); $this->pdfIndexService->handlePdfLinks($pdfLinks);
} }
@@ -118,21 +120,20 @@ class IndexPageListener
* OFFICE-INDEXIERUNG (OPTIONAL) * OFFICE-INDEXIERUNG (OPTIONAL)
* ===================== * =====================
*/ */
$officeEnabled = (bool) Config::get('meilisearch_index_office'); if (
if ($officeEnabled && (int) ($data['protected'] ?? 0) === 0) { (bool) Config::get('meilisearch_index_office')
&& (int) ($data['protected'] ?? 0) === 0
if ($this->officeIndexService === null) { ) {
$this->officeIndexService = System::getContainer()->get(OfficeIndexService::class);
}
$officeLinks = $this->findOfficeLinks($content); $officeLinks = $this->findOfficeLinks($content);
if ($officeLinks !== []) { if ($officeLinks !== []) {
$this->officeIndexService->handleOfficeLinks($officeLinks); $this->officeIndexService->handleOfficeLinks($officeLinks);
} }
} }
} }
/**
* Extrahiert MEILISEARCH_JSON aus HTML-Kommentar
*/
private function extractMeilisearchJson(string $content): ?array private function extractMeilisearchJson(string $content): ?array
{ {
if (!preg_match('/<!--\s*MEILISEARCH_JSON\s*(\{.*?\})\s*-->/s', $content, $m)) { if (!preg_match('/<!--\s*MEILISEARCH_JSON\s*(\{.*?\})\s*-->/s', $content, $m)) {
@@ -145,6 +146,11 @@ class IndexPageListener
return is_array($data) ? $data : null; return is_array($data) ? $data : null;
} }
/**
* Findet PDF-Links im Content
*
* @return array<int,array{url:string,linkText:?string}>
*/
private function findPdfLinks(string $content): array private function findPdfLinks(string $content): array
{ {
if (!preg_match_all( if (!preg_match_all(
@@ -167,6 +173,11 @@ class IndexPageListener
return $result; return $result;
} }
/**
* Findet Office-Links (docx, xlsx, pptx) im Content
*
* @return array<int,array{url:string,linkText:?string}>
*/
private function findOfficeLinks(string $content): array private function findOfficeLinks(string $content): array
{ {
if (!preg_match_all( if (!preg_match_all(