-
-
Notifications
You must be signed in to change notification settings - Fork 4.7k
Allow to name a version #35160
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.
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
Merged
Allow to name a version #35160
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
1ade482
Modernise hook listener of files_versions
artonge e82bfba
Create files_versions table
artonge 629de6c
Support getting and patching version-label
artonge 6a2f8bc
Allow to delete a version through DAV
artonge 1adc9d2
Delete file versions entries in DB when node is deleted
artonge ad46996
Prevent expiration of named versions
artonge 8f23cc8
Rename Hooks.php to FileEventsListener.php
artonge 2ce4ac4
User rootFolder instead of userFolder in FileEventsListener
artonge 53d7362
Adapt files_versions tests to modernized hooks
artonge d8b4797
Fix hookconnector tests
artonge c88328e
Handle empty files in version creation logic
artonge 6dcfb29
Fix renaming files_versions
artonge 84e5b9c
Prevent storing versions with the same mtime
artonge 3da63f4
Use node's owner if no user is connected
artonge 88abb2d
Fix versions restoring with S3
artonge 305b1b6
Forward branch env var to the cypress container
artonge fd9937a
Add cypress tests
artonge 9600265
Handle undefined label in front-end
artonge 552f5b0
Compile assets
artonge File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,81 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Louis Chmn <[email protected]> | ||
| * | ||
| * @author Louis Chmn <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Files_Versions\Db; | ||
|
|
||
| use JsonSerializable; | ||
|
|
||
| use OCP\AppFramework\Db\Entity; | ||
| use OCP\DB\Types; | ||
|
|
||
| /** | ||
| * @method int getFileId() | ||
| * @method void setFileId(int $fileId) | ||
| * @method int getTimestamp() | ||
| * @method void setTimestamp(int $timestamp) | ||
| * @method int getSize() | ||
| * @method void setSize(int $size) | ||
| * @method int getMimetype() | ||
| * @method void setMimetype(int $mimetype) | ||
| * @method array|null getMetadata() | ||
| * @method void setMetadata(array $metadata) | ||
| */ | ||
| class VersionEntity extends Entity implements JsonSerializable { | ||
| protected ?int $fileId = null; | ||
| protected ?int $timestamp = null; | ||
| protected ?int $size = null; | ||
| protected ?int $mimetype = null; | ||
| protected ?array $metadata = null; | ||
|
|
||
| public function __construct() { | ||
| $this->addType('id', Types::INTEGER); | ||
| $this->addType('file_id', Types::INTEGER); | ||
| $this->addType('timestamp', Types::INTEGER); | ||
| $this->addType('size', Types::INTEGER); | ||
| $this->addType('mimetype', Types::INTEGER); | ||
| $this->addType('metadata', Types::JSON); | ||
| } | ||
|
|
||
| public function jsonSerialize(): array { | ||
| return [ | ||
| 'id' => $this->id, | ||
| 'file_id' => $this->fileId, | ||
| 'timestamp' => $this->timestamp, | ||
| 'size' => $this->size, | ||
| 'mimetype' => $this->mimetype, | ||
| 'metadata' => $this->metadata, | ||
| ]; | ||
| } | ||
|
|
||
| public function getLabel(): string { | ||
| return $this->metadata['label'] ?? ''; | ||
| } | ||
|
|
||
| public function setLabel(string $label): void { | ||
| $this->metadata['label'] = $label; | ||
| $this->markFieldUpdated('metadata'); | ||
| } | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,88 @@ | ||
| <?php | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| /** | ||
| * @copyright Copyright (c) 2022 Louis Chmn <[email protected]> | ||
| * | ||
| * @author Louis Chmn <[email protected]> | ||
| * | ||
| * @license GNU AGPL version 3 or any later version | ||
| * | ||
| * This program is free software: you can redistribute it and/or modify | ||
| * it under the terms of the GNU Affero General Public License as | ||
| * published by the Free Software Foundation, either version 3 of the | ||
| * License, or (at your option) any later version. | ||
| * | ||
| * This program is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
| * GNU Affero General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Affero General Public License | ||
| * along with this program. If not, see <http://www.gnu.org/licenses/>. | ||
| * | ||
| */ | ||
|
|
||
| namespace OCA\Files_Versions\Db; | ||
|
|
||
| use OCA\Files_Versions\Db\VersionEntity; | ||
| use OCP\IDBConnection; | ||
| use OCP\AppFramework\Db\QBMapper; | ||
| use OCP\DB\IResult; | ||
|
|
||
| /** | ||
| * @extends QBMapper<VersionEntity> | ||
| */ | ||
| class VersionsMapper extends QBMapper { | ||
|
||
| public function __construct(IDBConnection $db) { | ||
| parent::__construct($db, 'files_versions', VersionEntity::class); | ||
|
||
| } | ||
|
|
||
| /** | ||
| * @return VersionEntity[] | ||
|
||
| */ | ||
| public function findAllVersionsForFileId(int $fileId): array { | ||
| $qb = $this->db->getQueryBuilder(); | ||
|
|
||
| $qb->select('*') | ||
| ->from($this->getTableName()) | ||
| ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId))); | ||
|
|
||
| return $this->findEntities($qb); | ||
|
||
| } | ||
|
|
||
| /** | ||
| * @return VersionEntity | ||
| */ | ||
| public function findCurrentVersionForFileId(int $fileId): VersionEntity { | ||
| $qb = $this->db->getQueryBuilder(); | ||
|
|
||
| $qb->select('*') | ||
| ->from($this->getTableName()) | ||
| ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId))) | ||
| ->orderBy('timestamp', 'DESC') | ||
| ->setMaxResults(1); | ||
|
|
||
| return $this->findEntity($qb); | ||
| } | ||
|
|
||
| public function findVersionForFileId(int $fileId, int $timestamp): VersionEntity { | ||
|
||
| $qb = $this->db->getQueryBuilder(); | ||
|
|
||
| $qb->select('*') | ||
| ->from($this->getTableName()) | ||
| ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId))) | ||
| ->andWhere($qb->expr()->eq('timestamp', $qb->createNamedParameter($timestamp))); | ||
|
|
||
| return $this->findEntity($qb); | ||
|
||
| } | ||
|
|
||
| public function deleteAllVersionsForFileId(int $fileId): int { | ||
| $qb = $this->db->getQueryBuilder(); | ||
|
|
||
| return $qb->delete($this->getTableName()) | ||
| ->where($qb->expr()->eq('file_id', $qb->createNamedParameter($fileId))) | ||
| ->executeStatement(); | ||
| } | ||
| } | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.