refs #60 catch any unhandled error in import jobs

Signed-off-by: Julien Veyssier <eneiluj@posteo.net>

Author: Julien Veyssier

lib/Service/GoogleDriveAPIService.php

@@ -177,7 +177,13 @@ public function importDriveJob(string $userId): void {
 		// import by batch of 500 Mo
 		$alreadyImported = $this->config->getUserValue($userId, Application::APP_ID, 'nb_imported_files', '0');
 		$alreadyImported = (int) $alreadyImported;
-		$result = $this->importFiles($accessToken, $userId, $targetPath, 500000000, $alreadyImported, $directoryProgress);
+		try {
+			$result = $this->importFiles($accessToken, $userId, $targetPath, 500000000, $alreadyImported, $directoryProgress);
+		} catch (\Exception | \Throwable $e) {
+			$result = [
+				'error' => 'Unknow job failure. ' . $e->getMessage(),
+			];
+		}
 		if (isset($result['error']) || (isset($result['finished']) && $result['finished'])) {
 			if (isset($result['finished']) && $result['finished']) {
 				$nbImported = (int) $this->config->getUserValue($userId, Application::APP_ID, 'nb_imported_files', '0');

lib/Service/GooglePhotosAPIService.php

@@ -174,7 +174,13 @@ public function importPhotosJob(string $userId): void {
 		// import photos by batch of 500 Mo
 		$alreadyImported = $this->config->getUserValue($userId, Application::APP_ID, 'nb_imported_photos', '0');
 		$alreadyImported = (int) $alreadyImported;
-		$result = $this->importPhotos($accessToken, $userId, $targetPath, 500000000, $alreadyImported);
+		try {
+			$result = $this->importPhotos($accessToken, $userId, $targetPath, 500000000, $alreadyImported);
+		} catch (\Exception | \Throwable $e) {
+			$result = [
+				'error' => 'Unknow job failure. ' . $e->getMessage(),
+			];
+		}
 		if (isset($result['error']) || (isset($result['finished']) && $result['finished'])) {
 			$this->config->setUserValue($userId, Application::APP_ID, 'importing_photos', '0');
 			$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_photos', '0');