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

Implement downloading original file

Browse Source
This commit is contained in:
Eike Kettner 2020-02-20 22:30:59 +01:00
parent 39809f9d05
commit 72fd3b1a25
2 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
modules/backend/src/main/scala/docspell/backend/ops/OItem.scala
View File

@ -72,15 +72,18 @@ object OItem {
def data: Stream[F, Byte] def data: Stream[F, Byte]
def name: Option[String] def name: Option[String]
def meta: FileMeta def meta: FileMeta
def fileId: Ident
} }
case class AttachmentData[F[_]](ra: RAttachment, meta: FileMeta, data: Stream[F, Byte]) case class AttachmentData[F[_]](ra: RAttachment, meta: FileMeta, data: Stream[F, Byte])
extends BinaryData[F] { extends BinaryData[F] {
val name = ra.name val name = ra.name
val fileId = ra.fileId
} }
case class AttachmentSourceData[F[_]](rs: RAttachmentSource, meta: FileMeta, data: Stream[F, Byte]) case class AttachmentSourceData[F[_]](rs: RAttachmentSource, meta: FileMeta, data: Stream[F, Byte])
extends BinaryData[F] { extends BinaryData[F] {
val name = rs.name val name = rs.name
val fileId = rs.fileId
} }
def apply[F[_]: Effect](store: Store[F]): Resource[F, OItem[F]] = def apply[F[_]: Effect](store: Store[F]): Resource[F, OItem[F]] =
@ -97,26 +100,40 @@ object OItem {
.transact(RAttachment.findByIdAndCollective(id, collective)) .transact(RAttachment.findByIdAndCollective(id, collective))
.flatMap({ .flatMap({
case Some(ra) => case Some(ra) =>
store.bitpeace makeBinaryData(ra.fileId) { m =>
.get(ra.fileId.id) AttachmentData[F](
.unNoneTerminate ra,
.compile m,
.last store.bitpeace.fetchData2(RangeDef.all)(Stream.emit(m))
.map(
_.map(m =>
AttachmentData[F](
ra,
m,
store.bitpeace.fetchData2(RangeDef.all)(Stream.emit(m))
)
)
) )
}
case None => case None =>
(None: Option[AttachmentData[F]]).pure[F] (None: Option[AttachmentData[F]]).pure[F]
}) })
def findAttachmentSource(id: Ident, collective: Ident): F[Option[AttachmentSourceData[F]]] = def findAttachmentSource(id: Ident, collective: Ident): F[Option[AttachmentSourceData[F]]] =
??? store
.transact(RAttachmentSource.findByIdAndCollective(id, collective))
.flatMap({
case Some(ra) =>
makeBinaryData(ra.fileId) { m =>
AttachmentSourceData[F](
ra,
m,
store.bitpeace.fetchData2(RangeDef.all)(Stream.emit(m))
)
}
case None =>
(None: Option[AttachmentSourceData[F]]).pure[F]
})
private def makeBinaryData[A](fileId: Ident)(f: FileMeta => A): F[Option[A]] =
store.bitpeace
.get(fileId.id).unNoneTerminate.compile.last.map(
_.map(m => f(m))
)
def setTags(item: Ident, tagIds: List[Ident], collective: Ident): F[AddResult] = { def setTags(item: Ident, tagIds: List[Ident], collective: Ident): F[AddResult] = {
val db = for { val db = for {

16
modules/store/src/main/scala/docspell/store/records/RAttachmentSource.scala
View File

@ -43,4 +43,20 @@ object RAttachmentSource {
def delete(attachId: Ident): ConnectionIO[Int] = def delete(attachId: Ident): ConnectionIO[Int] =
deleteFrom(table, id.is(attachId)).update.run deleteFrom(table, id.is(attachId)).update.run
def findByIdAndCollective(attachId: Ident, collective: Ident): ConnectionIO[Option[RAttachmentSource]] = {
val bId = RAttachment.Columns.id.prefix("b")
val aId = Columns.id.prefix("a")
val bItem = RAttachment.Columns.itemId.prefix("b")
val iId = RItem.Columns.id.prefix("i")
val iColl = RItem.Columns.cid.prefix("i")
val from = table ++ fr"a INNER JOIN" ++
RAttachment.table ++ fr"b ON" ++ aId.is(bId) ++
fr"INNER JOIN" ++ RItem.table ++ fr"i ON" ++ bItem.is(iId)
val where = and(aId.is(attachId), bId.is(attachId), iColl.is(collective))
selectSimple(all.map(_.prefix("a")), from, where).query[RAttachmentSource].option
}
} }