WapplerSystems/meilisearch
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

zwischenstand

Browse Source
This commit is contained in:
Sven Wappler
2021-04-29 18:33:05 +02:00
parent 2c9e27b3b7
commit 0ee2fae261
264 changed files with 263 additions and 21253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Classes/Report/AccessFilterPluginInstalledStatus.php
View File

@@ -25,7 +25,7 @@ namespace WapplerSystems\Meilisearch\Report;
***************************************************************/
use WapplerSystems\Meilisearch\ConnectionManager;
use WapplerSystems\Meilisearch\System\Meilisearch\Service\MeilisearchAdminService;
use WapplerSystems\Meilisearch\System\Meilisearch\Service\MeilisearchService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Reports\Status;
@@ -87,10 +87,10 @@ class AccessFilterPluginInstalledStatus extends AbstractMeilisearchStatus
/**
* Checks whether the Meilisearch plugin is installed.
*
* @param MeilisearchAdminService $adminService
* @param MeilisearchService $adminService
* @return null|\TYPO3\CMS\Reports\Status
*/
protected function checkPluginInstallationStatus(MeilisearchAdminService $adminService)
protected function checkPluginInstallationStatus(MeilisearchService $adminService)
{
if ($this->isPluginInstalled($adminService)) {
return null;
@@ -111,10 +111,10 @@ class AccessFilterPluginInstalledStatus extends AbstractMeilisearchStatus
/**
* Checks whether the Meilisearch plugin version is up to date.
*
* @param MeilisearchAdminService $adminService
* @param MeilisearchService $adminService
* @return null|\TYPO3\CMS\Reports\Status
*/
protected function checkPluginVersion(MeilisearchAdminService $adminService)
protected function checkPluginVersion(MeilisearchService $adminService)
{
if (!($this->isPluginInstalled($adminService) && $this->isPluginOutdated($adminService))) {
return null;
@@ -137,10 +137,10 @@ class AccessFilterPluginInstalledStatus extends AbstractMeilisearchStatus
* Checks whether the Access Filter Query Parser Plugin is installed for
* the given Meilisearch server instance.
*
* @param MeilisearchAdminService $adminService
* @param MeilisearchService $adminService
* @return bool True if the plugin is installed, FALSE otherwise.
*/
protected function isPluginInstalled(MeilisearchAdminService $adminService)
protected function isPluginInstalled(MeilisearchService $adminService)
{
$accessFilterQueryParserPluginInstalled = false;
@@ -155,10 +155,10 @@ class AccessFilterPluginInstalledStatus extends AbstractMeilisearchStatus
/**
* Checks whether the installed plugin is current.
*
* @param MeilisearchAdminService $adminService
* @param MeilisearchService $adminService
* @return bool True if the plugin is outdated, FALSE if it meets the current version recommendation.
*/
protected function isPluginOutdated(MeilisearchAdminService $adminService)
protected function isPluginOutdated(MeilisearchService $adminService)
{
$pluginVersion = $this->getInstalledPluginVersion($adminService);
$pluginVersionOutdated = version_compare($pluginVersion, self::RECOMMENDED_PLUGIN_VERSION, '<');
@@ -169,10 +169,10 @@ class AccessFilterPluginInstalledStatus extends AbstractMeilisearchStatus
/**
* Gets the version of the installed plugin.
*
* @param MeilisearchAdminService $adminService
* @param MeilisearchService $adminService
* @return string The installed plugin's version number.
*/
public function getInstalledPluginVersion(MeilisearchAdminService $adminService)
public function getInstalledPluginVersion(MeilisearchService $adminService)
{
$pluginsInformation = $adminService->getPluginsInformation();

24
Classes/Report/MeilisearchStatus.php
View File

@@ -27,7 +27,7 @@ namespace WapplerSystems\Meilisearch\Report;
use WapplerSystems\Meilisearch\ConnectionManager;
use WapplerSystems\Meilisearch\Domain\Site\SiteRepository;
use WapplerSystems\Meilisearch\PingFailedException;
use WapplerSystems\Meilisearch\System\Meilisearch\Service\MeilisearchAdminService;
use WapplerSystems\Meilisearch\System\Meilisearch\Service\MeilisearchService;
use TYPO3\CMS\Core\Utility\GeneralUtility;
use TYPO3\CMS\Fluid\View\StandaloneView;
use TYPO3\CMS\Reports\Status;
@@ -111,7 +111,7 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
$meilisearchAdmin = $this->connectionManager
->getMeilisearchConnectionForNode($meilisearchConnection['read'], $meilisearchConnection['write'])
->getAdminService();
->getService();
$meilisearchVersion = $this->checkMeilisearchVersion($meilisearchAdmin);
$accessFilter = $this->checkAccessFilter($meilisearchAdmin);
@@ -147,10 +147,10 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
/**
* Checks the meilisearch version and adds it to the report.
*
* @param MeilisearchAdminService $meilisearch
* @param MeilisearchService $meilisearch
* @return string meilisearch version
*/
protected function checkMeilisearchVersion(MeilisearchAdminService $meilisearch)
protected function checkMeilisearchVersion(MeilisearchService $meilisearch)
{
try {
$meilisearchVersion = $this->formatMeilisearchVersion($meilisearch->getMeilisearchServerVersion());
@@ -165,10 +165,10 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
/**
* Checks the access filter setup and adds it to the report.
*
* @param MeilisearchAdminService $meilisearchAdminService
* @param MeilisearchService $meilisearchAdminService
* @return string
*/
protected function checkAccessFilter(MeilisearchAdminService $meilisearchAdminService)
protected function checkAccessFilter(MeilisearchService $meilisearchAdminService)
{
try {
$accessFilterPluginStatus = GeneralUtility::makeInstance(AccessFilterPluginInstalledStatus::class);
@@ -184,10 +184,10 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
/**
* Checks the ping time and adds it to the report.
*
* @param MeilisearchAdminService $meilisearchAdminService
* @param MeilisearchService $meilisearchAdminService
* @return string
*/
protected function checkPingTime(MeilisearchAdminService $meilisearchAdminService)
protected function checkPingTime(MeilisearchService $meilisearchAdminService)
{
try {
$pingQueryTime = $meilisearchAdminService->getPingRoundTripRuntime();
@@ -202,10 +202,10 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
/**
* Checks the meilisearch config name and adds it to the report.
*
* @param MeilisearchAdminService $meilisearchAdminService
* @param MeilisearchService $meilisearchAdminService
* @return string
*/
protected function checkMeilisearchConfigName(MeilisearchAdminService $meilisearchAdminService)
protected function checkMeilisearchConfigName(MeilisearchService $meilisearchAdminService)
{
try {
$meilisearchConfigMessage = $meilisearchAdminService->getMeilisearchconfigName();
@@ -220,10 +220,10 @@ class MeilisearchStatus extends AbstractMeilisearchStatus
/**
* Checks the meilisearch schema name and adds it to the report.
*
* @param MeilisearchAdminService $meilisearchAdminService
* @param MeilisearchService $meilisearchAdminService
* @return string
*/
protected function checkMeilisearchSchemaName(MeilisearchAdminService $meilisearchAdminService)
protected function checkMeilisearchSchemaName(MeilisearchService $meilisearchAdminService)
{
try {
$meilisearchSchemaMessage = $meilisearchAdminService->getSchema()->getName();

2
Classes/Report/SchemaStatus.php
View File

@@ -65,7 +65,7 @@ class SchemaStatus extends AbstractMeilisearchStatus
$meilisearchConnections = $connectionManager->getAllConnections();
foreach ($meilisearchConnections as $meilisearchConnection) {
$adminService = $meilisearchConnection->getAdminService();
$adminService = $meilisearchConnection->getService();
/** @var $meilisearchConnection MeilisearchConnection */
if (!$adminService->ping()) {
$url = $adminService->__toString();