20.0.0

nextcloud · Dec 11, 2020 · 05761b6 · 05761b6
1 parent 7584479
commit 05761b6
Show file tree

Hide file tree

Showing 14 changed files with 236 additions and 260 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 # Changelog
 
 
+### 20.0.0
+
+- compat nc20
+- cleaning code
+
+
 ### 1.4.2
 
 - compat nc19

diff --git a/Makefile b/Makefile
@@ -8,9 +8,9 @@ sign_dir=$(build_dir)/sign
 package_name=$(app_name)
 cert_dir=$(HOME)/.nextcloud/certificates
 github_account=daita
-branch=master
+branch=stable20
 codecov_token_dir=$(HOME)/.nextcloud/codecov_token
-version+=1.4.2
+version+=20.0.0
 
 all: appstore
 

diff --git a/appinfo/app.php b/appinfo/app.php
diff --git a/appinfo/autoload.php b/appinfo/autoload.php
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -14,7 +14,7 @@ which is a wrapper for the command line program [Tesseract OCR](https://github.c
 Tesseract must be installed locally, and configured.
 	]]>
 	</description>
-	<version>1.4.2</version>
+	<version>20.0.0</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<namespace>Files_FullTextSearch_Tesseract</namespace>
@@ -27,7 +27,7 @@ Tesseract must be installed locally, and configured.
 	<repository>https://github.com/daita/files_fulltextsearch_tesseract.git</repository>
 	<screenshot>https://raw.githubusercontent.com/nextcloud/fulltextsearch/master/screenshots/0.3.0.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="18" max-version="19"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
 
 	<settings>

diff --git a/composer.json b/composer.json
@@ -3,14 +3,25 @@
   "description": "Files - Fulltextsearch - Tesseract OCR",
   "minimum-stability": "stable",
   "license": "agpl",
+  "config": {
+    "optimize-autoloader": true,
+    "classmap-authoritative": true,
+    "autoloader-suffix": "Files_FullTextSearch_Tesseract"
+  },
   "authors": [
     {
       "name": "Maxence Lange",
       "email": "maxence@artificial-owl.com"
     }
   ],
+  "autoload": {
+    "psr-4": {
+      "OCA\\Files_FullTextSearch_Tesseract\\": "lib/"
+    }
+  },
   "require": {
-    "thiagoalessio/tesseract_ocr": "2.4.0",
-    "spatie/pdf-to-image": "1.8.1"
+    "daita/my-small-php-tools": "dev-master",
+    "thiagoalessio/tesseract_ocr": "2.9.5",
+    "spatie/pdf-to-image": "2.1.0"
   }
 }
diff --git a/composer.lock b/composer.lock
diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
@@ -31,19 +31,26 @@
 namespace OCA\Files_FullTextSearch_Tesseract\AppInfo;
 
 
+use OCA\Files_FullTextSearch_Tesseract\Listeners\GenericListener;
 use OCA\Files_FullTextSearch_Tesseract\Service\ConfigService;
 use OCA\Files_FullTextSearch_Tesseract\Service\TesseractService;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\QueryException;
 use OCP\EventDispatcher\GenericEvent;
 
 
+require_once __DIR__ . '/../../vendor/autoload.php';
+
+
 /**
  * Class Application
  *
  * @package OCA\Files_FullTextSearch_Tesseract\AppInfo
  */
-class Application extends App {
+class Application extends App implements IBootstrap {
 
 
 	const APP_NAME = 'files_fulltextsearch_tesseract';
@@ -69,28 +76,17 @@ public function __construct(array $params = []) {
 
 
 	/**
-	 *
+	 * @param IRegistrationContext $context
+	 */
+	public function register(IRegistrationContext $context): void {
+		$context->registerEventListener(GenericEvent::class, GenericListener::class);
+	}
+
+
+	/**
+	 * @param IBootContext $context
 	 */
-	public function registerFilesExtension() {
-		$eventDispatcher = \OC::$server->getEventDispatcher();
-		$eventDispatcher->addListener(
-			'\OCA\Files_FullTextSearch::onGetConfig',
-			function(GenericEvent $e) {
-				$this->configService->onGetConfig($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Files_FullTextSearch::onFileIndexing',
-			function(GenericEvent $e) {
-				$this->tesseractService->onFileIndexing($e);
-			}
-		);
-		$eventDispatcher->addListener(
-			'\OCA\Files_FullTextSearch::onSearchRequest',
-			function(GenericEvent $e) {
-				$this->tesseractService->onSearchRequest($e);
-			}
-		);
+	public function boot(IBootContext $context): void {
 	}
 
 }

diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
@@ -33,7 +33,6 @@
 
 use OCA\Files_FullTextSearch_Tesseract\AppInfo\Application;
 use OCA\Files_FullTextSearch_Tesseract\Service\ConfigService;
-use OCA\Files_FullTextSearch_Tesseract\Service\MiscService;
 use OCP\AppFramework\Controller;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
@@ -51,23 +50,16 @@ class SettingsController extends Controller {
 	/** @var ConfigService */
 	private $configService;
 
-	/** @var MiscService */
-	private $miscService;
-
 
 	/**
 	 * SettingsController constructor.
 	 *
 	 * @param IRequest $request
 	 * @param ConfigService $configService
-	 * @param MiscService $miscService
 	 */
-	public function __construct(
-		IRequest $request, ConfigService $configService, MiscService $miscService
-	) {
+	public function __construct(IRequest $request, ConfigService $configService) {
 		parent::__construct(Application::APP_NAME, $request);
 		$this->configService = $configService;
-		$this->miscService = $miscService;
 	}