' +
'
' +
'
' +
@@ -186,6 +186,7 @@
var timestamp = version.get('timestamp') * 1000;
var size = version.has('size') ? version.get('size') : 0;
return _.extend({
+ versionId: version.get('id'),
formattedTimestamp: OC.Util.formatDate(timestamp),
relativeTimestamp: OC.Util.relativeModifiedDate(timestamp),
humanReadableSize: OC.Util.humanFileSize(size, true),
diff --git a/apps/files_versions/lib/Storage.php b/apps/files_versions/lib/Storage.php
index 130be95b22e3..37cb5b023f67 100644
--- a/apps/files_versions/lib/Storage.php
+++ b/apps/files_versions/lib/Storage.php
@@ -46,6 +46,7 @@
use OCA\Files_Versions\AppInfo\Application;
use OCA\Files_Versions\Command\Expire;
use OCP\Files\NotFoundException;
+use OCP\Files\Storage\IVersionedStorage;
use OCP\Lock\ILockingProvider;
use OCP\User;
@@ -174,7 +175,16 @@ public static function store($filename) {
}
list($uid, $filename) = self::getUidAndFilename($filename);
+ /** @var \OCP\Files\Storage\IStorage $storage */
+ list($storage, $internalPath) = Filesystem::resolvePath($filename);
+ if ($storage->instanceOfStorage(IVersionedStorage::class)) {
+ /** @var IVersionedStorage $storage */
+ if ($storage->saveVersion($internalPath)) {
+ return true;
+ }
+ }
+ // fallback implementation below - need to go into class Common
$files_view = new View('/'.$uid .'/files');
$users_view = new View('/'.$uid);
diff --git a/apps/files_versions/tests/VersioningTest.php b/apps/files_versions/tests/VersioningTest.php
index 13c1e8f5a492..3e5e3865ed39 100644
--- a/apps/files_versions/tests/VersioningTest.php
+++ b/apps/files_versions/tests/VersioningTest.php
@@ -34,7 +34,9 @@
require_once __DIR__ . '/../appinfo/app.php';
+use OC\Files\ObjectStore\ObjectStoreStorage;
use OC\Files\Storage\Temporary;
+use OCP\Files\Storage;
use Test\TestCase;
/**
@@ -676,6 +678,8 @@ public function testStoreVersionAsAnonymous() {
* @param string $path
*/
private function createAndCheckVersions(\OC\Files\View $view, $path) {
+ $this->markTestSkippedIfStorageHasOwnVersioning();
+
$view->file_put_contents($path, 'test file');
$view->file_put_contents($path, 'version 1');
$view->file_put_contents($path, 'version 2');
@@ -721,6 +725,13 @@ public static function loginHelper($user, $create = false) {
\OC::$server->getUserFolder($user);
}
+ private function markTestSkippedIfStorageHasOwnVersioning() {
+ /** @var Storage $storage */
+ list($storage, $internalPath) = $this->rootView->resolvePath(self::USERS_VERSIONS_ROOT);
+ if ($storage->instanceOfStorage(ObjectStoreStorage::class)) {
+ $this->markTestSkipped();
+ }
+ }
}
// extend the original class to make it possible to test protected methods
diff --git a/apps/files_versions/tests/js/versionmodelSpec.js b/apps/files_versions/tests/js/versionmodelSpec.js
index 3aeaecab7cec..ef4e07c23638 100644
--- a/apps/files_versions/tests/js/versionmodelSpec.js
+++ b/apps/files_versions/tests/js/versionmodelSpec.js
@@ -18,13 +18,12 @@ describe('OCA.Versions.VersionModel', function() {
beforeEach(function() {
model = new VersionModel({
- id: 10000000,
+ id: 123456789,
fileId: 10000000,
timestamp: 10000000,
fullPath: '/subdir/some file.txt',
name: 'some file.txt',
size: 150,
- versionId: 123456789
});
OC.currentUser = 'user0';
diff --git a/core/js/files/client.js b/core/js/files/client.js
index 222f5cadf55a..66bcf7b3ce23 100644
--- a/core/js/files/client.js
+++ b/core/js/files/client.js
@@ -797,7 +797,7 @@
* @param {Object} [headers=null] additional headers
*
* @return {Promise} promise
- * @since 10.1.0
+ * @since 10.0.5
*/
copy: function(path, destinationPath, allowOverwrite, headers, options) {
return this._moveOrCopy('COPY', path, destinationPath, allowOverwrite, headers, options);
diff --git a/lib/private/Files/Meta/MetaFileVersionNode.php b/lib/private/Files/Meta/MetaFileVersionNode.php
index 8aa245baefff..4ab1b29320d7 100644
--- a/lib/private/Files/Meta/MetaFileVersionNode.php
+++ b/lib/private/Files/Meta/MetaFileVersionNode.php
@@ -106,8 +106,7 @@ public function copy($targetPath) {
if (!$target->isUpdateable()) {
throw new ForbiddenException("Cannot write to $targetPath", false);
}
- $this->storage->restoreVersion($this->internalPath, $this->versionId);
- return true;
+ return $this->storage->restoreVersion($this->internalPath, $this->versionId);
}
// for now we only allow restoring of a version
@@ -119,7 +118,7 @@ public function getMTime() {
}
public function getMimetype() {
- return isset($this->versionInfo['mime-type']) ? $this->versionInfo['mime-type'] : 'application/octet-stream';
+ return isset($this->versionInfo['mimetype']) ? $this->versionInfo['mimetype'] : 'application/octet-stream';
}
public function getEtag() {
diff --git a/lib/private/Files/Meta/MetaRootNode.php b/lib/private/Files/Meta/MetaRootNode.php
index dbf9a1f55f44..0162b309d7f1 100644
--- a/lib/private/Files/Meta/MetaRootNode.php
+++ b/lib/private/Files/Meta/MetaRootNode.php
@@ -118,7 +118,7 @@ public function isCreatable() {
* @inheritdoc
*/
public function getPath() {
- return $this->getName();
+ return '/meta';
}
/**
diff --git a/lib/private/Files/Meta/MetaVersionCollection.php b/lib/private/Files/Meta/MetaVersionCollection.php
index 6b042643db84..8bcdb4985f21 100644
--- a/lib/private/Files/Meta/MetaVersionCollection.php
+++ b/lib/private/Files/Meta/MetaVersionCollection.php
@@ -81,9 +81,13 @@ public function getDirectoryListing() {
}
/** @var IVersionedStorage | Storage $storage */
$versions = $storage->getVersions($internalPath);
- return array_map(function($version) use ($storage, $internalPath) {
+ return array_values(array_map(function($version) use ($storage, $internalPath, $view, $path) {
+ if (!isset($version['mimetype'])) {
+ $version['mimetype'] = $view->getMimeType($path);
+ }
+
return new MetaFileVersionNode($this, $this->root, $version, $storage, $internalPath);
- }, $versions);
+ }, $versions));
}
/**
@@ -107,6 +111,9 @@ public function get($path) {
if ($version === null) {
throw new NotFoundException();
}
+ if (!isset($version['mimetype'])) {
+ $version['mimetype'] = $view->getMimeType($path);
+ }
return new MetaFileVersionNode($this, $this->root, $version, $storage, $internalPath);
}
@@ -120,4 +127,8 @@ public function getId() {
public function getName() {
return "v";
}
+
+ public function getPath() {
+ return "/meta/{$this->fileId}/v";
+ }
}
diff --git a/lib/private/Files/ObjectStore/ObjectStoreStorage.php b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
index 735ff6fd9cb0..e7c487992e18 100644
--- a/lib/private/Files/ObjectStore/ObjectStoreStorage.php
+++ b/lib/private/Files/ObjectStore/ObjectStoreStorage.php
@@ -27,7 +27,9 @@
use Icewind\Streams\IteratorDirectory;
use OC\Files\Cache\CacheEntry;
+use OCP\Files\NotFoundException;
use OCP\Files\ObjectStore\IObjectStore;
+use OCP\Files\ObjectStore\IVersionedObjectStorage;
class ObjectStoreStorage extends \OC\Files\Storage\Common {
@@ -410,4 +412,64 @@ public function writeBack($tmpFile) {
public function hasUpdated($path, $time) {
return false;
}
+
+ public function saveVersion($internalPath) {
+ if ($this->objectStore instanceof IVersionedObjectStorage) {
+ $stat = $this->stat($internalPath);
+ // There are cases in the current implementation where saveVersion
+ // is called before the file was even written.
+ // There is nothing to be done in this case.
+ // We return true to not trigger the fallback implementation
+ if ($stat === false) {
+ return true;
+ }
+ return $this->objectStore->saveVersion($this->getURN($stat['fileid']));
+ }
+ return parent::saveVersion($internalPath);
+ }
+
+ public function getVersions($internalPath) {
+ if ($this->objectStore instanceof IVersionedObjectStorage) {
+ $stat = $this->stat($internalPath);
+ if ($stat === false) {
+ throw new NotFoundException();
+ }
+ return $this->objectStore->getVersions($this->getURN($stat['fileid']));
+ }
+ return parent::getVersions($internalPath);
+ }
+
+ public function getVersion($internalPath, $versionId) {
+ if ($this->objectStore instanceof IVersionedObjectStorage) {
+ $stat = $this->stat($internalPath);
+ if ($stat === false) {
+ throw new NotFoundException();
+ }
+ return $this->objectStore->getVersion($this->getURN($stat['fileid']), $versionId);
+ }
+ return parent::getVersion($internalPath, $versionId);
+ }
+
+ public function getContentOfVersion($internalPath, $versionId) {
+ if ($this->objectStore instanceof IVersionedObjectStorage) {
+ $stat = $this->stat($internalPath);
+ if ($stat === false) {
+ throw new NotFoundException();
+ }
+ return $this->objectStore->getContentOfVersion($this->getURN($stat['fileid']), $versionId);
+ }
+ return parent::getContentOfVersion($internalPath, $versionId);
+ }
+
+ public function restoreVersion($internalPath, $versionId) {
+ if ($this->objectStore instanceof IVersionedObjectStorage) {
+ $stat = $this->stat($internalPath);
+ if ($stat === false) {
+ throw new NotFoundException();
+ }
+ return $this->objectStore->restoreVersion($this->getURN($stat['fileid']), $versionId);
+ }
+ return parent::restoreVersion($internalPath, $versionId);
+ }
+
}
diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
index ebca69b0c969..161ecda60de1 100644
--- a/lib/private/Files/Storage/Common.php
+++ b/lib/private/Files/Storage/Common.php
@@ -695,7 +695,7 @@ public function getVersions($internalPath) {
list ($uid, $filename) = $this->convertInternalPathToGlobalPath($internalPath);
return array_map(function ($version) use ($internalPath) {
- $version['mime-type'] = $this->getMimeType($internalPath);
+ $version['mimetype'] = $this->getMimeType($internalPath);
return $version;
}, array_values(
\OCA\Files_Versions\Storage::getVersions($uid, $filename)));
@@ -738,4 +738,9 @@ public function restoreVersion($internalPath, $versionId) {
$v = $this->getVersion($internalPath, $versionId);
return \OCA\Files_Versions\Storage::restoreVersion($v['owner'], $v['path'], $v['storage_location'], $versionId);
}
+
+ public function saveVersion($internalPath) {
+ // returning false here will trigger the fallback implementation
+ return false;
+ }
}
diff --git a/lib/public/Files/ObjectStore/IVersionedObjectStorage.php b/lib/public/Files/ObjectStore/IVersionedObjectStorage.php
new file mode 100644
index 000000000000..9cd048c3470e
--- /dev/null
+++ b/lib/public/Files/ObjectStore/IVersionedObjectStorage.php
@@ -0,0 +1,80 @@
+
+ *
+ * @copyright Copyright (c) 2017, ownCloud GmbH
+ * @license AGPL-3.0
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program. If not, see