Let locked files open in read only

Signed-off-by: Julius Härtl <jus@bitgrid.net>
nextcloud · Mar 24, 2022 · c49a0e9 · c49a0e9
1 parent b7e89cf
commit c49a0e9
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 14 deletions.
diff --git a/lib/Service/ApiService.php b/lib/Service/ApiService.php
@@ -114,7 +114,10 @@ public function create($fileId = null, $filePath = null, $token = null, $guestNa
 			$content = null;
 		}
 
-		$this->documentService->lock($fileId);
+		$isLocked = $this->documentService->lock($fileId);
+		if (!$isLocked) {
+			$readOnly = true;
+		}
 
 		return new DataResponse([
 			'document' => $document,

diff --git a/lib/Service/DocumentService.php b/lib/Service/DocumentService.php
@@ -34,8 +34,11 @@
 use OCP\Files\Lock\ILock;
 use OCP\Files\Lock\ILockManager;
 use OCP\Files\Lock\LockScope;
+use OCP\Files\Lock\NoLockProviderException;
+use OCP\Files\Lock\OwnerLockedException;
 use OCP\IRequest;
 use OCP\Lock\ILockingProvider;
+use OCP\PreConditionNotMetException;
 use function json_encode;
 use OC\Files\Node\File;
 use OCA\Text\Db\Document;
@@ -477,29 +480,40 @@ private function ensureDocumentsFolder(): bool {
 		return true;
 	}
 
-	public function lock(int $fileId) {
+	public function lock(int $fileId): bool {
 		if (!$this->lockManager->isLockProviderAvailable()) {
-			return;
+			return true;
 		}
 
 		$file = $this->getFileById($fileId);
-		$this->lockManager->lock(new LockScope(
-			$file,
-			ILock::TYPE_APP,
-			Application::APP_NAME
-		));
+		try {
+			$this->lockManager->lock(new LockScope(
+				$file,
+				ILock::TYPE_APP,
+				Application::APP_NAME
+			));
+		} catch (NoLockProviderException $e) {
+		} catch (OwnerLockedException $e) {
+			return false;
+		} catch (PreConditionNotMetException $e) {
+		}
+		return true;
 	}
 
-	public function unlock(int $fileId) {
+	public function unlock(int $fileId): void {
 		if (!$this->lockManager->isLockProviderAvailable()) {
 			return;
 		}
 
 		$file = $this->getFileById($fileId);
-		$this->lockManager->unlock(new LockScope(
-			$file,
-			ILock::TYPE_APP,
-			Application::APP_NAME
-		));
+		try {
+			$this->lockManager->unlock(new LockScope(
+				$file,
+				ILock::TYPE_APP,
+				Application::APP_NAME
+			));
+		} catch (NoLockProviderException $e) {
+		} catch (PreConditionNotMetException $e) {
+		}
 	}
 }