opensourcemirror
/
nextcloud-notes
mirror of https://github.com/nextcloud/notes.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix: Wrap renaming of notes through autotile in locking context 

Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl 2023-05-17 14:14:12 +02:00
parent 507420403a
commit fdbf2b6064
No known key found for this signature in database
GPG Key ID: 4C614C6ED2CDE6DF
2 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
lib/Controller/NotesController.php
View File

@ -4,6 +4,7 @@ declare(strict_types=1);
namespace OCA\Notes\Controller;
use OCA\Notes\Service\Note;
use OCA\Notes\Service\NotesService;
use OCA\Notes\Service\SettingsService;
@ -12,6 +13,9 @@ use OCP\AppFramework\Http;
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;
@ -19,28 +23,34 @@ 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 @@ class NotesController extends Controller {
$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 @@ class NotesController extends Controller {
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 @@ class NotesController extends Controller {
);
});
}
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();
});
}
}

4
lib/Service/Note.php
View File

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