Skip to content

Commit

Permalink
delay getting the home dir of a user untill needed
Browse files Browse the repository at this point in the history
for cache-only operations we don't actually need to know the home directory

Signed-off-by: Robin Appelman <robin@icewind.nl>
  • Loading branch information
icewind1991 authored and PVince81 committed Nov 4, 2022
1 parent aa3be11 commit 612b2a4
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 9 deletions.
16 changes: 14 additions & 2 deletions lib/private/Files/Storage/Home.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,12 +49,24 @@ class Home extends Local implements \OCP\Files\IHomeStorage {
*/
public function __construct($arguments) {
$this->user = $arguments['user'];
$datadir = $this->user->getHome();
$this->id = 'home::' . $this->user->getUID();

parent::__construct(['datadir' => $datadir]);
// use a placeholder datadir until we actually need to caluclate a source path
//
// this allows using this storage with a LazyUser without having to get the real user
// as long as only cache operations are done
parent::__construct(['datadir' => '/tmp/empty/placeholder/']);
}

public function getSourcePath($path) {
if ($this->datadir == '/tmp/empty/placeholder/') {
$this->setDataDir($this->user->getHome());
}

return parent::getSourcePath($path);
}


public function getId() {
return $this->id;
}
Expand Down
19 changes: 12 additions & 7 deletions lib/private/Files/Storage/Local.php
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,18 @@ public function __construct($arguments) {
if (!isset($arguments['datadir']) || !is_string($arguments['datadir'])) {
throw new \InvalidArgumentException('No data directory set for local storage');
}
$this->datadir = str_replace('//', '/', $arguments['datadir']);

$this->setDataDir($arguments['datadir']);
$this->config = \OC::$server->get(IConfig::class);
$this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class);
$this->defUMask = $this->config->getSystemValue('localstorage.umask', 0022);

// support Write-Once-Read-Many file systems
$this->unlinkOnTruncate = $this->config->getSystemValue('localstorage.unlink_on_truncate', false);
}

protected function setDataDir(string $dataDir) {
$this->datadir = str_replace('//', '/', $dataDir);
// some crazy code uses a local storage on root...
if ($this->datadir === '/') {
$this->realDataDir = $this->datadir;
Expand All @@ -87,12 +98,6 @@ public function __construct($arguments) {
$this->datadir .= '/';
}
$this->dataDirLength = strlen($this->realDataDir);
$this->config = \OC::$server->get(IConfig::class);
$this->mimeTypeDetector = \OC::$server->get(IMimeTypeDetector::class);
$this->defUMask = $this->config->getSystemValue('localstorage.umask', 0022);

// support Write-Once-Read-Many file systems
$this->unlinkOnTruncate = $this->config->getSystemValue('localstorage.unlink_on_truncate', false);
}

public function __destruct() {
Expand Down

0 comments on commit 612b2a4

Please sign in to comment.