Merge branch 'master' of https://github.com/tiborrr/docspell

.github/workflows/auto-approve.yml

@@ -5,7 +5,7 @@ on:
 
 jobs:
   auto-approve:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     steps:
       - uses: hmarr/[email protected]
         if: github.actor == 'eikek-scala-steward'

.github/workflows/ci-docs.yml

@@ -8,10 +8,10 @@ jobs:
   check-website:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - name: Set current version
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: Build website (${{ env.DOCSPELL_VERSION }})

.github/workflows/ci.yml

@@ -9,16 +9,16 @@ jobs:
     strategy:
       fail-fast: false
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 100
       - name: Fetch tags
         run: git fetch --depth=100 origin +refs/tags/*:refs/tags/*
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - name: sbt ci ${{ github.ref }}
         run: nix develop .#ci --command sbt ci
   ci:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-24.04
     needs: [ci-matrix]
     steps:
       - name: Aggregate of lint, and all tests

.github/workflows/docker-image.yml

@@ -7,7 +7,7 @@ jobs:
   docker-images:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
       - name: Set current version

.github/workflows/release-nightly.yml

@@ -9,10 +9,10 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - name: Set current version
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: sbt ci ${{ github.ref }}

.github/workflows/release.yml

@@ -9,10 +9,10 @@ jobs:
     strategy:
       fail-fast: true
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - name: Set current version
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: sbt make-pkg (${{ env.DOCSPELL_VERSION }})

.github/workflows/website.yml

@@ -7,10 +7,10 @@ jobs:
   publish-website:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.2
         with:
           fetch-depth: 0
-      - uses: cachix/install-nix-action@v27
+      - uses: cachix/install-nix-action@v30
       - name: Set current version
         run:  echo "DOCSPELL_VERSION=$(cat version.sbt | grep version | cut -d= -f2 | xargs)" >> $GITHUB_ENV
       - name: Build website (${{ env.DOCSPELL_VERSION }})

.gitignore

@@ -32,3 +32,5 @@ _site/
 .idea/*
 sbt.json
 /yarn.lock
+.metals
+.vscode

docker/docker-compose/docker-compose.yml

@@ -109,7 +109,7 @@ services:
       - restserver
 
   db:
-    image: postgres:16.4
+    image: postgres:17.2
     container_name: postgres_db
     restart: unless-stopped
     volumes:

docker/dockerfiles/joex.dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.20.3
+FROM alpine:3.21.0
 
 ARG version=
 ARG joex_url=

docker/dockerfiles/restserver.dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.20.3
+FROM alpine:3.21.0
 
 ARG version=
 ARG restserver_url=

modules/joex/src/main/resources/reference.conf

@@ -580,7 +580,6 @@ Docpell Update Check
       command = {
         program = "weasyprint"
         args = [
-          "--optimize-size", "all",
           "--encoding", "{{encoding}}",
           "-",
           "{{outfile}}"

modules/restserver/src/main/scala/docspell/restserver/http4s/ContentDisposition.scala

@@ -16,7 +16,6 @@ import org.http4s.internal.CharPredicate
 import org.http4s.multipart.Part
 import org.http4s.{Header, ParseFailure, ParseResult}
 import org.typelevel.ci.CIString
-import org.typelevel.ci._
 
 /** A replacement for `Content-Disposition` class with a slightly modified parser to allow
   * utf8 filenames.
@@ -32,8 +31,7 @@ case class ContentDisposition(dispositionType: String, parameters: Map[CIString,
 
 object ContentDisposition {
 
-  def getFileName[F[_]](part: Part[F]): Option[String] =
-    part.headers.get[ContentDisposition].flatMap(_.parameters.get(ci"filename"))
+  def getFileName[F[_]](part: Part[F]): Option[String] = part.filename
 
   private[http4s] val mimeValue: Parser[String] = {
     val value = Parser.anyChar.repUntilAs[String](Parser.char(';').orElse(Parser.end))