Fix(snap): Improve interoperability with nc snap

Signed-off-by: Marcel Klehr <[email protected]>
nextcloud · Sep 6, 2023 · 92a32ea · 92a32ea
1 parent 55b968a
commit 92a32ea
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/lib/Migration/InstallDeps.php b/lib/Migration/InstallDeps.php
@@ -72,28 +72,33 @@ public function __construct(IConfig $config, IClientService $clientService, Logg
 	}
 
 	public function getName(): string {
-		return 'Install dependencies';
+		return 'Install recognize dependencies';
 	}
 
 	public function run(IOutput $output): void {
-		$existingBinary = $this->config->getAppValue('recognize', 'node_binary', '');
-		if ($existingBinary !== '') {
-			$version = $this->testBinary($existingBinary);
-			if ($version === null) {
+		try {
+			$existingBinary = $this->config->getAppValue('recognize', 'node_binary', '');
+			if ($existingBinary !== '') {
+				$version = $this->testBinary($existingBinary);
+				if ($version === null) {
+					$this->installNodeBinary($output);
+				}
+			} else {
 				$this->installNodeBinary($output);
 			}
-		} else {
-			$this->installNodeBinary($output);
-		}
 
-		$this->setBinariesPermissions();
+			$this->setBinariesPermissions();
 
-		$binaryPath = $this->config->getAppValue('recognize', 'node_binary', '');
+			$binaryPath = $this->config->getAppValue('recognize', 'node_binary', '');
 
-		$this->runTfjsInstall($binaryPath);
-		$this->runFfmpegInstall($binaryPath);
-		$this->runTfjsGpuInstall($binaryPath);
-		$this->setNiceBinaryPath();
+			$this->runTfjsInstall($binaryPath);
+			$this->runFfmpegInstall($binaryPath);
+			$this->runTfjsGpuInstall($binaryPath);
+			$this->setNiceBinaryPath();
+		} catch(\Throwable $e) {
+			$output->warning('Failed to automatically install dependencies for recognize. Check the recognize admin panel for potential problems.');
+			$this->logger->error('Failed to automatically install dependencies for recognize. Check the recognize admin panel for potential problems.', ['exception' => $e]);
+		}
 	}
 
 	protected function setNiceBinaryPath() : void {

diff --git a/src/components/ViewAdmin.vue b/src/components/ViewAdmin.vue
@@ -305,6 +305,7 @@
 			<p>
 				<input v-model="settings['node_binary']" type="text" @change="onChange">
 			</p>
+			<p>{{ t('recognize', 'For Nextcloud Snap users, you need to adjust this path to point to the snap\'s "current" directory as the pre-configured path will change with each update. For example, set it to "/var/snap/nextcloud/current/nextcloud/extra-apps/recognize/bin/node" instead of "/var/snap/nextcloud/9337974/nextcloud/extra-apps/recognize/bin/node"') }}</p>
 		</NcSettingsSection>
 		<NcSettingsSection :title="t('recognize', 'Classifier process priority')">
 			<p v-if="nice === undefined">