wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Include etags for the root of the shared folder

Browse source
This commit is contained in:
Michael Gapczynski 2013-02-19 20:42:48 -05:00
parent 3878203679
commit 3dfb1628ce
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/files_sharing/lib/cache.php
View file

@ -28,10 +28,11 @@ namespace OC\Files\Cache;
*/ */
class Shared_Cache extends Cache { class Shared_Cache extends Cache {
private $storage;
private $files = array(); private $files = array();
public function __construct($storage) { public function __construct($storage) {
$this->storage = $storage;
} }
/** /**
@ -64,7 +65,14 @@ class Shared_Cache extends Cache {
*/ */
public function get($file) { public function get($file) {
if ($file == '') { if ($file == '') {
return \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT); $data = \OCP\Share::getItemsSharedWith('file', \OC_Share_Backend_File::FORMAT_FILE_APP_ROOT);
$etag = \OCP\Config::getUserValue(\OCP\User::getUser(), 'files_sharing', 'etag');
if (!isset($etag)) {
$etag = $this->storage->getETag('');
\OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag);
}
$data['etag'] = $etag;
return $data;
} else if (is_string($file)) { } else if (is_string($file)) {
if ($cache = $this->getSourceCache($file)) { if ($cache = $this->getSourceCache($file)) {
return $cache->get($this->files[$file]); return $cache->get($this->files[$file]);
@ -117,7 +125,9 @@ class Shared_Cache extends Cache {
* @return int file id * @return int file id
*/ */
public function put($file, array $data) { public function put($file, array $data) {
if ($cache = $this->getSourceCache($file)) { if ($file == '' && isset($data['etag'])) {
\OCP\Config::setUserValue(\OCP\User::getUser(), 'files_sharing', 'etag', $etag);
} else if ($cache = $this->getSourceCache($file)) {
return $cache->put($this->files[$file], $data); return $cache->put($this->files[$file], $data);
} }
return false; return false;