Merge pull request #1047 from nextcloud/bugfix/noid/lock

Author: juliusknorr

lib/Controller/NotesController.php

@@ -4,6 +4,7 @@
 
 namespace OCA\Notes\Controller;
 
+use OCA\Notes\Service\Note;
 use OCA\Notes\Service\NotesService;
 use OCA\Notes\Service\SettingsService;
 
@@ -12,35 +13,44 @@
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\AppFramework\Http\StreamResponse;
 use OCP\Files\IMimeTypeDetector;
+use OCP\Files\Lock\ILock;
+use OCP\Files\Lock\ILockManager;
+use OCP\Files\Lock\LockContext;
 use OCP\IConfig;
 use OCP\IL10N;
 use OCP\IRequest;
 
 class NotesController extends Controller {
 	private NotesService $notesService;
 	private SettingsService $settingsService;
+	private ILockManager $lockManager;
 	private Helper $helper;
 	private IConfig $settings;
 	private IL10N $l10n;
 	private IMimeTypeDetector $mimeTypeDetector;
+	private string $userId;
 
 	public function __construct(
 		string $AppName,
 		IRequest $request,
 		NotesService $notesService,
+		ILockManager $lockManager,
 		SettingsService $settingsService,
 		Helper $helper,
 		IConfig $settings,
 		IL10N $l10n,
-		IMimeTypeDetector $mimeTypeDetector
+		IMimeTypeDetector $mimeTypeDetector,
+		string $userId
 	) {
 		parent::__construct($AppName, $request);
 		$this->notesService = $notesService;
 		$this->settingsService = $settingsService;
+		$this->lockManager = $lockManager;
 		$this->helper = $helper;
 		$this->settings = $settings;
 		$this->l10n = $l10n;
 		$this->mimeTypeDetector = $mimeTypeDetector;
+		$this->userId = $userId;
 	}
 
 	/**
@@ -208,7 +218,9 @@ public function autotitle(int $id) : JSONResponse {
 			$oldTitle = $note->getTitle();
 			$newTitle = $this->notesService->getTitleFromContent($note->getContent());
 			if ($oldTitle !== $newTitle) {
-				$note->setTitle($newTitle);
+				$this->inLockScope($note, function () use ($note, $newTitle) {
+					$note->setTitle($newTitle);
+				});
 			}
 			return $note->getTitle();
 		});
@@ -258,14 +270,18 @@ public function updateProperty(
 
 				case 'title':
 					if ($title !== null) {
-						$note->setTitle($title);
+						$this->inLockScope($note, function () use ($note, $title) {
+							$note->setTitle($title);
+						});
 					}
 					$result = $note->getTitle();
 					break;
 
 				case 'category':
 					if ($category !== null) {
-						$note->setCategory($category);
+						$this->inLockScope($note, function () use ($note, $category) {
+							$note->setCategory($category);
+						});
 					}
 					$result = $note->getCategory();
 					break;
@@ -332,4 +348,16 @@ public function uploadFile(int $noteid): JSONResponse {
 			);
 		});
 	}
+
+	private function inLockScope(Note $note, callable $callback) {
+		$isRichText = $this->settingsService->get($this->userId, 'noteMode') === 'rich';
+		$lockContext = new LockContext(
+			$note->getFile(),
+			$isRichText ? ILock::TYPE_APP : ILock::TYPE_USER,
+			$isRichText ? 'text' : $this->userId
+		);
+		$this->lockManager->runInScope($lockContext, function () use ($callback) {
+			$callback();
+		});
+	}
 }

lib/Service/Note.php

@@ -179,4 +179,8 @@ public function setFavorite(bool $favorite) : void {
 			$this->noteUtil->getTagService()->setFavorite($this->getId(), $favorite);
 		}
 	}
+
+	public function getFile(): File {
+		return $this->file;
+	}
 }