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 deleting preview files

Browse Source
This commit is contained in:
Eike Kettner
2020-11-08 21:27:55 +01:00
parent 2c96590aad
commit eede194352
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/store/src/main/scala/docspell/store/queries/QAttachment.scala
View File

@ -27,18 +27,19 @@ object QAttachment {
val loadFiles = for { val loadFiles = for {
ra <- RAttachment.findByIdAndCollective(attachId, coll).map(_.map(_.fileId)) ra <- RAttachment.findByIdAndCollective(attachId, coll).map(_.map(_.fileId))
rs <- RAttachmentSource.findByIdAndCollective(attachId, coll).map(_.map(_.fileId)) rs <- RAttachmentSource.findByIdAndCollective(attachId, coll).map(_.map(_.fileId))
rp <- RAttachmentPreview.findByIdAndCollective(attachId, coll).map(_.map(_.fileId))
ne <- RAttachmentArchive.countEntries(attachId) ne <- RAttachmentArchive.countEntries(attachId)
} yield (ra, rs, ne) } yield (ra.toSeq ++ rs.toSeq ++ rp.toSeq, ne)
for { for {
files <- store.transact(loadFiles) files <- store.transact(loadFiles)
k <- k <-
if (files._3 == 1) deleteArchive(store)(attachId) if (files._2 == 1) deleteArchive(store)(attachId)
else store.transact(RAttachmentArchive.delete(attachId)) else store.transact(RAttachmentArchive.delete(attachId))
n <- store.transact(RAttachment.delete(attachId)) n <- store.transact(RAttachment.delete(attachId))
f <- f <-
Stream Stream
.emits(files._1.toSeq ++ files._2.toSeq) .emits(files._1)
.map(_.id) .map(_.id)
.flatMap(store.bitpeace.delete) .flatMap(store.bitpeace.delete)
.map(flag => if (flag) 1 else 0) .map(flag => if (flag) 1 else 0)
@ -55,13 +56,14 @@ object QAttachment {
for { for {
_ <- logger.fdebug[F](s"Deleting attachment: ${ra.id.id}") _ <- logger.fdebug[F](s"Deleting attachment: ${ra.id.id}")
s <- store.transact(RAttachmentSource.findById(ra.id)) s <- store.transact(RAttachmentSource.findById(ra.id))
p <- store.transact(RAttachmentPreview.findById(ra.id))
n <- store.transact(RAttachment.delete(ra.id)) n <- store.transact(RAttachment.delete(ra.id))
_ <- logger.fdebug[F]( _ <- logger.fdebug[F](
s"Deleted $n meta records (source, meta, archive). Deleting binaries now." s"Deleted $n meta records (source, meta, preview, archive). Deleting binaries now."
) )
f <- f <-
Stream Stream
.emits(ra.fileId.id +: (s.map(_.fileId.id).toSeq)) .emits(ra.fileId.id +: (s.map(_.fileId.id).toSeq ++ p.map(_.fileId.id).toSeq))
.flatMap(store.bitpeace.delete) .flatMap(store.bitpeace.delete)
.map(flag => if (flag) 1 else 0) .map(flag => if (flag) 1 else 0)
.compile .compile