From b6f82589757137f16ac9177676968cdde2b06400 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Sat, 27 Jun 2020 10:03:30 +0000 Subject: imaptracker: use ~/.local/share/public-inbox/imap.sqlite3 Respect XDG_DATA_HOME to avoid cluttering ~/.public-inbox/. Existing users of ~/.public-inbox/imap.sqlite3 will remain supported, but the preference for new data is to use ~/.local/share and other paths standardized by XDG. Cc: "Eric W. Biederman" --- lib/PublicInbox/IMAPTracker.pm | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) (limited to 'lib/PublicInbox/IMAPTracker.pm') 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; } -- cgit v1.2.3-24-ge0c7