DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve filtering for member/cursor operations

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-11-13 20:05:58 +03:00
parent 59a095e98d
commit 0f19d74f69
1 changed files with 52 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

77
lib/db/op.php
View File

@ -20,9 +20,11 @@ class Op extends \OCA\Documents\Db {
protected $insertStatement = 'INSERT INTO `*PREFIX*documents_op` (`es_id`, `optype`, `member`, `opspec`) VALUES (?, ?, ?, ?)'; protected $insertStatement = 'INSERT INTO `*PREFIX*documents_op` (`es_id`, `optype`, `member`, `opspec`) VALUES (?, ?, ?, ?)';
public static function addOpsArray($esId, $memberId, $ops){ public static function addOpsArray($esId, $memberId, $ops){
$lastSeq = "";
$opObj = new Op(); $opObj = new Op();
foreach ($ops as $op) { foreach ($ops as $op) {
if (!$opObj->canInsertOp($esId, $memberId, $op)){
continue;
}
$opObj->setData(array( $opObj->setData(array(
$esId, $esId,
$op['optype'], $op['optype'],
@ -30,9 +32,9 @@ class Op extends \OCA\Documents\Db {
json_encode($op) json_encode($op)
)); ));
$opObj->insert(); $opObj->insert();
$lastSeq = $opObj->getLastInsertId();
} }
return $lastSeq;
return $opObj->getHeadSeq($esId);
} }
/** /**
@ -105,10 +107,8 @@ class Op extends \OCA\Documents\Db {
'reason' => 'server-idle', 'reason' => 'server-idle',
'timestamp' => (string) time() 'timestamp' => (string) time()
); );
if ($this->hasOp($esId, $memberId, 'AddCursor') && !$this->hasLastOp($esId, $memberId, 'RemoveCursor')){
$this->insertOp($esId, $memberId, $op); $this->insertOp($esId, $memberId, $op);
} }
}
public function removeMember($esId, $memberId){ public function removeMember($esId, $memberId){
$op = array( $op = array(
@ -116,10 +116,8 @@ class Op extends \OCA\Documents\Db {
'memberid' => (string) $memberId, 'memberid' => (string) $memberId,
'timestamp' => (string) time() 'timestamp' => (string) time()
); );
if ($this->hasOp($esId, $memberId, 'AddMember') && !$this->hasLastOp($esId, $memberId, 'RemoveMember')){
$this->insertOp($esId, $memberId, $op); $this->insertOp($esId, $memberId, $op);
} }
}
//TODO: Implement https://github.com/kogmbh/WebODF/blob/master/webodf/lib/ops/OpUpdateMember.js#L95 //TODO: Implement https://github.com/kogmbh/WebODF/blob/master/webodf/lib/ops/OpUpdateMember.js#L95
public function changeNick($esId, $memberId, $fullName){ public function changeNick($esId, $memberId, $fullName){
@ -135,6 +133,7 @@ class Op extends \OCA\Documents\Db {
} }
protected function insertOp($esId, $memberId, $op){ protected function insertOp($esId, $memberId, $op){
if ($this->canInsertOp($esId, $memberId, $op)){
$op = new Op(array( $op = new Op(array(
$esId, $esId,
$op['optype'], $op['optype'],
@ -143,37 +142,45 @@ class Op extends \OCA\Documents\Db {
)); ));
$op->insert(); $op->insert();
} }
}
protected function hasLastOp($esId, $memberId, $opType){ protected function canInsertOp($esId, $memberId, $op){
$query = \OCP\DB::prepare(' $cursorOps = array('AddCursor', 'RemoveCursor');
SELECT `opspec` $memberOps = array('AddMember', 'RemoveMember');
FROM ' . self::DB_TABLE . ' $result = true;
WHERE `es_id`=?
AND `member`=? switch ($op['optype']){
ORDER BY `seq` DESC case 'AddCursor':
', $ops = $this->getFilteredMemberOps($esId, $memberId, $cursorOps);
2,0 $result = !count($ops) || $ops[0]['optype'] === 'RemoveCursor';
break;
case 'RemoveCursor':
$ops = $this->getFilteredMemberOps($esId, $memberId, $cursorOps);
$result = count($ops) && $ops[0]['optype'] === 'AddCursor';
break;
case 'AddMember':
$ops = $this->getFilteredMemberOps($esId, $memberId, $memberOps);
$result = !count($ops) || $ops[0]['optype'] === 'RemoveMember';
break;
case 'RemoveMember':
$ops = $this->getFilteredMemberOps($esId, $memberId, $memberOps);
$result = count($ops) && $ops[0]['optype'] === 'AddMember';
break;
}
return $result;
}
protected function getFilteredMemberOps($esId, $memberId, $targetOps){
$stmt = $this->buildInQuery('optype', $targetOps);
$result = $this->execute('
SELECT `optype` FROM ' . $this->tableName . '
WHERE es_id=? AND member=? AND ' . $stmt . 'ORDER BY `seq` DESC',
array_merge(array($esId, $memberId), $targetOps)
); );
$result = $query->execute(array($esId, $memberId));
$ops = $result->fetchAll(); $ops = $result->fetchAll();
foreach ($ops as $op){ if (!is_array($ops)){
$decoded = json_decode($op['opspec'], true); $ops = array();
if ($decoded['optype']==$opType){
return true;
} }
return $ops;
} }
return false;
}
protected function hasOp($esId, $memberId, $opType){
$ops = $this->execute(
'SELECT * FROM ' . $this->tableName
. ' WHERE `es_id`=? AND `optype`=? AND `member`=?',
array($esId, $opType, $memberId)
);
$result = $ops->fetchAll();
return is_array($result) && count($result)>0;
}
} }