Skip to content

Commit

Permalink
Merge pull request #285 from nextcloud/fix/noid/get-rid-ilogger
Browse files Browse the repository at this point in the history 
get rid of ILogger
  • Loading branch information
@ArtificialOwl
ArtificialOwl authored Sep 23, 2024
2 parents 6d61a85 + 0c1f73e commit c1687f3
Show file tree
Hide file tree
Showing 13 changed files with 110 additions and 686 deletions.
23 changes: 3 additions & 20 deletions lib/Command/Configure.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
use Exception;
use OC\Core\Command\Base;
use OCA\Files_FullTextSearch\Service\ConfigService;
use OCA\Files_FullTextSearch\Service\MiscService;
use Symfony\Component\Console\Input\InputArgument;
use Symfony\Component\Console\Input\InputInterface;
use Symfony\Component\Console\Output\OutputInterface;
Expand All @@ -45,26 +44,10 @@
* @package OCA\Files_FullTextSearch\Command
*/
class Configure extends Base {


/** @var ConfigService */
private $configService;

/** @var MiscService */
private $miscService;


/**
* Configure constructor.
*
* @param ConfigService $configService
* @param MiscService $miscService
*/
public function __construct(ConfigService $configService, MiscService $miscService) {
public function __construct(
private ConfigService $configService
) {
parent::__construct();

$this->configService = $configService;
$this->miscService = $miscService;
}


Expand Down
41 changes: 3 additions & 38 deletions lib/Controller/SettingsController.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,6 @@
use Exception;
use OCA\Files_FullTextSearch\AppInfo\Application;
use OCA\Files_FullTextSearch\Service\ConfigService;
use OCA\Files_FullTextSearch\Service\MiscService;
use OCA\Files_FullTextSearch\Service\SettingsService;
use OCP\App\IAppManager;
use OCP\AppFramework\Controller;
use OCP\AppFramework\Http;
use OCP\AppFramework\Http\DataResponse;
Expand All @@ -48,40 +45,11 @@
* @package OCA\Files_FullTextSearch\Controller
*/
class SettingsController extends Controller {


/** @var IAppManager */
private $appManager;

/** @var ConfigService */
private $configService;

/** @var SettingsService */
private $settingsService;

/** @var MiscService */
private $miscService;


/**
* SettingsController constructor.
*
* @param IRequest $request
* @param IAppManager $appManager
* @param ConfigService $configService
* @param SettingsService $settingsService
* @param MiscService $miscService
*/
public function __construct(
IRequest $request, IAppManager $appManager, ConfigService $configService,
SettingsService $settingsService,
MiscService $miscService
IRequest $request,
private ConfigService $configService,
) {
parent::__construct(Application::APP_ID, $request);
$this->appManager = $appManager;
$this->configService = $configService;
$this->settingsService = $settingsService;
$this->miscService = $miscService;
}


Expand All @@ -103,10 +71,7 @@ public function getSettingsAdmin(): DataResponse {
* @throws Exception
*/
public function setSettingsAdmin(array $data): DataResponse {
if ($this->settingsService->checkConfig($data)) {
$this->configService->setConfig($data);
}

$this->configService->setConfig($data);
return $this->getSettingsAdmin();
}
}
17 changes: 2 additions & 15 deletions lib/Db/CoreRequestBuilder.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@

use OC;
use OC\SystemConfig;
use OCA\Files_FullTextSearch\Service\MiscService;
use OCP\IDBConnection;
use Psr\Log\LoggerInterface;

Expand All @@ -45,21 +44,9 @@
class CoreRequestBuilder {
public const TABLE_SHARES = 'share';

protected string $defaultSelectAlias;

/** @var MiscService */
protected $miscService;

/** @var string */
protected $defaultSelectAlias;


/**
* CoreRequestBuilder constructor.
*
* @param MiscService $miscService
*/
public function __construct(MiscService $miscService) {
$this->miscService = $miscService;
public function __construct() {
}

/**
Expand Down
48 changes: 5 additions & 43 deletions lib/Listeners/ListenersCore.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@

namespace OCA\Files_FullTextSearch\Listeners;

use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc21\TNC21Logger;
use ArtificialOwl\MySmallPhpTools\Traits\TArrayTools;
use OC\AppFramework\Bootstrap\Coordinator;
use OCA\Files_FullTextSearch\Service\ConfigService;
use OCA\Files_FullTextSearch\Service\FilesService;
use OCA\Files_FullTextSearch\Service\MiscService;
use OCP\FullTextSearch\IFullTextSearchManager;
use OCP\IUserSession;

Expand All @@ -47,50 +45,14 @@
*/
class ListenersCore {
use TArrayTools;
use TNC21Logger;


/** @var IUserSession */
protected $userSession;

/** @var Coordinator */
protected $coordinator;

/** @var IFullTextSearchManager */
protected $fullTextSearchManager;

/** @var FilesService */
protected $filesService;

/** @var ConfigService */
protected $configService;

/** @var MiscService */
protected $miscService;


/**
* CoreFileEvents constructor.
*
* @param Coordinator $coordinator
* @param IUserSession $userSession
* @param IFullTextSearchManager $fullTextSearchManager
* @param FilesService $filesService
* @param ConfigService $configService
* @param MiscService $miscService
*/
public function __construct(
Coordinator $coordinator, IUserSession $userSession, IFullTextSearchManager $fullTextSearchManager,
FilesService $filesService, ConfigService $configService, MiscService $miscService
protected Coordinator $coordinator,
protected IUserSession $userSession,
protected IFullTextSearchManager $fullTextSearchManager,
protected FilesService $filesService,
protected ConfigService $configService
) {
$this->userSession = $userSession;
$this->coordinator = $coordinator;
$this->fullTextSearchManager = $fullTextSearchManager;
$this->filesService = $filesService;
$this->configService = $configService;
$this->miscService = $miscService;

$this->setup('app', 'files_fulltextsearch');
}


Expand Down
74 changes: 21 additions & 53 deletions lib/Provider/FilesProvider.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,14 @@

namespace OCA\Files_FullTextSearch\Provider;

use ArtificialOwl\MySmallPhpTools\Traits\Nextcloud\nc22\TNC22Logger;
use OC\FullTextSearch\Model\SearchOption;
use OC\FullTextSearch\Model\SearchTemplate;
use OC\User\NoUserException;
use OCA\Files_FullTextSearch\AppInfo\Application;
use OCA\Files_FullTextSearch\Exceptions\FileIsNotIndexableException;
use OCA\Files_FullTextSearch\Model\FilesDocument;
use OCA\Files_FullTextSearch\Service\ConfigService;
use OCA\Files_FullTextSearch\Service\ExtensionService;
use OCA\Files_FullTextSearch\Service\FilesService;
use OCA\Files_FullTextSearch\Service\MiscService;
use OCA\Files_FullTextSearch\Service\SearchService;
use OCP\Files\InvalidPathException;
use OCP\Files\NotFoundException;
Expand All @@ -57,55 +54,26 @@
use OCP\FullTextSearch\Model\ISearchResult;
use OCP\FullTextSearch\Model\ISearchTemplate;
use OCP\IL10N;
use Psr\Log\LoggerInterface;

/**
* Class FilesProvider
*
* @package OCA\Files_FullTextSearch\Provider
*/
class FilesProvider implements IFullTextSearchProvider {
use TNC22Logger;

public const FILES_PROVIDER_ID = 'files';


/** @var IL10N */
private $l10n;

/** @var ConfigService */
private $configService;

/** @var FilesService */
private $filesService;

/** @var SearchService */
private $searchService;

/** @var ExtensionService */
private $extensionService;

/** @var MiscService */
private $miscService;

/** @var IRunner */
private $runner;

/** @var IIndexOptions */
private $indexOptions;

private IRunner $runner;
private IIndexOptions $indexOptions;

public function __construct(
IL10N $l10n, ConfigService $configService, FilesService $filesService,
SearchService $searchService, ExtensionService $extensionService, MiscService $miscService
private IL10N $l10n,
private ConfigService $configService,
private FilesService $filesService,
private SearchService $searchService,
private ExtensionService $extensionService,
private LoggerInterface $logger,
) {
$this->l10n = $l10n;
$this->configService = $configService;
$this->filesService = $filesService;
$this->searchService = $searchService;
$this->extensionService = $extensionService;
$this->miscService = $miscService;

$this->setup('app', Application::APP_ID);
}


Expand All @@ -129,10 +97,10 @@ public function getName(): string {
* @return array
*/
public function getConfiguration(): array {
$this->debug('getConfiguration request');
$this->logger->debug('getConfiguration request');
$config = $this->configService->getConfig();
$this->extensionService->getConfig($config);
$this->debug('getConfiguration result', $config);
$this->logger->debug('getConfiguration result', ['config' => $config]);

return $config;
}
Expand Down Expand Up @@ -242,9 +210,9 @@ public function loadProvider() {
* @throws NotFoundException
*/
public function generateChunks(string $userId): array {
$this->debug('generateChunks request', ['userId' => $userId, 'options' => $this->indexOptions]);
$this->logger->debug('generateChunks request', ['userId' => $userId, 'options' => $this->indexOptions]);
$chunks = $this->filesService->getChunksFromUser($userId, $this->indexOptions);
$this->debug('generateChunks result', $chunks);
$this->logger->debug('generateChunks result', $chunks);

return $chunks;
}
Expand All @@ -262,9 +230,9 @@ public function generateChunks(string $userId): array {
* @throws NoUserException
*/
public function generateIndexableDocuments(string $userId, string $chunk): array {
$this->debug('generateIndexableDocuments request', ['userId' => $userId, 'chunk' => $chunk]);
$this->logger->debug('generateIndexableDocuments request', ['userId' => $userId, 'chunk' => $chunk]);
$documents = $this->filesService->getFilesFromUser($userId, $chunk);
$this->debug('generateIndexableDocuments result', ['documents' => count($documents)]);
$this->logger->debug('generateIndexableDocuments result', ['documents' => count($documents)]);

return $documents;
}
Expand All @@ -281,9 +249,9 @@ public function fillIndexDocument(IIndexDocument $document) {
'title' => $document->getPath()
]
);
$this->debug('fillIndexDocument request', ['document' => $document]);
$this->logger->debug('fillIndexDocument request', ['document' => $document]);
$this->filesService->generateDocument($document);
$this->debug('fillIndexDocument result', ['document' => $document]);
$this->logger->debug('fillIndexDocument result', ['document' => $document]);
}


Expand All @@ -293,9 +261,9 @@ public function fillIndexDocument(IIndexDocument $document) {
* @return bool
*/
public function isDocumentUpToDate(IIndexDocument $document): bool {
$this->debug('isDocumentUpToDate request', ['document' => $document]);
$this->logger->debug('isDocumentUpToDate request', ['document' => $document]);
$result = $this->filesService->isDocumentUpToDate($document);
$this->debug('isDocumentUpToDate result', ['document' => $document, 'result' => $result]);
$this->logger->debug('isDocumentUpToDate result', ['document' => $document, 'result' => $result]);

return $result;
}
Expand All @@ -310,9 +278,9 @@ public function isDocumentUpToDate(IIndexDocument $document): bool {
* @throws FileIsNotIndexableException
*/
public function updateDocument(IIndex $index): IIndexDocument {
$this->debug('updateDocument request', ['index' => $index]);
$this->logger->debug('updateDocument request', ['index' => $index]);
$document = $this->filesService->updateDocument($index);
$this->debug('updateDocument result', ['index' => $index, 'document' => $document]);
$this->logger->debug('updateDocument result', ['index' => $index, 'document' => $document]);
$this->updateRunnerInfo('info', $document->getMimetype());

return $document;
Expand Down
26 changes: 4 additions & 22 deletions lib/Service/ConfigService.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,28 +73,10 @@ class ConfigService {
self::FILES_OPEN_RESULT_DIRECTLY => '0'
];


/** @var IConfig */
private $config;

/** @var string */
private $userId;

/** @var MiscService */
private $miscService;


/**
* ConfigService constructor.
*
* @param IConfig $config
* @param string $userId
* @param MiscService $miscService
*/
public function __construct(IConfig $config, $userId, MiscService $miscService) {
$this->config = $config;
$this->userId = $userId;
$this->miscService = $miscService;
public function __construct(
private IConfig $config,
private ?string $userId
) {
}


Expand Down
Loading

0 comments on commit c1687f3

Please sign in to comment.