Use with-thunk in all my with- macrosHEADmain

1 files changed, 14 insertions, 5 deletions

diff --git a/src/db.lisp b/src/db.lisp
index ea18d16..db8f7c1 100644
--- a/src/db.lisp
+++ b/src/db.lisp
@@ -3,8 +3,8 @@
 (defpackage :ukkoclot/src/db
   (:use :c2cl :sqlite)
   (:import-from :log)
-  (:import-from :serapeum :-> :defunion)
-  (:export :inline-bot-type :blacklisted :whitelisted :get-inline-bot-type :set-inline-bot-type :with-db))
+  (:import-from :serapeum :-> :defunion :with-thunk)
+  (:export :inline-bot-type :blacklisted :whitelisted :get-inline-bot-type :set-inline-bot-type :call-with-db :with-db))
 (in-package :ukkoclot/src/db)
 
 (defconstant +target-version+ 1
@@ -13,10 +13,19 @@
 (deftype db ()
   'sqlite-handle)
 
+(-> call-with-db (pathname (function (db) t)) t)
+(defun call-with-db (path fn)
+  "Similar to `with-db', but instead of binding the database in a macro body,
+calls the function `fn' with it as an argument."
+  (let ((db (connect path)))
+    (unwind-protect (progn (upgrade db)
+                           (funcall fn db))
+      (disconnect db))))
+
 (defmacro with-db ((name path) &body body)
-  `(let ((,name (connect ,path)))
-     (unwind-protect (progn (upgrade ,name) ,@body)
-       (disconnect ,name))))
+  "Open database specified by `path' and bind it to `name' for the duration of the `body'."
+  (with-thunk (body name)
+    `(call-with-db ,path ,body)))
 
 (defunion inline-bot-type
   blacklisted