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

Merge pull request #1983 from eikek/errors-on-file-save

Browse Source 
Improve error reporting when a file cannot be stored
This commit is contained in:
mergify[bot] 2023-03-04 21:19:40 +00:00 committed by GitHub
commit 1e3008c28b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
modules/backend/src/main/scala/docspell/backend/ops/OUpload.scala
View File

@ -107,6 +107,11 @@ object OUpload {
case object NoCollective extends UploadResult case object NoCollective extends UploadResult
def noCollective: UploadResult = NoCollective def noCollective: UploadResult = NoCollective
/** A file could not be stored due to error in the file backend. */
case class StoreFailure(cause: Throwable) extends UploadResult
def storeFailure(cause: Throwable): UploadResult = StoreFailure(cause)
} }
private def right[F[_]: Functor, A](a: F[A]): EitherT[F, UploadResult, A] = private def right[F[_]: Functor, A](a: F[A]): EitherT[F, UploadResult, A] =
@ -129,7 +134,7 @@ object OUpload {
_ <- checkExistingItem(itemId, collectiveId) _ <- checkExistingItem(itemId, collectiveId)
coll <- OptionT(store.transact(RCollective.findById(collectiveId))) coll <- OptionT(store.transact(RCollective.findById(collectiveId)))
.toRight(UploadResult.noCollective) .toRight(UploadResult.noCollective)
files <- right(data.files.traverse(saveFile(coll.id)).map(_.flatten)) files <- data.files.traverse(saveFile(coll.id))
_ <- checkFileList(files) _ <- checkFileList(files)
lang <- data.meta.language match { lang <- data.meta.language match {
case Some(lang) => right(lang.pure[F]) case Some(lang) => right(lang.pure[F])
@ -204,8 +209,10 @@ object OUpload {
/** Saves the file into the database. */ /** Saves the file into the database. */
private def saveFile( private def saveFile(
collectiveId: CollectiveId collectiveId: CollectiveId
)(file: File[F]): F[Option[ProcessItemArgs.File]] = )(file: File[F]): EitherT[F, UploadResult, ProcessItemArgs.File] =
logger.info(s"Receiving file $file") *> for {
_ <- right(logger.info(s"Receiving file $file"))
id <- EitherT(
file.data file.data
.through( .through(
store.fileRepo.save( store.fileRepo.save(
@ -217,15 +224,12 @@ object OUpload {
.compile .compile
.lastOrError .lastOrError
.attempt .attempt
.map( ).leftSemiflatTap(ex =>
_.fold( logger.warn(ex)(
ex => { s"Could not store file ${file.name}/${file.advertisedMime} for processing!"
logger.warn(ex)(s"Could not store file for processing!")
None
},
id => Some(ProcessItemArgs.File(file.name, id))
)
) )
).leftMap(UploadResult.storeFailure)
} yield ProcessItemArgs.File(file.name, id)
private def checkExistingItem( private def checkExistingItem(
itemId: Option[Ident], itemId: Option[Ident],

5
modules/restserver/src/main/scala/docspell/restserver/conv/Conversions.scala
View File

@ -689,6 +689,11 @@ trait Conversions {
case UploadResult.NoItem => BasicResult(false, "The item could not be found.") case UploadResult.NoItem => BasicResult(false, "The item could not be found.")
case UploadResult.NoCollective => case UploadResult.NoCollective =>
BasicResult(false, "The collective could not be found.") BasicResult(false, "The collective could not be found.")
case UploadResult.StoreFailure(_) =>
BasicResult(
false,
"There were errors storing a file! See the server logs for details."
)
} }
def basicResult(cr: PassChangeResult): BasicResult = def basicResult(cr: PassChangeResult): BasicResult =