bitmessage/Jabit
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Different improvements

Browse Source 
- catch all kinds of errors when selector binding fails
- pimped DefaultLabeler to support listeners
- added pagination capabilities to AbstractMessageRepository
This commit is contained in:
Christian Basler
2017-09-13 08:06:06 +02:00
parent 273d229709
commit bf0c946c52
5 changed files with 91 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

57
core/src/main/kotlin/ch/dissem/bitmessage/ports/AbstractMessageRepository.kt
View File

@ -60,52 +60,58 @@ abstract class AbstractMessageRepository : MessageRepository, InternalContext.Co
}
override fun getMessage(iv: InventoryVector): Plaintext? {
return single(find("iv=X'" + Strings.hex(iv.hash) + "'"))
return single(find("iv=X'${Strings.hex(iv.hash)}'"))
}
override fun getMessage(initialHash: ByteArray): Plaintext? {
return single(find("initial_hash=X'" + Strings.hex(initialHash) + "'"))
return single(find("initial_hash=X'${Strings.hex(initialHash)}'"))
}
override fun getMessageForAck(ackData: ByteArray): Plaintext? {
return single(find("ack_data=X'" + Strings.hex(ackData) + "' AND status='" + Plaintext.Status.SENT + "'"))
return single(find("ack_data=X'${Strings.hex(ackData)}' AND status='${Plaintext.Status.SENT}'"))
}
override fun findMessages(label: Label?): List<Plaintext> {
if (label == null) {
return find("id NOT IN (SELECT message_id FROM Message_Label)")
} else {
return find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.id + ")")
}
/**
* Finds messages that have a specific label, with optional offset and limit. If the limit is set to 0,
* offset and limit are ignored.
*/
open fun findMessages(label: Label?, offset: Int = 0, limit: Int = 0) = if (label == null) {
find("id NOT IN (SELECT message_id FROM Message_Label)", offset, limit)
} else {
find("id IN (SELECT message_id FROM Message_Label WHERE label_id=" + label.id + ")", offset, limit)
}
override fun findMessages(label: Label?) = if (label == null) {
find("id NOT IN (SELECT message_id FROM Message_Label)")
} else {
find("id IN (SELECT message_id FROM Message_Label WHERE label_id=${label.id})")
}
override fun findMessages(status: Plaintext.Status, recipient: BitmessageAddress): List<Plaintext> {
return find("status='" + status.name + "' AND recipient='" + recipient.address + "'")
return find("status='${status.name}' AND recipient='${recipient.address}'")
}
override fun findMessages(status: Plaintext.Status): List<Plaintext> {
return find("status='" + status.name + "'")
return find("status='${status.name}'")
}
override fun findMessages(sender: BitmessageAddress): List<Plaintext> {
return find("sender='" + sender.address + "'")
return find("sender='${sender.address}'")
}
override fun findMessagesToResend(): List<Plaintext> {
return find("status='" + Plaintext.Status.SENT.name + "'" +
" AND next_try < " + UnixTime.now)
return find("status='${Plaintext.Status.SENT.name}' AND next_try < ${UnixTime.now}")
}
override fun findResponses(parent: Plaintext): List<Plaintext> {
if (parent.inventoryVector == null) {
return emptyList()
}
return find("iv IN (SELECT child FROM Message_Parent"
+ " WHERE parent=X'" + Strings.hex(parent.inventoryVector!!.hash) + "')")
return find("iv IN (SELECT child FROM Message_Parent WHERE parent=X'${Strings.hex(parent.inventoryVector!!.hash)}')")
}
override fun getConversation(conversationId: UUID): List<Plaintext> {
return find("conversation=X'" + conversationId.toString().replace("-", "") + "'")
return find("conversation=X'${conversationId.toString().replace("-", "")}'")
}
override fun getLabels(): List<Label> {
@ -113,20 +119,23 @@ abstract class AbstractMessageRepository : MessageRepository, InternalContext.Co
}
override fun getLabels(vararg types: Label.Type): List<Label> {
return findLabels("type IN (" + join(*types) + ")")
return findLabels("type IN (${join(*types)})")
}
protected abstract fun findLabels(where: String): List<Label>
protected fun <T> single(collection: Collection<T>): T? {
when (collection.size) {
0 -> return null
1 -> return collection.iterator().next()
else -> throw ApplicationException("This shouldn't happen, found " + collection.size +
" items, one or none was expected")
return when (collection.size) {
0 -> null
1 -> collection.iterator().next()
else -> throw ApplicationException("This shouldn't happen, found ${collection.size} items, one or none was expected")
}
}
protected abstract fun find(where: String): List<Plaintext>
/**
* Finds messages that mach the given where statement, with optional offset and limit. If the limit is set to 0,
* offset and limit are ignored.
*/
protected abstract fun find(where: String, offset: Int = 0, limit: Int = 0): List<Plaintext>
}

42
core/src/main/kotlin/ch/dissem/bitmessage/ports/DefaultLabeler.kt
View File

@ -25,22 +25,29 @@ import ch.dissem.bitmessage.entity.valueobject.Label
open class DefaultLabeler : Labeler, InternalContext.ContextHolder {
private lateinit var ctx: InternalContext
var listener: ((message: Plaintext, added: Collection<Label>, removed: Collection<Label>) -> Unit)? = null
override fun setContext(context: InternalContext) {
ctx = context
}
override fun setLabels(msg: Plaintext) {
msg.status = RECEIVED
if (msg.type == BROADCAST) {
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD))
} else {
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.UNREAD))
}
val labelsToAdd =
if (msg.type == BROADCAST) {
ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.BROADCAST, Label.Type.UNREAD)
} else {
ctx.messageRepository.getLabels(Label.Type.INBOX, Label.Type.UNREAD)
}
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, emptyList())
}
override fun markAsDraft(msg: Plaintext) {
msg.status = DRAFT
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.DRAFT))
val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.DRAFT)
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, emptyList())
}
override fun markAsSending(msg: Plaintext) {
@ -49,14 +56,20 @@ open class DefaultLabeler : Labeler, InternalContext.ContextHolder {
} else {
msg.status = DOING_PROOF_OF_WORK
}
val labelsToRemove = msg.labels.filter { it.type == Label.Type.DRAFT }
msg.removeLabel(Label.Type.DRAFT)
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.OUTBOX))
val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.OUTBOX)
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, labelsToRemove)
}
override fun markAsSent(msg: Plaintext) {
msg.status = SENT
val labelsToRemove = msg.labels.filter { it.type == Label.Type.OUTBOX }
msg.removeLabel(Label.Type.OUTBOX)
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.SENT))
val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.SENT)
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, labelsToRemove)
}
override fun markAsAcknowledged(msg: Plaintext) {
@ -64,19 +77,28 @@ open class DefaultLabeler : Labeler, InternalContext.ContextHolder {
}
override fun markAsRead(msg: Plaintext) {
val labelsToRemove = msg.labels.filter { it.type == Label.Type.UNREAD }
msg.removeLabel(Label.Type.UNREAD)
listener?.invoke(msg, emptyList(), labelsToRemove)
}
override fun markAsUnread(msg: Plaintext) {
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.UNREAD))
val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.UNREAD)
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, emptyList())
}
override fun delete(msg: Plaintext) {
val labelsToRemove = msg.labels.filterNot { it.type == Label.Type.TRASH }
msg.labels.clear()
msg.addLabels(ctx.messageRepository.getLabels(Label.Type.TRASH))
val labelsToAdd = ctx.messageRepository.getLabels(Label.Type.TRASH)
msg.addLabels(labelsToAdd)
listener?.invoke(msg, labelsToAdd, labelsToRemove)
}
override fun archive(msg: Plaintext) {
val labelsToRemove = msg.labels.toSet()
msg.labels.clear()
listener?.invoke(msg, emptyList(), labelsToRemove)
}
}