Merge pull request #26147 from nextcloud/backport/26013/stable20
[stable20] Return the fileid from `copyFromCache` and use it instead of doing an extra query
This commit is contained in:
commit
fe3b3a9cec
|
@ -614,7 +614,7 @@ class Cache implements ICache {
|
||||||
/**
|
/**
|
||||||
* Move a file or folder in the cache
|
* Move a file or folder in the cache
|
||||||
*
|
*
|
||||||
* @param \OCP\Files\Cache\ICache $sourceCache
|
* @param ICache $sourceCache
|
||||||
* @param string $sourcePath
|
* @param string $sourcePath
|
||||||
* @param string $targetPath
|
* @param string $targetPath
|
||||||
* @throws \OC\DatabaseException
|
* @throws \OC\DatabaseException
|
||||||
|
@ -1048,4 +1048,47 @@ class Cache implements ICache {
|
||||||
public function normalize($path) {
|
public function normalize($path) {
|
||||||
return trim(\OC_Util::normalizeUnicode($path), '/');
|
return trim(\OC_Util::normalizeUnicode($path), '/');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copy a file or folder in the cache
|
||||||
|
*
|
||||||
|
* @param ICache $sourceCache
|
||||||
|
* @param ICacheEntry $sourceEntry
|
||||||
|
* @param string $targetPath
|
||||||
|
* @return int fileid of copied entry
|
||||||
|
*/
|
||||||
|
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int {
|
||||||
|
if ($sourceEntry->getId() < 0) {
|
||||||
|
throw new \RuntimeException("Invalid source cache entry on copyFromCache");
|
||||||
|
}
|
||||||
|
$data = $this->cacheEntryToArray($sourceEntry);
|
||||||
|
$fileId = $this->put($targetPath, $data);
|
||||||
|
if ($fileId <= 0) {
|
||||||
|
throw new \RuntimeException("Failed to copy to " . $targetPath . " from cache with source data " . json_encode($data) . " ");
|
||||||
|
}
|
||||||
|
if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
|
||||||
|
$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
|
||||||
|
foreach ($folderContent as $subEntry) {
|
||||||
|
$subTargetPath = $targetPath . '/' . $subEntry->getName();
|
||||||
|
$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return $fileId;
|
||||||
|
}
|
||||||
|
|
||||||
|
private function cacheEntryToArray(ICacheEntry $entry): array {
|
||||||
|
return [
|
||||||
|
'size' => $entry->getSize(),
|
||||||
|
'mtime' => $entry->getMTime(),
|
||||||
|
'storage_mtime' => $entry->getStorageMTime(),
|
||||||
|
'mimetype' => $entry->getMimeType(),
|
||||||
|
'mimepart' => $entry->getMimePart(),
|
||||||
|
'etag' => $entry->getEtag(),
|
||||||
|
'permissions' => $entry->getPermissions(),
|
||||||
|
'encrypted' => $entry->isEncrypted(),
|
||||||
|
'creation_time' => $entry->getCreationTime(),
|
||||||
|
'upload_time' => $entry->getUploadTime(),
|
||||||
|
'metadata_etag' => $entry->getMetadataEtag(),
|
||||||
|
];
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -24,6 +24,7 @@ namespace OC\Files\Cache;
|
||||||
|
|
||||||
use OCP\Constants;
|
use OCP\Constants;
|
||||||
use OCP\Files\Cache\ICache;
|
use OCP\Files\Cache\ICache;
|
||||||
|
use OCP\Files\Cache\ICacheEntry;
|
||||||
use OCP\Files\Search\ISearchQuery;
|
use OCP\Files\Search\ISearchQuery;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
@ -134,4 +135,8 @@ class FailedCache implements ICache {
|
||||||
public function normalize($path) {
|
public function normalize($path) {
|
||||||
return $path;
|
return $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int {
|
||||||
|
throw new \Exception("Invalid cache");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -41,6 +41,8 @@ trait MoveFromCacheTrait {
|
||||||
*/
|
*/
|
||||||
abstract public function put($file, array $data);
|
abstract public function put($file, array $data);
|
||||||
|
|
||||||
|
abstract public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Move a file or folder in the cache
|
* Move a file or folder in the cache
|
||||||
*
|
*
|
||||||
|
@ -55,38 +57,4 @@ trait MoveFromCacheTrait {
|
||||||
|
|
||||||
$sourceCache->remove($sourcePath);
|
$sourceCache->remove($sourcePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Copy a file or folder in the cache
|
|
||||||
*
|
|
||||||
* @param \OCP\Files\Cache\ICache $sourceCache
|
|
||||||
* @param ICacheEntry $sourceEntry
|
|
||||||
* @param string $targetPath
|
|
||||||
*/
|
|
||||||
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, $targetPath) {
|
|
||||||
$this->put($targetPath, $this->cacheEntryToArray($sourceEntry));
|
|
||||||
if ($sourceEntry->getMimeType() === ICacheEntry::DIRECTORY_MIMETYPE) {
|
|
||||||
$folderContent = $sourceCache->getFolderContentsById($sourceEntry->getId());
|
|
||||||
foreach ($folderContent as $subEntry) {
|
|
||||||
$subTargetPath = $targetPath . '/' . $subEntry->getName();
|
|
||||||
$this->copyFromCache($sourceCache, $subEntry, $subTargetPath);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private function cacheEntryToArray(ICacheEntry $entry) {
|
|
||||||
return [
|
|
||||||
'size' => $entry->getSize(),
|
|
||||||
'mtime' => $entry->getMTime(),
|
|
||||||
'storage_mtime' => $entry->getStorageMTime(),
|
|
||||||
'mimetype' => $entry->getMimeType(),
|
|
||||||
'mimepart' => $entry->getMimePart(),
|
|
||||||
'etag' => $entry->getEtag(),
|
|
||||||
'permissions' => $entry->getPermissions(),
|
|
||||||
'encrypted' => $entry->isEncrypted(),
|
|
||||||
'creation_time' => $entry->getCreationTime(),
|
|
||||||
'upload_time' => $entry->getUploadTime(),
|
|
||||||
'metadata_etag' => $entry->getMetadataEtag(),
|
|
||||||
];
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -32,6 +32,7 @@ namespace OC\Files\ObjectStore;
|
||||||
use Icewind\Streams\CallbackWrapper;
|
use Icewind\Streams\CallbackWrapper;
|
||||||
use Icewind\Streams\CountWrapper;
|
use Icewind\Streams\CountWrapper;
|
||||||
use Icewind\Streams\IteratorDirectory;
|
use Icewind\Streams\IteratorDirectory;
|
||||||
|
use OC\Files\Cache\Cache;
|
||||||
use OC\Files\Cache\CacheEntry;
|
use OC\Files\Cache\CacheEntry;
|
||||||
use OC\Files\Storage\PolyFill\CopyDirectory;
|
use OC\Files\Storage\PolyFill\CopyDirectory;
|
||||||
use OCP\Files\Cache\ICacheEntry;
|
use OCP\Files\Cache\ICacheEntry;
|
||||||
|
@ -566,14 +567,13 @@ class ObjectStoreStorage extends \OC\Files\Storage\Common {
|
||||||
|
|
||||||
$sourceUrn = $this->getURN($sourceEntry->getId());
|
$sourceUrn = $this->getURN($sourceEntry->getId());
|
||||||
|
|
||||||
$cache->copyFromCache($cache, $sourceEntry, $to);
|
if (!$cache instanceof Cache) {
|
||||||
$targetEntry = $cache->get($to);
|
throw new \Exception("Invalid source cache for object store copy");
|
||||||
|
|
||||||
if (!$targetEntry) {
|
|
||||||
throw new \Exception('Target not in cache after copy');
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$targetUrn = $this->getURN($targetEntry->getId());
|
$targetId = $cache->copyFromCache($cache, $sourceEntry, $to);
|
||||||
|
|
||||||
|
$targetUrn = $this->getURN($targetId);
|
||||||
|
|
||||||
try {
|
try {
|
||||||
$this->objectStore->copyObject($sourceUrn, $targetUrn);
|
$this->objectStore->copyObject($sourceUrn, $targetUrn);
|
||||||
|
|
|
@ -26,6 +26,7 @@ namespace OC\Lockdown\Filesystem;
|
||||||
use OC\Files\Cache\CacheEntry;
|
use OC\Files\Cache\CacheEntry;
|
||||||
use OCP\Constants;
|
use OCP\Constants;
|
||||||
use OCP\Files\Cache\ICache;
|
use OCP\Files\Cache\ICache;
|
||||||
|
use OCP\Files\Cache\ICacheEntry;
|
||||||
use OCP\Files\FileInfo;
|
use OCP\Files\FileInfo;
|
||||||
use OCP\Files\Search\ISearchQuery;
|
use OCP\Files\Search\ISearchQuery;
|
||||||
|
|
||||||
|
@ -122,4 +123,8 @@ class NullCache implements ICache {
|
||||||
public function normalize($path) {
|
public function normalize($path) {
|
||||||
return $path;
|
return $path;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int {
|
||||||
|
throw new \OC\ForbiddenException('This request is not allowed to access the filesystem');
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -179,6 +179,17 @@ interface ICache {
|
||||||
*/
|
*/
|
||||||
public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath);
|
public function moveFromCache(ICache $sourceCache, $sourcePath, $targetPath);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Copy a file or folder in the cache
|
||||||
|
*
|
||||||
|
* @param ICache $sourceCache
|
||||||
|
* @param ICacheEntry $sourceEntry
|
||||||
|
* @param string $targetPath
|
||||||
|
* @return int fileid of copied entry
|
||||||
|
* @since 22.0.0
|
||||||
|
*/
|
||||||
|
public function copyFromCache(ICache $sourceCache, ICacheEntry $sourceEntry, string $targetPath): int;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Get the scan status of a file
|
* Get the scan status of a file
|
||||||
*
|
*
|
||||||
|
|
Loading…
Reference in New Issue