Use absolute icon url (fix #280) (#281)

* Use absolute icon url (fix #280) * Fix build
R0Wi-DEV · Dec 1, 2024 · b6cd213 · b6cd213
1 parent bfb792f
commit b6cd213
Show file tree

Hide file tree

Showing 11 changed files with 245 additions and 177 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -35,7 +35,7 @@ jobs:
         run: cd ${{ env.APP_NAME }} && make appstore
 
       - name: Upload artifacts
-        uses: actions/upload-artifact@v1
+        uses: actions/upload-artifact@v4
         with:
           name: ${{ env.APP_NAME }}.tar.gz
           path: ${{ env.APP_NAME }}/build/artifacts/appstore/${{ env.APP_NAME }}.tar.gz
diff --git a/composer.lock b/composer.lock
diff --git a/lib/BackgroundJobs/ProcessFileJob.php b/lib/BackgroundJobs/ProcessFileJob.php
@@ -67,7 +67,7 @@ protected function run($argument) : void {
 			$this->ocrService->runOcrProcess($fileId, $uid, $settings);
 		} catch (\Throwable $ex) {
 			$this->logger->error($ex->getMessage(), ['exception' => $ex]);
-			$this->notificationService->createErrorNotification($uid, 'An error occured while executing the OCR process ('.$ex->getMessage().'). Please have a look at your servers logfile for more details.');
+			$this->notificationService->createErrorNotification($uid, 'An error occured while executing the OCR process (' . $ex->getMessage() . '). Please have a look at your servers logfile for more details.');
 		}
 
 		$this->logger->debug('ENDED -- Run ' . self::class . ' job. Argument: {argument}.', ['argument' => $argument]);

diff --git a/lib/Listener/RegisterFlowOperationsListener.php b/lib/Listener/RegisterFlowOperationsListener.php
@@ -51,6 +51,6 @@ public function handle(Event $event): void {
 		$event->registerOperation($this->container->get(Operation::class));
 
 		// Register webpack bundled script 'js/workflow_ocr-main.js'
-		Util::addScript(Application::APP_NAME, Application::APP_NAME. '-main');
+		Util::addScript(Application::APP_NAME, Application::APP_NAME . '-main');
 	}
 }
diff --git a/lib/Notification/Notifier.php b/lib/Notification/Notifier.php
@@ -111,7 +111,7 @@ public function prepare(INotification $notification, string $languageCode): INot
 		$message = $notification->getSubjectParameters()['message'];
 		$notification
 			->setParsedMessage($message)
-			->setIcon($this->urlGenerator->imagePath(Application::APP_NAME, 'app-dark.svg'));
+			->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath(Application::APP_NAME, 'app-dark.svg')));
 
 		return $notification;
 	}

diff --git a/tests/Integration/AppTest.php b/tests/Integration/AppTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2020 Robin Windey <ro.windey@gmail.com>
  *

diff --git a/tests/Integration/Notification/AppFake.php b/tests/Integration/Notification/AppFake.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2023 Robin Windey <ro.windey@gmail.com>
  *

diff --git a/tests/Integration/Notification/NotificationTest.php b/tests/Integration/Notification/NotificationTest.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * @copyright Copyright (c) 2023 Robin Windey <ro.windey@gmail.com>
  *

diff --git a/tests/TestUtils.php b/tests/TestUtils.php
@@ -1,4 +1,5 @@
 <?php
+
 /**
  * Nextcloud - Files_PhotoSpheres
  *

diff --git a/tests/Unit/Notification/NotifierTest.php b/tests/Unit/Notification/NotifierTest.php
@@ -160,6 +160,10 @@ public function testPrepareConstructsOcrErrorCorrectlyWithFileId() {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->urlGenerator->expects($this->once())
 			->method('linkToRouteAbsolute')
@@ -204,6 +208,10 @@ public function testPrepareConstructsOcrErrorCorrectlyWithoutFile() {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->urlGenerator->expects($this->never())
 			->method('linkToRouteAbsolute');
@@ -251,6 +259,10 @@ public function testSendsFallbackNotificationWithoutFileInfoIfFileNotFoundWasThr
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->logger->expects($this->once())
 			->method('error')
@@ -297,6 +309,10 @@ public function testSendsFallbackNotificationWithoutFileInfoIfReturnedFileArrayW
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')
 			->with('workflow_ocr', 'app-dark.svg')
+			->willReturn('apps/workflow_ocr/app-dark.svg');
+		$this->urlGenerator->expects($this->once())
+			->method('getAbsoluteURL')
+			->with('apps/workflow_ocr/app-dark.svg')
 			->willReturn('http://localhost/index.php/apps/workflow_ocr/app-dark.svg');
 		$this->logger->expects($this->once())
 			->method('warning')

diff --git a/tests/Unit/OcrProcessors/PdfOcrProcessorTest.php b/tests/Unit/OcrProcessors/PdfOcrProcessorTest.php
@@ -353,7 +353,7 @@ public function testRemoveBackgroundIsNotAppliedIfOcrModeIsRedoOcr() {
 			}));
 
 		$processor = new PdfOcrProcessor($this->command, $this->logger, $this->sidecarFileAccessor);
-		$processor->ocrFile($this->fileBefore, new WorkflowSettings('{"ocrMode": ' . WorkflowSettings::OCR_MODE_REDO_OCR .', "removeBackground": true}'), $this->defaultGlobalSettings);
+		$processor->ocrFile($this->fileBefore, new WorkflowSettings('{"ocrMode": ' . WorkflowSettings::OCR_MODE_REDO_OCR . ', "removeBackground": true}'), $this->defaultGlobalSettings);
 	}
 
 	public function dataProvider_testAppliesOcrModeParameter() {