franzz/catc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Server sync

Browse Source
This commit is contained in:
Franzz
2019-10-05 00:34:18 +02:00
parent 4cc305e8b5
commit d72c6c0dde
11 changed files with 163 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

81
inc/catc.php
View File

@@ -2,6 +2,9 @@
class CATC extends Main
{
const GZ_LVL = 4;
/**
* Auth Object
* @var Auth
@@ -21,6 +24,9 @@ class CATC extends Main
//if($this->oDb->sDbState == Db::DB_PEACHY) $this->oAuth = new Auth($this->oDb, Settings::API_KEY);
$this->oAuth = new Auth($this->oDb, Settings::API_KEY);
//TODO remove. For upgrade purposes only
(new Doc($this->oDb))->getList('full');
}
protected function install()
@@ -41,7 +47,7 @@ class CATC extends Main
Course::COURSE_TABLE => array(Db::getId('workshops'), 'description', 'timeslot'),
Note::NOTE_TABLE => array(Db::getId(Auth::USER_TABLE), Db::getId(Course::COURSE_TABLE), 'notes'),
Definition::DEF_TABLE => array(Db::getId(Auth::USER_TABLE), 'title', 'description'),
Doc::DOC_TABLE => array(Db::getId(Auth::USER_TABLE), Db::getId(Course::COURSE_TABLE), 'type', 'filename'),
Doc::DOC_TABLE => array(Db::getId(Auth::USER_TABLE), Db::getId(Course::COURSE_TABLE), 'type', 'filename', 'filehash'),
'todos' => array(Db::getId(Auth::USER_TABLE), Db::getId(Course::COURSE_TABLE), 'description')
),
'types' => array
@@ -56,7 +62,8 @@ class CATC extends Main
'timeslot' => "ENUM('SAT-M', 'SAT-A', 'SUN-M', 'SUN-A')",
'notes' => "LONGTEXT",
'type' => "VARCHAR(10)",
'filename' => "VARCHAR(200)"
'filename' => "VARCHAR(200)",
'filehash' => "VARCHAR(40)"
),
'constraints' => array
(
@@ -181,4 +188,74 @@ class CATC extends Main
$bResult = $oDef->setDefinition($sTitle, $sDesc);
return self::getJsonResult($bResult, '', array('new_def'=>$bNew, 'def'=>$oDef->getDefinition()));
}
/* Sync */
public function pushToServer() {
$bSuccess = false;
$sDesc = '';
if(Settings::SERVER_URL == '') $sDesc = 'No remote server configured';
else {
$sBackup = $this->oDb->getBackup();
if($sBackup === false) $sDesc = 'Error executing mysqldump';
else {
//Store backup as a zip file
$sBackupPath = Doc::DOC_FOLDER.'db/'.uniqid('backup_').'.sql.gz';
file_put_contents($sBackupPath, gzencode($sBackup, self::GZ_LVL));
//Send backup
$sResult = self::sendFileToServer('server_update', $sBackupPath);
//Parse response from server
$asResult = json_decode($sResult, true);
$bSuccess = ($asResult['result'] == self::SUCCESS);
$sDesc = $asResult['desc'];
unlink($sBackupPath);
//Send missing files
$asFiles = $asResult['data']['files'];
foreach($asFiles as $asFile) {
$this->sendFileToServer('file_update', $asFile['filepath'], $asFile['filename']);
}
}
}
return self::getJsonResult($bSuccess, $sDesc);
}
public function updateServer() {
$bSuccess = false;
$sDesc = '';
$asMissingFiles = array();
//Replace DB
$sBackupPath = Doc::DOC_FOLDER.'db/'.uniqid('backup_').'.sql';
$sCompressedPath = $sBackupPath.'.gz';
move_uploaded_file($_FILES['file']['tmp_name'], $sCompressedPath);
file_put_contents($sBackupPath, gzdecode(file_get_contents($sCompressedPath)));
unlink($sCompressedPath);
$sDesc = $this->oDb->restoreBackup($sBackupPath);
$bSuccess = ($sDesc=='');
unlink($sBackupPath);
//Check for missing files
$asMissingFiles = (new Doc($this->oDb))->getMissingFiles();
//Send list of missing files back
return self::getJsonResult($bSuccess, $sDesc, array('files'=>$asMissingFiles));
}
public function updateFile($sPath='') {
if($sPath=='') $sPath = Doc::DOC_FOLDER.$_FILES['file']['name'];
move_uploaded_file($_FILES['file']['tmp_name'], $sPath);
//TODO Check data integrity
}
private static function sendFileToServer($sAction, $sFilePath, $sFileName='file') {
$asPostData = array('a'=>$sAction, 'api'=>Settings::API_KEY);
$asPostData['file'] = new CURLFile(realpath($sFilePath), mime_content_type($sFilePath), $sFileName);
return ToolBox::curl(Settings::SERVER_URL, false, $asPostData);
}
}

46
inc/doc.php
View File

@@ -52,7 +52,7 @@ class Doc extends PhpObject {
}
}
$asData = array_merge($this->getDocKeys(), array('filename'=>$sFileName, 'type'=>$sType));
$asData = array_merge($this->getDocKeys(), array('type'=>$sType, 'filename'=>$sFileName, 'filehash'=>self::getChecksum($sFileName)));
$bResult = $this->oDb->insertRow(self::DOC_TABLE, $asData);
return $bResult?'':'error_db';
@@ -73,18 +73,54 @@ class Doc extends PhpObject {
return array_shift($asDocList);
}
public function getList($asConstraint=array()) {
$asKeys = empty($asConstraint)?$this->getDocKeys():$asConstraint;
$asDocs = $this->oDb->selectRows(array('select'=>array(Db::getId(self::DOC_TABLE), 'type', 'filename'), 'from'=>self::DOC_TABLE, 'constraint'=>$asKeys));
foreach($asDocs as &$asDoc) $asDoc['filepath'] = self::getFilePath($asDoc['filename']);
public function getList($oOption='self') {
if($oOption=='self') $asKeys = $this->getDocKeys();
elseif($oOption=='full') $asKeys = array();
elseif(is_array($oOption)) $asKeys = $oOption;
else return array();
$asDocs = $this->oDb->selectRows(array(
'select' => array(Db::getId(self::DOC_TABLE), 'type', 'filename', 'filehash'),
'from' => self::DOC_TABLE,
'constraint'=> $asKeys
));
foreach($asDocs as &$asDoc) {
$asDoc['filepath'] = self::getFilePath($asDoc['filename']);
//TODO remove. For upgrade purposes only
if($asDoc['filehash']=='') {
$asDoc['filehash'] = self::getChecksum($asDoc['filename']);
$this->oDb->updateRow(self::DOC_TABLE, $asDoc[Db::getId(self::DOC_TABLE)], array('filehash'=>$asDoc['filehash']), false);
}
}
return $asDocs;
}
public function getMissingFiles() {
$asDocs = $this->getList('full');
$asMissingFiles = array();
foreach($asDocs as $asDoc) {
$sHash = self::getChecksum($asDoc['filename']);
if(!file_exists($asDoc['filepath']) || $sHash!=$asDoc['filehash']) {
$asDoc['actual_hash'] = $sHash;
$asMissingFiles[] = $asDoc;
}
}
return $asMissingFiles;
}
private function getDocKeys() {
return array(Db::getId(Auth::USER_TABLE) => $this->iUserId, Db::getId(Course::WS_TABLE) => $this->iWorkshopId);
}
private static function getChecksum($sFileName) {
$sFilePath = self::getFilePath($sFileName);
return file_exists($sFilePath)?sha1_file($sFilePath):'';
}
private static function getFilePath($sFileName) {
return self::DOC_FOLDER.$sFileName;
}