scratch/sqlite ac882d2: Unhex package/keys in the files backend and flip defaults

[Lars Ingebrigtsen]

branch: scratch/sqlite
commit ac882d2ffa93943c129f84faaaa35348215fae49
Author: Lars Ingebrigtsen <larsi@gnus.org>
Commit: Lars Ingebrigtsen <larsi@gnus.org>

    Unhex package/keys in the files backend and flip defaults
---
 lisp/emacs-lisp/multisession.el            | 8 +++++---
 test/lisp/emacs-lisp/multisession-tests.el | 4 ++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/lisp/emacs-lisp/multisession.el b/lisp/emacs-lisp/multisession.el
index 05e047f..e0fd6c1 100644
--- a/lisp/emacs-lisp/multisession.el
+++ b/lisp/emacs-lisp/multisession.el
@@ -26,8 +26,9 @@
 (require 'cl-lib)
 (require 'eieio)
 (require 'sqlite)
+(require 'url)
 
-(defcustom multisession-storage 'sqlite
+(defcustom multisession-storage 'files
   "Storage method for multisession variables.
 Valid methods are `sqlite' and `files'."
   :type '(choice (const :tag "SQLite" sqlite)
@@ -288,8 +289,9 @@ DOC should be a doc string, and ARGS are keywords as 
applicable to
 (cl-defmethod multisession--backend-values ((_type (eql files)))
   (mapcar (lambda (file)
             (let ((bits (file-name-split file)))
-              (list (car (last bits 1))
-                    (file-name-sans-extension (car (last bits)))
+              (list (url-unhex-string (car (last bits 1)))
+                    (url-unhex-string
+                     (file-name-sans-extension (car (last bits))))
                     (with-temp-buffer
                       (let ((coding-system-for-read 'utf-8))
                         (insert-file-contents file)
diff --git a/test/lisp/emacs-lisp/multisession-tests.el 
b/test/lisp/emacs-lisp/multisession-tests.el
index 7d636a2..20cfff2 100644
--- a/test/lisp/emacs-lisp/multisession-tests.el
+++ b/test/lisp/emacs-lisp/multisession-tests.el
@@ -31,6 +31,7 @@
   (ert-with-temp-file dir
     :directory t
     (let ((user-init-file "/tmp/foo.el")
+          (multisession-storage 'sqlite)
           (multisession-directory dir))
       (unwind-protect
           (progn
@@ -48,6 +49,7 @@
                        `(progn
                           (require 'multisession)
                           (let ((multisession-directory ,dir)
+                                (multisession-storage 'sqlite)
                                 (user-init-file "/tmp/foo.el"))
                             (define-multisession-variable foo 0
                               ""
@@ -63,6 +65,7 @@
     :directory t
     (let ((user-init-file "/tmp/foo.el")
           (multisession-directory dir)
+          (multisession-storage 'sqlite)
           proc)
       (unwind-protect
           (progn
@@ -82,6 +85,7 @@
                              `(progn
                                 (require 'multisession)
                                 (let ((multisession-directory ,dir)
+                                      (multisession-storage 'sqlite)
                                       (user-init-file "/tmp/bar.el"))
                                   (define-multisession-variable bar 0
                                     "" :synchronized t)