TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-04-05 10:59:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #534 from eikek/duplicate-check

Browse Source 
Fixing find-by-checksum with exclusions
This commit is contained in:
mergify[bot] 2021-01-03 11:55:28 +00:00 committed by GitHub
commit 84d160aa38
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 28 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
modules/store/src/main/scala/docspell/store/queries/QItem.scala
View File

@ -481,31 +481,34 @@ object QItem {
collective: Ident, collective: Ident,
excludeFileMeta: Set[Ident] excludeFileMeta: Set[Ident]
): ConnectionIO[Vector[RItem]] = { ): ConnectionIO[Vector[RItem]] = {
val m1 = RFileMeta.as("m1") val m1 = RFileMeta.as("m1")
val m2 = RFileMeta.as("m2") val m2 = RFileMeta.as("m2")
val m3 = RFileMeta.as("m3") val m3 = RFileMeta.as("m3")
val i = RItem.as("i") val i = RItem.as("i")
val a = RAttachment.as("a") val a = RAttachment.as("a")
val s = RAttachmentSource.as("s") val s = RAttachmentSource.as("s")
val r = RAttachmentArchive.as("r") val r = RAttachmentArchive.as("r")
val fms = Nel.of(m1, m2, m3)
Select( val qq =
select(i.all), Select(
from(i) select(i.all),
.innerJoin(a, a.itemId === i.id) from(i)
.innerJoin(s, s.id === a.id) .innerJoin(a, a.itemId === i.id)
.innerJoin(m1, m1.id === a.fileId) .innerJoin(s, s.id === a.id)
.innerJoin(m2, m2.id === s.fileId) .innerJoin(m1, m1.id === a.fileId)
.leftJoin(r, r.id === a.id) .innerJoin(m2, m2.id === s.fileId)
.leftJoin(m3, m3.id === r.fileId), .leftJoin(r, r.id === a.id)
where( .leftJoin(m3, m3.id === r.fileId),
i.cid === collective && where(
(m1.checksum === checksum || m2.checksum === checksum || m3.checksum === checksum) &&? i.cid === collective &&
Nel Condition.Or(fms.map(m => m.checksum === checksum)) &&?
.fromList(excludeFileMeta.toList) Nel
.map(excl => m1.id.notIn(excl) && m2.id.notIn(excl) && m3.id.notIn(excl)) .fromList(excludeFileMeta.toList)
) .map(excl => Condition.And(fms.map(m => m.id.isNull || m.id.notIn(excl))))
).distinct.build.query[RItem].to[Vector] )
).distinct.build
logger.debug(s"FindByChecksum: $qq")
qq.query[RItem].to[Vector]
} }
final case class NameAndNotes( final case class NameAndNotes(