Move moveFromCache to CacheJail
This commit is contained in:
parent
f27d7cbf99
commit
b53d6598f1
|
@ -102,8 +102,4 @@ class Shared_Cache extends CacheJail {
|
||||||
public function clear() {
|
public function clear() {
|
||||||
// Not a valid action for Shared Cache
|
// Not a valid action for Shared Cache
|
||||||
}
|
}
|
||||||
|
|
||||||
public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
|
|
||||||
parent::moveFromCache($sourceCache, $sourcePath, $this->storage->getSourcePath($targetPath));
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -281,4 +281,20 @@ class CacheJail extends CacheWrapper {
|
||||||
$path = $this->cache->getPathById($id);
|
$path = $this->cache->getPathById($id);
|
||||||
return $this->getJailedPath($path);
|
return $this->getJailedPath($path);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Move a file or folder in the cache
|
||||||
|
*
|
||||||
|
* Note that this should make sure the entries are removed from the source cache
|
||||||
|
*
|
||||||
|
* @param \OCP\Files\Cache\ICache $sourceCache
|
||||||
|
* @param string $sourcePath
|
||||||
|
* @param string $targetPath
|
||||||
|
*/
|
||||||
|
public function moveFromCache(\OCP\Files\Cache\ICache $sourceCache, $sourcePath, $targetPath) {
|
||||||
|
if ($sourceCache === $this) {
|
||||||
|
return $this->move($sourcePath, $targetPath);
|
||||||
|
}
|
||||||
|
return $this->cache->moveFromCache($sourceCache, $sourcePath, $targetPath);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue