1 files changed, 17 insertions, 2 deletions
diff --git a/lib/PublicInbox/IMAPTracker.pm b/lib/PublicInbox/IMAPTracker.pm
index c7da422b..bb4a39cc 100644
--- a/lib/PublicInbox/IMAPTracker.pm
+++ b/lib/PublicInbox/IMAPTracker.pm
@@ -52,8 +52,23 @@ VALUES (?, ?, ?)
  }
  
  sub new {
-        my ($class) = @_;
-        my $dbname = PublicInbox::Config->config_dir() . "/imap.sqlite3";
+        my ($class, $dbname) = @_;
+
+        # original name for compatibility with old setups:
+        $dbname //= PublicInbox::Config->config_dir() . "/imap.sqlite3";
+
+        # use the new XDG-compliant name for new setups:
+        if (!-f $dbname) {
+                $dbname = ($ENV{XDG_DATA_HOME} //
+                        (($ENV{HOME} // '/nonexistent').'/.local/share')) .
+                        '/public-inbox/imap.sqlite3';
+        }
+        if (!-f $dbname) {
+                require File::Path;
+                require File::Basename;;
+                File::Path::mkpath(File::Basename::dirname($dbname));
+        }
+
          my $dbh = dbh_new($dbname);
          bless { dbname => $dbname, dbh => $dbh }, $class;
  }