TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-22 02:18:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix duplicate check on restarts

Browse Source 
Issue: #530
This commit is contained in:
Eike Kettner
2021-01-02 21:08:16 +01:00
parent 2d9ea864e5
commit 97dfcece97
3 changed files with 17 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -454,7 +454,7 @@ object QItem {
(a.fileId.in(fileMetaIds) ||
s.fileId.in(fileMetaIds) ||
r.fileId.in(fileMetaIds)) &&? states.map(nel => i.state.in(nel))
)
).distinct
}
def findOneByFileIds(fileMetaIds: Seq[Ident]): ConnectionIO[Option[RItem]] =
@ -476,7 +476,11 @@ object QItem {
Vector.empty[RItem].pure[ConnectionIO]
}
def findByChecksum(checksum: String, collective: Ident): ConnectionIO[Vector[RItem]] = {
def findByChecksum(
checksum: String,
collective: Ident,
excludeFileMeta: Set[Ident]
): ConnectionIO[Vector[RItem]] = {
val m1 = RFileMeta.as("m1")
val m2 = RFileMeta.as("m2")
val m3 = RFileMeta.as("m3")
@ -496,9 +500,12 @@ object QItem {
.leftJoin(m3, m3.id === r.fileId),
where(
i.cid === collective &&
(m1.checksum === checksum || m2.checksum === checksum || m3.checksum === checksum)
(m1.checksum === checksum || m2.checksum === checksum || m3.checksum === checksum) &&?
Nel
.fromList(excludeFileMeta.toList)
.map(excl => m1.id.notIn(excl) && m2.id.notIn(excl) && m3.id.notIn(excl))
)
).build.query[RItem].to[Vector]
).distinct.build.query[RItem].to[Vector]
}
final case class NameAndNotes(