Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Refactor backup.

Browse Source
This commit is contained in:
chaideqing
2023-11-22 08:08:55 +00:00
parent 26abaf3be1
commit 8e9171f45a
3 changed files with 13 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/backup/control.php
+2 -2
View File
@@ -87,11 +87,11 @@ class backup extends control
* @access public
* @return void
*/
public function ajaxGetkDiskSpace()
public function ajaxGetDiskSpace()
{
set_time_limit(0);
session_write_close();
$diskSapce = $this->backup->getkDiskSpace($this->backupPath);
$diskSapce = $this->backup->getDiskSpace($this->backupPath);
$diskSapce = explode(',', $diskSapce);
$space = new stdclass();
module/backup/js/index.js
+1 -1
View File
@@ -10,7 +10,7 @@ $(function()
var that = this;
$(that).toggleClass('loading');
$(that).text(getSpaceLoading);
link = createLink('backup', 'ajaxGetkDiskSpace');
link = createLink('backup', 'ajaxGetDiskSpace');
$.get(link, function(data)
{
$(that).toggleClass('loading');
module/backup/model.php
+10 -17
View File
@@ -437,21 +437,19 @@ class backupModel extends model
*
* @param int $backupPath
* @access public
* @return int
* @return string
*/
public function getkDiskSpace($backupPath)
public function getDiskSpace($backupPath)
{
$nofile = strpos($this->config->backup->setting, 'nofile') !== false;
$diskFreeSpace = disk_free_space($backupPath);
$backFileSize = 0;
$zfile = $this->app->loadClass('zfile');
if(!$nofile)
{
$appRoot = $this->app->getAppRoot();
$appRootSize = $this->getZentaoSize($appRoot);
$backFileSize = $appRootSize - $zfile->getDirSize($appRoot . 'tmp') - $zfile->getDirSize($appRoot . 'www/course');
$appRootSize = $this->getDirSize($appRoot);
$backFileSize = $appRootSize - $this->getDirSize($appRoot . 'tmp') - $this->getDirSize($appRoot . 'www/data/course');
}
$backSqlSize = $this->dao->select('sum(data_length+index_length) as size')
@@ -464,26 +462,21 @@ class backupModel extends model
}
/**
* Get zentao size.
* Get directory size.
*
* @param string $appRoot
* @param string $dir
* @access public
* @return int
*/
public function getZentaoSize($appRoot)
public function getDirSize($dir)
{
if(!file_exists($dir)) return 0;
$totalSize = 0;
$tmpDir = realPath($appRoot . 'tmp/');
$dataDir = realPath($appRoot . 'www/data/');
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($appRoot, RecursiveDirectoryIterator::SKIP_DOTS));
$iterator = new RecursiveIteratorIterator(new RecursiveDirectoryIterator($dir, RecursiveDirectoryIterator::SKIP_DOTS));
foreach($iterator as $file)
{
$filePath = $file->getRealPath();
if(strpos($filePath, $tmpDir) !== 0 and strpos($filePath, $dataDir) !== 0)
{
$totalSize += $file->getSize();
}
$totalSize += $file->getSize();
}
return $totalSize;
}