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

Merge pull request #400 from owncloud/simplify-polling

Browse Source 
Move ops sync to a separate method
This commit is contained in:
VicDeo 2014-11-12 01:27:28 +03:00
commit 5bcdb206ea
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
controller/sessioncontroller.php
View File

@ -142,9 +142,8 @@ class SessionController extends Controller{
case 'sync_ops': case 'sync_ops':
$seqHead = (string) isset($args['seq_head']) ? $args['seq_head'] : null; $seqHead = (string) isset($args['seq_head']) ? $args['seq_head'] : null;
if (!is_null($seqHead)){ if (!is_null($seqHead)){
$ops = isset($args['client_ops']) ? $args['client_ops'] : null; $ops = isset($args['client_ops']) ? $args['client_ops'] : array();
$hasOps = is_array($ops) && count($ops)>0;
$op = new Db\Op(); $op = new Db\Op();
$currentHead = $op->getHeadSeq($esId); $currentHead = $op->getHeadSeq($esId);
@ -153,40 +152,10 @@ class SessionController extends Controller{
} catch (\Exception $e){ } catch (\Exception $e){
//Db error. Not critical //Db error. Not critical
} }
$response->setData(
$session->syncOps($memberId, $currentHead, $seqHead, $ops)
);
// TODO handle the case ($currentHead == "") && ($seqHead != "")
if ($seqHead == $currentHead) {
// matching heads
if ($hasOps) {
// incoming ops without conflict
// Add incoming ops, respond with a new head
$newHead = Db\Op::addOpsArray($esId, $memberId, $ops);
$response->setData(
array(
'result' => 'added',
'head_seq' => $newHead ? $newHead : $currentHead
)
);
} else {
// no incoming ops (just checking for new ops...)
$response->setData(
array(
'result' => 'new_ops',
'ops' => array(),
'head_seq' => $currentHead
)
);
}
} else { // HEADs do not match
$response->setData(
array(
'result' => $hasOps ? 'conflict' : 'new_ops',
'ops' => $op->getOpsAfterJson($esId, $seqHead),
'head_seq' => $currentHead,
)
);
}
$inactiveMembers = $member->updateByTimeout($esId); $inactiveMembers = $member->updateByTimeout($esId);
foreach ($inactiveMembers as $inactive){ foreach ($inactiveMembers as $inactive){
$op->removeCursor($esId, $inactive); $op->removeCursor($esId, $inactive);

35
lib/db/session.php
View File

@ -120,6 +120,41 @@ class Session extends \OCA\Documents\Db {
$op->deleteBy('es_id', $esId); $op->deleteBy('es_id', $esId);
} }
public function syncOps($memberId, $currentHead, $clientHead, $clientOps){
$hasOps = count($clientOps)>0;
$op = new \OCA\Documents\Db\Op();
// TODO handle the case ($currentHead == "") && ($seqHead != "")
if ($clientHead == $currentHead) {
// matching heads
if ($hasOps) {
// incoming ops without conflict
// Add incoming ops, respond with a new head
$newHead = \OCA\Documents\Db\Op::addOpsArray($this->getEsId(), $memberId, $clientOps);
$result = array(
'result' => 'added',
'head_seq' => $newHead ? $newHead : $currentHead
);
} else {
// no incoming ops (just checking for new ops...)
$result = array(
'result' => 'new_ops',
'ops' => array(),
'head_seq' => $currentHead
);
}
} else { // HEADs do not match
$result = array(
'result' => $hasOps ? 'conflict' : 'new_ops',
'ops' => $op->getOpsAfterJson($this->getEsId(), $clientHead),
'head_seq' => $currentHead,
);
}
return $result;
}
public function insert(){ public function insert(){
$esId = $this->getUniqueSessionId(); $esId = $this->getUniqueSessionId();
array_unshift($this->data, $esId); array_unshift($this->data, $esId);