Place the database in XDG_DATA_HOME if possible

This commit is contained in:
Tom Willemsen 2013-03-23 13:24:43 +01:00
parent 9e747fde54
commit dd47751a43

View file

@ -55,7 +55,7 @@
(sqlite-error () (get-tag-id tag))))) (sqlite-error () (get-tag-id tag)))))
(insert-bookmark-tag bookmark-id tag-id))) tags))) (insert-bookmark-tag bookmark-id tag-id))) tags)))
(defun check-db (name) (defun ensure-db-exists (name)
"Connect to the database, possibly creating it." "Connect to the database, possibly creating it."
(let ((db-exists (probe-file name))) (let ((db-exists (probe-file name)))
(setf *db* (connect name)) (setf *db* (connect name))
@ -76,6 +76,14 @@ The result contains the url and the name of the bookmark."
(statement-column-value statement 1)) (statement-column-value statement 1))
finally (finalize-statement statement)))) finally (finalize-statement statement))))
(defun get-db-location ()
"Get the location of the database."
(pathname
(apply 'concatenate 'string
(or (sb-ext:posix-getenv "XDG_DATA_HOME")
(list (sb-ext:posix-getenv "HOME") "/.local/share"))
'("/clark/bookmarks.db"))))
(defun get-tag-id (name) (defun get-tag-id (name)
"Get the rowid of tag NAME." "Get the rowid of tag NAME."
(execute-single *db* "SELECT rowid FROM tag WHERE name = ?" name)) (execute-single *db* "SELECT rowid FROM tag WHERE name = ?" name))
@ -95,6 +103,12 @@ The result contains the url and the name of the bookmark."
(execute-non-query *db* "INSERT INTO tag VALUES (?)" name) (execute-non-query *db* "INSERT INTO tag VALUES (?)" name)
(last-insert-rowid *db*)) (last-insert-rowid *db*))
(defun load-db ()
"Load the database."
(let ((db-location (get-db-location)))
(ensure-directories-exist db-location)
(ensure-db-exists db-location)))
(eval-when (:compile-toplevel :load-toplevel) (eval-when (:compile-toplevel :load-toplevel)
(defun make-command-name (base) (defun make-command-name (base)
"Turn BASE into the name of a possible command." "Turn BASE into the name of a possible command."
@ -169,7 +183,7 @@ BM should be a list containing the url and name of the bookmark."
Connect to the database, parse command-line arguments, execute and Connect to the database, parse command-line arguments, execute and
then disconnect." then disconnect."
(check-db "test2.db") (load-db)
(if (> (length args) 1) (if (> (length args) 1)
(parse-args (cdr args)) (parse-args (cdr args))
(map nil #'print-bookmark (get-bookmarks))) (map nil #'print-bookmark (get-bookmarks)))