Skip to content

[stable26] Conflict fixes #3988

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mejo- merged 8 commits into from
Mar 29, 2023
Merged

[stable26] Conflict fixes #3988

Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
6c0589e
test: Add cypress tests for resolving conflicts
juliusknorr Mar 21, 2023
504ea27
fix: store actually used mtime
juliusknorr Mar 21, 2023
55a1633
fix: Properly restart sync after conflict resolution
juliusknorr Mar 21, 2023
dd2f7c5
fix: Avoid writing file content if it has not changed
juliusknorr Mar 22, 2023
eb36c1e
fix: Fix styling of collission dialog and move it out of the editor
juliusknorr Mar 22, 2023
c56586b
fix: Do not disconnect during conflict to be able to catch up on a re…
juliusknorr Mar 22, 2023
5ed2a21
Use `max-height` in DocumentStatus, fixes empty 50px bar above toolbar
mejo- Mar 29, 2023
351cee2
Compile assets
nextcloud-command Mar 29, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fix: Avoid writing file content if it has not changed 
Signed-off-by: Julius Härtl <[email protected]>
  • Loading branch information
@juliusknorr @mejo-
juliusknorr authored and mejo- committed Mar 29, 2023
commit dd2f7c5c946bb404ad6b22586c40676499b0b9f7
24 changes: 18 additions & 6 deletions lib/Service/DocumentService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,7 +303,7 @@ public function getSteps($documentId, $lastVersion): array {
* @throws NotPermittedException
* @throws Exception
*/
public function autosave(?File $file, int $documentId, int $version, ?string $autoaveDocument, ?string $documentState, bool $force = false, bool $manualSave = false, ?string $shareToken = null, ?string $filePath = null): Document {
public function autosave(?File $file, int $documentId, int $version, ?string $autoSaveDocument, ?string $documentState, bool $force = false, bool $manualSave = false, ?string $shareToken = null, ?string $filePath = null): Document {
/** @var Document $document */
$document = $this->documentMapper->find($documentId);

Expand All @@ -327,7 +327,7 @@ public function autosave(?File $file, int $documentId, int $version, ?string $au
}
}

if ($autoaveDocument === null) {
if ($autoSaveDocument === null) {
return $document;
}
// Do not save if version already saved
Expand All @@ -341,10 +341,10 @@ public function autosave(?File $file, int $documentId, int $version, ?string $au
return $document;
}

if (empty($autoaveDocument)) {
if (empty($autoSaveDocument)) {
$this->logger->debug('Saving empty document', [
'requestVersion' => $version,
'requestAutosaveDocument' => $autoaveDocument,
'requestAutosaveDocument' => $autoSaveDocument,
'requestDocumentState' => $documentState,
'document' => $document->jsonSerialize(),
'fileSizeBeforeSave' => $file->getSize(),
Expand All @@ -357,14 +357,26 @@ public function autosave(?File $file, int $documentId, int $version, ?string $au
]);
}

// Version changed but the content remains the same
if ($autoSaveDocument === $file->getContent()) {
if ($documentState) {
$this->writeDocumentState($file->getId(), $documentState);
}
$document->setLastSavedVersion($stepsVersion);
$document->setLastSavedVersionTime($file->getMTime());
$document->setLastSavedVersionEtag($file->getEtag());
$this->documentMapper->update($document);
return $document;
}

$this->cache->set('document-save-lock-' . $documentId, true, 10);
try {
$this->lockManager->runInScope(new LockContext(
$file,
ILock::TYPE_APP,
Application::APP_NAME
), function () use ($file, $autoaveDocument, $documentState) {
$file->putContent($autoaveDocument);
), function () use ($file, $autoSaveDocument, $documentState) {
$file->putContent($autoSaveDocument);
if ($documentState) {
$this->writeDocumentState($file->getId(), $documentState);
}
Expand Down