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

Update scalafmt to 2.5.1 + scalafmtAll

Browse Source
This commit is contained in:
Eike Kettner
2020-05-04 23:52:53 +02:00
parent 169510aec1
commit c41cdeefec
65 changed files with 523 additions and 431 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
modules/backend/src/main/scala/docspell/backend/auth/Login.scala
View File

@ -71,8 +71,9 @@ object Login {
for {
data <- store.transact(QLogin.findUser(acc))
_ <- Sync[F].delay(logger.trace(s"Account lookup: $data"))
res <- if (data.exists(check(up.pass))) okResult
else Result.invalidAuth.pure[F]
res <-
if (data.exists(check(up.pass))) okResult
else Result.invalidAuth.pure[F]
} yield res
case Left(_) =>
Result.invalidAuth.pure[F]

9
modules/backend/src/main/scala/docspell/backend/ops/OCollective.scala
View File

@ -117,9 +117,12 @@ object OCollective {
val q = for {
optUser <- RUser.findByAccount(accountId)
check = optUser.map(_.password).map(p => PasswordCrypt.check(current, p))
n <- check
.filter(identity)
.traverse(_ => RUser.updatePassword(accountId, PasswordCrypt.crypt(newPass)))
n <-
check
.filter(identity)
.traverse(_ =>
RUser.updatePassword(accountId, PasswordCrypt.crypt(newPass))
)
res = check match {
case Some(true) =>
if (n.getOrElse(0) > 0) PassChangeResult.success

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

@ -199,11 +199,13 @@ object OItem {
def setTags(item: Ident, tagIds: List[Ident], collective: Ident): F[AddResult] = {
val db = for {
cid <- RItem.getCollective(item)
nd <- if (cid.contains(collective)) RTagItem.deleteItemTags(item)
else 0.pure[ConnectionIO]
ni <- if (tagIds.nonEmpty && cid.contains(collective))
RTagItem.insertItemTags(item, tagIds)
else 0.pure[ConnectionIO]
nd <-
if (cid.contains(collective)) RTagItem.deleteItemTags(item)
else 0.pure[ConnectionIO]
ni <-
if (tagIds.nonEmpty && cid.contains(collective))
RTagItem.insertItemTags(item, tagIds)
else 0.pure[ConnectionIO]
} yield nd + ni
store.transact(db).attempt.map(AddResult.fromUpdate)

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

@ -72,8 +72,9 @@ object OUpload {
data.meta.sourceAbbrev,
data.meta.validFileTypes
)
args = if (data.multiple) files.map(f => ProcessItemArgs(meta, List(f)))
else Vector(ProcessItemArgs(meta, files.toList))
args =
if (data.multiple) files.map(f => ProcessItemArgs(meta, List(f)))
else Vector(ProcessItemArgs(meta, files.toList))
job <- pred.traverse(_ => makeJobs(args, account, data.priority, data.tracker))
_ <- logger.fdebug(s"Storing jobs: $job")
res <- job.traverse(submitJobs)
@ -84,9 +85,10 @@ object OUpload {
def submit(data: OUpload.UploadData[F], sourceId: Ident): F[OUpload.UploadResult] =
for {
sOpt <- store
.transact(RSource.find(sourceId))
.map(_.toRight(UploadResult.NoSource))
sOpt <-
store
.transact(RSource.find(sourceId))
.map(_.toRight(UploadResult.NoSource))
abbrev = sOpt.map(_.abbrev).toOption.getOrElse(data.meta.sourceAbbrev)
updata = data.copy(meta = data.meta.copy(sourceAbbrev = abbrev))
accId = sOpt.map(source => AccountId(source.cid, source.sid))
@ -108,10 +110,15 @@ object OUpload {
.lastOrError
.map(fm => Ident.unsafe(fm.id))
.attempt
.map(_.fold(ex => {
logger.warn(ex)(s"Could not store file for processing!")
None
}, id => Some(ProcessItemArgs.File(file.name, id))))
.map(
_.fold(
ex => {
logger.warn(ex)(s"Could not store file for processing!")
None
},
id => Some(ProcessItemArgs.File(file.name, id))
)
)
private def checkFileList(
files: Seq[ProcessItemArgs.File]

8
modules/backend/src/main/scala/docspell/backend/ops/OUserTask.scala
View File

@ -27,8 +27,8 @@ trait OUserTask[F[_]] {
* executor's queue. It will not update the corresponding periodic
* task.
*/
def executeNow[A](account: AccountId, task: UserTask[A])(
implicit E: Encoder[A]
def executeNow[A](account: AccountId, task: UserTask[A])(implicit
E: Encoder[A]
): F[Unit]
}
@ -41,8 +41,8 @@ object OUserTask {
): Resource[F, OUserTask[F]] =
Resource.pure[F, OUserTask[F]](new OUserTask[F] {
def executeNow[A](account: AccountId, task: UserTask[A])(
implicit E: Encoder[A]
def executeNow[A](account: AccountId, task: UserTask[A])(implicit
E: Encoder[A]
): F[Unit] =
for {
ptask <- task.encode.toPeriodicTask(account)

27
modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
View File

@ -25,16 +25,15 @@ object OSignup {
Resource.pure[F, OSignup[F]](new OSignup[F] {
def newInvite(cfg: Config)(password: Password): F[NewInviteResult] =
if (cfg.mode == Config.Mode.Invite) {
if (cfg.mode == Config.Mode.Invite)
if (cfg.newInvitePassword.isEmpty || cfg.newInvitePassword != password)
NewInviteResult.passwordMismatch.pure[F]
else
store
.transact(RInvitation.insertNew)
.map(ri => NewInviteResult.success(ri.id))
} else {
else
Effect[F].pure(NewInviteResult.invitationClosed)
}
def register(cfg: Config)(data: RegisterData): F[SignupResult] =
cfg.mode match {
@ -51,15 +50,19 @@ object OSignup {
now <- Timestamp.current[F]
min = now.minus(cfg.inviteTime)
ok <- store.transact(RInvitation.useInvite(inv, min))
res <- if (ok) addUser(data).map(SignupResult.fromAddResult)
else SignupResult.invalidInvitationKey.pure[F]
_ <- if (retryInvite(res))
logger
.fdebug(s"Adding account failed ($res). Allow retry with invite.") *> store
.transact(
RInvitation.insert(RInvitation(inv, now))
)
else 0.pure[F]
res <-
if (ok) addUser(data).map(SignupResult.fromAddResult)
else SignupResult.invalidInvitationKey.pure[F]
_ <-
if (retryInvite(res))
logger
.fdebug(
s"Adding account failed ($res). Allow retry with invite."
) *> store
.transact(
RInvitation.insert(RInvitation(inv, now))
)
else 0.pure[F]
} yield res
case None =>
SignupResult.invalidInvitationKey.pure[F]

11
modules/backend/src/main/scala/docspell/backend/signup/SignupResult.scala
View File

@ -18,9 +18,10 @@ object SignupResult {
def failure(ex: Throwable): SignupResult = Failure(ex)
def success: SignupResult = Success
def fromAddResult(ar: AddResult): SignupResult = ar match {
case AddResult.Success => Success
case AddResult.Failure(ex) => Failure(ex)
case AddResult.EntityExists(_) => CollectiveExists
}
def fromAddResult(ar: AddResult): SignupResult =
ar match {
case AddResult.Success => Success
case AddResult.Failure(ex) => Failure(ex)
case AddResult.EntityExists(_) => CollectiveExists
}
}