deepcrayon
/
lila
1
0
Fork 0
Code Releases Activity

probably fix study conceal progress race condition

profile_links
Thibault Duplessis 2016-05-19 14:23:07 +02:00
parent b34b294cc4
commit 62720acfde
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
modules/study/src/main/StudyApi.scala
View File

@ -75,18 +75,9 @@ final class StudyApi(
} flatMap {
case None => funit >>- reloadUid(study, uid)
case Some(chapter) if study.position.path != position.path =>
studyRepo.setPosition(study.id, position) >> {
chapter.conceal ?? { conceal =>
chapter.root.lastMainlinePlyOf(position.path).some.filter(_ > conceal) ?? { newConceal =>
if (newConceal >= chapter.root.lastMainlinePly)
chapterRepo.removeConceal(chapter.id) >>-
sendTo(study, Socket.SetConceal(position, none))
else
chapterRepo.setConceal(chapter.id, newConceal) >>-
sendTo(study, Socket.SetConceal(position, newConceal.some))
}
}
} >>- sendTo(study, Socket.SetPath(position, uid))
studyRepo.setPosition(study.id, position) >>
updateConceal(study, chapter, position) >>-
sendTo(study, Socket.SetPath(position, uid))
case _ => funit
}
}
@ -98,12 +89,25 @@ final class StudyApi(
case None => fufail(s"Invalid addNode $studyId $position $node") >>- reloadUid(study, uid)
case Some(newChapter) =>
chapterRepo.update(newChapter) >>
studyRepo.setPosition(study.id, position + node) >>-
studyRepo.setPosition(study.id, position + node) >>
updateConceal(study, newChapter, position + node) >>-
sendTo(study, Socket.AddNode(position, node, uid))
}
}
}
private def updateConceal(study: Study, chapter: Chapter, position: Position.Ref) =
chapter.conceal ?? { conceal =>
chapter.root.lastMainlinePlyOf(position.path).some.filter(_ > conceal) ?? { newConceal =>
if (newConceal >= chapter.root.lastMainlinePly)
chapterRepo.removeConceal(chapter.id) >>-
sendTo(study, Socket.SetConceal(position, none))
else
chapterRepo.setConceal(chapter.id, newConceal) >>-
sendTo(study, Socket.SetConceal(position, newConceal.some))
}
}
def deleteNodeAt(userId: User.ID, studyId: Study.ID, position: Position.Ref, uid: Uid) = sequenceStudyWithChapter(studyId) {
case Study.WithChapter(study, chapter) => Contribute(userId, study) {
chapter.updateRoot { root =>