Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions lib/Versions/ExpireManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,8 @@ protected function getAutoExpireList(int $time, array $versions): array {
}

/**
* @param IVersion[] $versions
* @return IVersion[]
* @param GroupVersion[] $versions
* @return GroupVersion[]
*/
public function getExpiredVersion(array $versions, int $time, bool $quotaExceeded): array {
if ($this->expiration->shouldAutoExpire()) {
Expand Down
5 changes: 5 additions & 0 deletions lib/Versions/GroupVersion.php
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public function __construct(
array $metadata,
private File $versionFile,
private int $folderId,
private readonly bool $currentVersion,
) {
parent::__construct($timestamp, $revisionId, $name, $size, $mimetype, $path, $sourceFileInfo, $backend, $user, $metadata);
}
Expand All @@ -39,4 +40,8 @@ public function getVersionFile(): File {
public function getFolderId(): int {
return $this->folderId;
}

public function isCurrentVersion(): bool {
return $this->currentVersion;
}
}
14 changes: 14 additions & 0 deletions lib/Versions/GroupVersionsExpireManager.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\FileInfo;
use OCP\IUser;
use Psr\Log\LoggerInterface;

/**
* @psalm-import-type InternalFolderOut from FolderManager
Expand All @@ -29,6 +30,7 @@ public function __construct(
private VersionsBackend $versionsBackend,
private ITimeFactory $timeFactory,
private IEventDispatcher $dispatcher,
private LoggerInterface $logger,
) {
}

Expand Down Expand Up @@ -68,6 +70,18 @@ public function expireFolder(array $folder): void {
$versions = $this->versionsBackend->getVersionsForFile($dummyUser, $file);
$expireVersions = $this->expireManager->getExpiredVersion($versions, $this->timeFactory->getTime(), false);
foreach ($expireVersions as $version) {
if ($version->isCurrentVersion()) {
$this->logger->error(
'Current version of a groupfolders file was listed for deletion. Skipping.',
[
'folderid' => $version->getFolderId(),
'timestamp' => $version->getTimestamp(),
'mtime' => $version->getSourceFile()->getMtime(),
'sourcefilename' => $version->getSourceFileName(),
]
);
continue;
}
/** @var GroupVersion $version */
$this->dispatcher->dispatchTyped(new GroupVersionsExpireDeleteVersionEvent($version));
$view->unlink('/' . $fileId . '/' . $version->getVersionFile()->getName());
Expand Down
8 changes: 7 additions & 1 deletion lib/Versions/VersionsBackend.php
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,9 @@ public function getVersionFolderForFile(FileInfo $file): Folder {
}
}

/**
* @return GroupVersion[]
*/
public function getVersionsForFile(IUser $user, FileInfo $file): array {
$versionsFolder = $this->getVersionFolderForFile($file);

Expand Down Expand Up @@ -137,7 +140,7 @@ public function getVersionsForFile(IUser $user, FileInfo $file): array {
}

/**
* @return IVersion[]
* @return GroupVersion[]
*/
private function getVersionsForFileFromDB(FileInfo $fileInfo, IUser $user): array {
$folderId = $this->getFolderIdForFile($fileInfo);
Expand All @@ -149,7 +152,9 @@ private function getVersionsForFileFromDB(FileInfo $fileInfo, IUser $user): arra
$versionEntities = $this->groupVersionsMapper->findAllVersionsForFileId($fileInfo->getId());
$mappedVersions = array_map(
function (GroupVersionEntity $versionEntity) use ($versionsFolder, $mountPoint, $fileInfo, $user, $folderId, $groupFolder): ?GroupVersion {
$currentVersion = false;
if ($fileInfo->getMtime() === $versionEntity->getTimestamp()) {
$currentVersion = true;
if ($fileInfo instanceof File) {
$versionFile = $fileInfo;
} else {
Expand Down Expand Up @@ -181,6 +186,7 @@ function (GroupVersionEntity $versionEntity) use ($versionsFolder, $mountPoint,
$versionEntity->getDecodedMetadata(),
$versionFile,
$folderId,
$currentVersion,
);
},
$versionEntities,
Expand Down
Loading