Skip to content
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

fix: Avoid failing to update the current version entry if there is none #38800

Merged
merged 4 commits into from
Jun 23, 2023
Merged

fix: Avoid failing to update the current version entry if there is none #38800

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e76c96b
fix: Avoid failing to update the current version entry if there is none
juliusknorr Jun 13, 2023
ecdcc72
Handle previousNode size === 0 on version creation
artonge Jun 21, 2023
b94145f
fix: Add logging statement for cases when updating the version fails
juliusknorr Jun 21, 2023
7fec071
Do not create a new version if previousNode has the same mtime
artonge Jun 22, 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
17 changes: 12 additions & 5 deletions apps/files_versions/lib/Listener/FileEventsListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -239,11 +239,18 @@ public function post_write_hook(Node $node): void {
} else {
// If no new version was stored in the FS, no new version should be added in the DB.
// So we simply update the associated version.
$currentVersionEntity = $this->versionsMapper->findVersionForFileId($node->getId(), $writeHookInfo['previousNode']->getMtime());
$currentVersionEntity->setTimestamp($node->getMTime());
$currentVersionEntity->setSize($node->getSize());
$currentVersionEntity->setMimetype($this->mimeTypeLoader->getId($node->getMimetype()));
$this->versionsMapper->update($currentVersionEntity);
try {
$currentVersionEntity = $this->versionsMapper->findVersionForFileId($node->getId(), $writeHookInfo['previousNode']->getMtime());
$currentVersionEntity->setTimestamp($node->getMTime());
$currentVersionEntity->setSize($node->getSize());
$currentVersionEntity->setMimetype($this->mimeTypeLoader->getId($node->getMimetype()));
$this->versionsMapper->update($currentVersionEntity);
} catch (DoesNotExistException) {
// There might be cases where the current version entry doesn't exist,
// e.g. if none was written due to an empty file or from before the versions table was introduced
// We just create the initial version entry then for the current entity
$this->created($node);
}
}

unset($this->writeHookInfo[$node->getId()]);
Expand Down