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

Merge pull request #402 from owncloud/optype-as-a-separate-field

Browse Source 
Use a separate field for optype.
pull/1/head
VicDeo 10 years ago
parent 28a5038fbd 0f19d74f69
commit da3705e8b7
4 changed files with 105 additions and 57 deletions
Show Stats Download Patch File Download Diff File

7
appinfo/database.xml
Unescape Escape View File

@ -147,6 +147,13 @@
<length>4</length>
<comments>User and time specific</comments>
</field>
<field>
<name>optype</name>
<type>text</type>
<notnull>false</notnull>
<length>64</length>
<comments>Operation type</comments>
</field>
<field>
<name>opspec</name>
<type>clob</type>

14
appinfo/update.php
Unescape Escape View File

@ -32,4 +32,18 @@ if (version_compare($installedVersion, '0.7', '<=')) {
if (version_compare($installedVersion, '0.8', '<')) {
$query = \OC_DB::prepare('UPDATE `*PREFIX*documents_member` SET `is_guest`=1 WHERE `uid` LIKE \'%(guest)\' ');
$query->execute(array());
}
if (version_compare($installedVersion, '0.9', '<')) {
$query = \OC_DB::prepare('UPDATE `*PREFIX*documents_op` SET `optype`=? WHERE `seq`=?');
$ops = new \OCA\Documents\Db\Op();
foreach ($ops->getCollection() as $opData){
$opSpec = json_decode($opData['opspec'], true);
$query->execute(
array(
$opSpec['optype'],
$opData['seq']
)
);
}
}

2
appinfo/version
Unescape Escape View File

@ -1 +1 @@
0.8.2
0.9.0

139
lib/db/op.php
Unescape Escape View File

@ -17,21 +17,24 @@ class Op extends \OCA\Documents\Db {
protected $tableName = '`*PREFIX*documents_op`';
protected $insertStatement = 'INSERT INTO `*PREFIX*documents_op` (`es_id`, `member`, `opspec`) VALUES (?, ?, ?)';
protected $insertStatement = 'INSERT INTO `*PREFIX*documents_op` (`es_id`, `optype`, `member`, `opspec`) VALUES (?, ?, ?, ?)';
public static function addOpsArray($esId, $memberId, $ops){
$lastSeq = "";
$opObj = new Op();
foreach ($ops as $op) {
if (!$opObj->canInsertOp($esId, $memberId, $op)){
continue;
}
$opObj->setData(array(
$esId,
$memberId,
$esId,
$op['optype'],
$memberId,
json_encode($op)
));
$opObj->insert();
$lastSeq = $opObj->getLastInsertId();
}
return $lastSeq;
return $opObj->getHeadSeq($esId);
}
/**
@ -84,76 +87,100 @@ class Op extends \OCA\Documents\Db {
}
public function addMember($esId, $memberId, $fullName, $color, $imageUrl){
$op = '{"optype":"AddMember","memberid":"'. $memberId .'","timestamp":"'. time() .'", "setProperties":{"fullName":"'. $fullName .'","color":"'. $color .'","imageUrl":"'. $imageUrl .'"}}';
$op = array(
'optype' => 'AddMember',
'memberid' => (string) $memberId,
'timestamp' => (string) time(),
'setProperties' => array(
'fullName' => $fullName,
'color' => $color,
'imageUrl' => $imageUrl
)
);
$this->insertOp($esId, $memberId, $op);
}
public function removeCursor($esId, $memberId){
if ($this->hasOp($esId, $memberId, 'AddCursor') && !$this->hasLastOp($esId, $memberId, 'RemoveCursor')){
$op = '{"optype":"RemoveCursor","memberid":"'. $memberId .'","reason":"server-idle","timestamp":'. time() .'}';
$this->insertOp($esId, $memberId, $op);
}
$op = array(
'optype' => 'RemoveCursor',
'memberid' => (string) $memberId,
'reason' => 'server-idle',
'timestamp' => (string) time()
);
$this->insertOp($esId, $memberId, $op);
}
public function removeMember($esId, $memberId){
if ($this->hasOp($esId, $memberId, 'AddMember') && !$this->hasLastOp($esId, $memberId, 'RemoveMember')){
$op ='{"optype":"RemoveMember","memberid":"'. $memberId .'","timestamp":'. time() .'}';
$this->insertOp($esId, $memberId, $op);
}
}
public function updateMember($esId, $memberId, $fullName, $color, $imageUrl){
//TODO: Follow the spec https://github.com/kogmbh/WebODF/blob/master/webodf/lib/ops/OpUpdateMember.js#L95
$op = '{"optype":"UpdateMember","memberid":"'. $memberId .'","fullName":"'. $fullName .'","color":"'. $color .'","imageUrl":"'. $imageUrl .'","timestamp":'. time() .'}'
;
$op = array(
'optype' => 'RemoveMember',
'memberid' => (string) $memberId,
'timestamp' => (string) time()
);
$this->insertOp($esId, $memberId, $op);
}
//TODO: Implement https://github.com/kogmbh/WebODF/blob/master/webodf/lib/ops/OpUpdateMember.js#L95
public function changeNick($esId, $memberId, $fullName){
$op = '{"optype":"UpdateMember","memberid":"'. $memberId .'", "setProperties":{"fullName":"'. $fullName .'"},"timestamp":'. time() .'}'
;
$op = array(
'optype' => 'UpdateMember',
'memberid' => (string) $memberId,
'timestamp' => (string) time(),
'setProperties' => array(
'fullName' => $fullName,
)
);
$this->insertOp($esId, $memberId, $op);
}
protected function insertOp($esId, $memberId, $op){
$op = new Op(array(
$esId,
$memberId,
$op
));
$op->insert();
if ($this->canInsertOp($esId, $memberId, $op)){
$op = new Op(array(
$esId,
$op['optype'],
$memberId,
json_encode($op)
));
$op->insert();
}
}
protected function hasLastOp($esId, $memberId, $opType){
$query = \OCP\DB::prepare('
SELECT `opspec`
FROM ' . self::DB_TABLE . '
WHERE `es_id`=?
AND `member`=?
ORDER BY `seq` DESC
',
2,0
);
protected function canInsertOp($esId, $memberId, $op){
$cursorOps = array('AddCursor', 'RemoveCursor');
$memberOps = array('AddMember', 'RemoveMember');
$result = true;
$result = $query->execute(array($esId, $memberId));
$ops = $result->fetchAll();
foreach ($ops as $op){
$decoded = json_decode($op['opspec'], true);
if ($decoded['optype']==$opType){
return true;
}
switch ($op['optype']){
case 'AddCursor':
$ops = $this->getFilteredMemberOps($esId, $memberId, $cursorOps);
$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 false;
return $result;
}
protected function hasOp($esId, $memberId, $opType){
$ops = $this->execute(
'SELECT * FROM ' . $this->tableName . ' WHERE `es_id`=? AND `opspec` LIKE \'%"' . $opType . '","memberid":"' . $memberId .'"%\'',
array($esId)
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 = $ops->fetchAll();
return is_array($result) && count($result)>0;
$ops = $result->fetchAll();
if (!is_array($ops)){
$ops = array();
}
return $ops;
}
}

Write Preview
Loading…
Cancel
Save