fix(GoogleDriveAPIService): Don't break if a file causes hiccups

fixes #164
nextcloud · Mar 1, 2024 · 12fa7b5 · 12fa7b5
1 parent c236061
commit 12fa7b5
Showing 1 changed file with 45 additions and 38 deletions.
diff --git a/lib/Service/GoogleDriveAPIService.php b/lib/Service/GoogleDriveAPIService.php
@@ -19,6 +19,7 @@
 use OCP\BackgroundJob\IJobList;
 use OCP\Files\File;
 use OCP\Files\Folder;
+use OCP\Files\ForbiddenException;
 use OCP\Files\InvalidPathException;
 use OCP\Files\IRootFolder;
 use OCP\Files\NotFoundException;
@@ -312,51 +313,57 @@ public function importFiles(
 					return $result;
 				}
 				foreach ($result['files'] as $fileItem) {
-					// ignore shared files
-					if (!$considerSharedFiles && !$fileItem['ownedByMe']) {
-						continue;
-					}
+					try {
+						// ignore shared files
+						if (!$considerSharedFiles && !$fileItem['ownedByMe']) {
+							continue;
+						}
 
-					if (isset($fileItem['parents']) && count($fileItem['parents']) > 0
-						&& isset($directoriesById[$fileItem['parents'][0]], $directoriesById[$fileItem['parents'][0]]['node'])) {
-						$saveFolder = $directoriesById[$fileItem['parents'][0]]['node'];
-					} else {
-						$saveFolder = $rootImportFolder;
-					}
+						if (isset($fileItem['parents']) && count($fileItem['parents']) > 0
+							&& isset($directoriesById[$fileItem['parents'][0]], $directoriesById[$fileItem['parents'][0]]['node'])) {
+							$saveFolder = $directoriesById[$fileItem['parents'][0]]['node'];
+						} else {
+							$saveFolder = $rootImportFolder;
+						}
 
-					$fileName = $this->getFileName($fileItem, $userId, in_array($fileItem['id'], $conflictingIds));
+						$fileName = $this->getFileName($fileItem, $userId, in_array($fileItem['id'], $conflictingIds));
 
-					// If file already exists in folder, don't download unless timestamp is different
-					if ($saveFolder->nodeExists($fileName)) {
-						$savedFile = $saveFolder->get($fileName);
-						$timestampOnFile = $savedFile->getMtime();
-						$d = new DateTime($fileItem['modifiedTime']);
-						$timestampOnDrive = $d->getTimestamp();
+						// If file already exists in folder, don't download unless timestamp is different
+						if ($saveFolder->nodeExists($fileName)) {
+							$savedFile = $saveFolder->get($fileName);
+							$timestampOnFile = $savedFile->getMtime();
+							$d = new DateTime($fileItem['modifiedTime']);
+							$timestampOnDrive = $d->getTimestamp();
 
-						if ($timestampOnFile < $timestampOnDrive) {
-							$savedFile->delete();
-						} else {
-							continue;
+							if ($timestampOnFile < $timestampOnDrive) {
+								$savedFile->delete();
+							} else {
+								continue;
+							}
 						}
-					}
 
-					$size = $this->getFile($userId, $fileItem, $saveFolder, $fileName);
-
-					if (!is_null($size)) {
-						$nbDownloaded++;
-						$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_files', $alreadyImported + $nbDownloaded);
-						$downloadedSize += $size;
-						$this->config->setUserValue($userId, Application::APP_ID, 'drive_imported_size', $alreadyImportedSize + $downloadedSize);
-						if ($maxDownloadSize && $downloadedSize > $maxDownloadSize) {
-							return [
-								'nbDownloaded' => $nbDownloaded,
-								'targetPath' => $targetPath,
-								'finished' => false,
-							];
+						$size = $this->getFile($userId, $fileItem, $saveFolder, $fileName);
+
+						if (!is_null($size)) {
+							$nbDownloaded++;
+							$this->config->setUserValue($userId, Application::APP_ID, 'nb_imported_files', $alreadyImported + $nbDownloaded);
+							$downloadedSize += $size;
+							$this->config->setUserValue($userId, Application::APP_ID, 'drive_imported_size', $alreadyImportedSize + $downloadedSize);
+							if ($maxDownloadSize && $downloadedSize > $maxDownloadSize) {
+								return [
+									'nbDownloaded' => $nbDownloaded,
+									'targetPath' => $targetPath,
+									'finished' => false,
+								];
+							}
+						} elseif (!$saveFolder->nodeExists($fileName)) {
+							$filePathInDrive = $dirId === 'root' ? '/' . $fileItem['name'] : $directoriesById[$dirId]['name'] . '/' . $fileItem['name'];
+							$this->logFailedDownloadsForUser($rootImportFolder, $filePathInDrive);
 						}
-					} elseif (!$saveFolder->nodeExists($fileName)) {
-						$filePathInDrive = $dirId === 'root' ? '/' . $fileItem['name'] : $directoriesById[$dirId]['name'] . '/' . $fileItem['name'];
-						$this->logFailedDownloadsForUser($rootImportFolder, $filePathInDrive);
+					} catch (\Throwable $e) {
+						$this->logger->warning('Error while importing file', ['exception' => $e]);
+						$this->logger->debug('Skipping file ' . $fileItem['id']);
+						continue;
 					}
 				}
 				$params['pageToken'] = $result['nextPageToken'] ?? '';