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

Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring

Browse source
This commit is contained in:
Jan-Christoph Borchardt 2011-04-17 15:47:34 +02:00
commit 4865f423f5
4 changed files with 54 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
lib/filestorage.php
View file

@ -92,13 +92,14 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
}
public function mkdir($path){
if($return=mkdir($this->datadir.$path)){
$this->notifyObservers($path,OC_FILEACTION_CREATE);
$this->clearFolderSizeCache($path);
}
return $return;
}
public function rmdir($path){
if($return=rmdir($this->datadir.$path)){
$this->notifyObservers($path,OC_FILEACTION_DELETE);
$this->clearFolderSizeCache($path);
}
return $return;
}
@ -170,6 +171,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
public function unlink($path){
if($return=unlink($this->datadir.$path)){
$this->notifyObservers($path,OC_FILEACTION_DELETE);
$this->clearFolderSizeCache($path);
}
return $return;
}
@ -189,6 +191,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
}
if($return=copy($this->datadir.$path1,$this->datadir.$path2)){
$this->notifyObservers($path2,OC_FILEACTION_CREATE);
$this->clearFolderSizeCache($path);
}
return $return;
}
@ -383,6 +386,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
if(rename($tmpFile,$this->datadir.$path)){
touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
$this->notifyObservers($path,OC_FILEACTION_CREATE);
$this->clearFolderSizeCache($path);
return true;
}else{
return false;
@ -394,6 +398,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
if(move_uploaded_file($tmpFile,$this->datadir.$path)){
touch($this->datadir.$path, $fileStats['mtime'], $fileStats['atime']);
$this->notifyObservers($path,OC_FILEACTION_CREATE);
$this->clearFolderSizeCache($path);
return true;
}else{
return false;
@ -410,6 +415,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
if(is_file($dir.'/'.$item)){
if(unlink($dir.'/'.$item)){
$this->notifyObservers($dir.'/'.$item,OC_FILEACTION_DELETE);
$this->clearFolderSizeCache($path);
}
}elseif(is_dir($dir.'/'.$item)){
if (!$this->delTree($dirRelative. "/" . $item)){
@ -419,6 +425,7 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
}
if($return=rmdir($dir)){
$this->notifyObservers($dir,OC_FILEACTION_DELETE);
$this->clearFolderSizeCache($path);
}
return $return;
}
@ -481,24 +488,33 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
* @return int size of folder and it's content
*/
public function calculateFolderSize($path){
if($this->is_file($path)){
$path=dirname($path);
}
$path=str_replace('//','/',$path);
if($this->is_dir($path) and substr($path,-1)!='/'){
$path.='/';
}
error_log("calc: $path");
$size=0;
if ($dh = $this->opendir($path)) {
while (($filename = readdir($dh)) !== false) {
if($filename!='.' and $filename!='..'){
$subFile=$path.'/'.$filename;
if($this->is_file($subFile)){
$size+=$this->filesize($subFile);
}else{
$size+=$this->calculateFolderSize($subFile);
}
}
}
$query=OC_DB::prepare("SELECT size FROM *PREFIX*foldersize WHERE path=?");
$hasSize=$query->execute(array($path))->fetchAll();
if(count($hasSize)>0){// yes, update it
$query=OC_DB::prepare("UPDATE *PREFIX*foldersize SET size=? WHERE path=?");
$result=$query->execute(array($size,$path));
$size+=$hasSize[0]['size'];
}else{// no insert it
while (($filename = readdir($dh)) !== false) {
if($filename!='.' and $filename!='..'){
$subFile=$path.'/'.$filename;
if($this->is_file($subFile)){
$size+=$this->filesize($subFile);
}else{
$size+=$this->calculateFolderSize($subFile);
}
}
}
$query=OC_DB::prepare("INSERT INTO *PREFIX*foldersize VALUES(?,?)");
$result=$query->execute(array($path,$size));
}
@ -511,13 +527,25 @@ class OC_FILESTORAGE_LOCAL extends OC_FILESTORAGE{
* @param string $path
*/
public function clearFolderSizeCache($path){
$path=dirname($path);
if($this->is_file($path)){
$path=dirname($path);
}
$path=str_replace('//','/',$path);
if($this->is_dir($path) and substr($path,-1)!='/'){
$path.='/';
}
error_log($path);
$query=OC_DB::prepare("DELETE FROM *PREFIX*foldersize WHERE path = ?");
$result=$query->execute(array($path));
if($path!='/'){
$parts=explode('/');
array_pop($parts);
if($path!='/' and $path!=''){
$parts=explode('/',$path);
//pop empty part
$part=array_pop($parts);
if(empty($part)){
array_pop($parts);
}
$parent=implode('/',$parts);
$this->clearFolderSizeCache($parent);
}
}
}

2
lib/installer.php
View file

@ -68,7 +68,7 @@ class OC_INSTALLER{
self::createDBUser($username,$password,$connection);
//use the admin login data for the new database user
OC_CONFIG::setValue('dbuser',$username);
OC_CONFIG::setValue('dbpass',$password);
OC_CONFIG::setValue('dbpassword',$password);
//create the database
self::createDatabase($dbname,$username,$connection);

9
settings/index.php
View file

@ -8,7 +8,14 @@ if( !OC_USER::isLoggedIn()){
}
$tmpl = new OC_TEMPLATE( "settings", "index", "admin" );
$tmpl = new OC_TEMPLATE( "settings", "index", "admin");
$used=OC_FILESYSTEM::filesize('/');
$free=disk_free_space(OC_CONFIG::getValue('datadirectory'));
$total=$free+$used;
$relative=round(($used/$total)*100);
$tmpl->assign('usage',OC_HELPER::humanFileSize($used));
$tmpl->assign('total_space',OC_HELPER::humanFileSize($total));
$tmpl->assign('usage_relative',$relative);
$tmpl->printPage();
?>

4
settings/templates/index.php
View file

@ -1,8 +1,8 @@
<form id="quota">
<fieldset>
<legend>Account information</legend>
<div id="quota_indicator"><div style="width:72%;">&nbsp;</div></div>
<p>You're currently using 72% (7.2GB) of your 10GB space.</p>
<div id="quota_indicator"><div style="width:<?php echo $_['usage_relative'] ?>%;">&nbsp;</div></div>
<p>You're currently using <?php echo $_['usage_relative'] ?>% (<?php echo $_['usage'] ?>) of your <?php echo $_['total_space'] ?> space.</p>
</fieldset>
</form>