Change showpdf to showpdfjs

README.md

@@ -41,8 +41,10 @@ By setting `$BASE_DIR` you can persist the database for later runs.
 
 ## TODO
 
-- CI
+- [x] CI
-- Docker container (in flake)
+- [x] Docker container (in flake)
-- try fourmolu
+- [x] try fourmolu
-- Test leap second handling in the `time` package
+- [x] Test leap second handling in the `time` package
-- use queue to sync logging of indexer and main thread
+- [ ] Fix container shutdown delay
+- [ ] Fix `responseFile` always returning 200
+- [ ] use queue to sync logging of indexer and main thread

flake.nix

@@ -64,19 +64,30 @@
             name = "git.pbrinkmeier.de/paul/yore";
             tag = yore.version;
             copyToRoot = [ pkgs.cacert ];
-            config.Cmd = [ "${entrypoint}/bin/run" ];
+            config = {
+              Cmd = [ "${entrypoint}/bin/run" ];
+              StopSignal = "SIGINT";
+            };
           };
 
         entrypoint = pkgs.writeShellApplication {
           name = "run";
           runtimeInputs = [ pkgs.coreutils pkgs.dbmate yore ];
           text = ''
-            mkdir -p /workspace/db
+            set -Eeuo pipefail
-            cp -r ${./db}/* /workspace/db
-            cd /workspace
-            dbmate up
 
-	    yore
+            mkdir -p "''${YORE_DBMATE_DIR}"
+            TMPDIR=$(mktemp -dp "''${YORE_DBMATE_DIR}")
+            mkdir -p "''${TMPDIR}/db"
+            cp -r ${./db}/* "''${TMPDIR}/db"
+            cd "''${TMPDIR}"
+            dbmate up
+            chmod +w -R "''${TMPDIR}"
+            rm -rf "''${TMPDIR}"
+
+            # Replace bash and inherit PID 1
+            cd /
+            exec yore
           '';
         };
       in {

src/Yore/Scrape.hs

@@ -112,7 +112,7 @@ showpdfRequest (y, m, d) =
     NoReqBody
     bsResponse
     ( formToQuery
-        [ ("cmd" :: Text, "showpdf")
+        [ ("cmd" :: Text, "showpdfjs")
         , ("year", y)
         , ("month", m)
         , ("day", d)

yore.cabal

@@ -1,7 +1,7 @@
 cabal-version: 3.4
 
 name:           yore
-version:        0.0.3
+version:        0.0.9
 author:         Paul Brinkmeier
 maintainer:     hallo@pbrinkmeier.de
 copyright:      2023 Paul Brinkmeier