emacs
/
mu
mirror of https://github.com/djcb/mu.git
1
0
Fork 0
Code Issues Releases Wiki Activity

mu-scanner: ignore .nnmaildir directories 

They contain gnus internal data.
This commit is contained in:
Dirk-Jan C. Binnema 2023-01-18 23:05:46 +02:00
parent c23dad7058
commit 3dd7cf80d3
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
lib/index/mu-scanner.cc
View File

@ -1,5 +1,5 @@
/* /*
** Copyright (C) 2020-2021 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl> ** Copyright (C) 2020-2023 Dirk-Jan C. Binnema <djcb@djcbsoftware.nl>
** **
** This program is free software; you can redistribute it and/or modify it ** This program is free software; you can redistribute it and/or modify it
** under the terms of the GNU General Public License as published by the ** under the terms of the GNU General Public License as published by the
@ -61,24 +61,44 @@ struct Scanner::Private {
}; };
static bool static bool
is_special_dir(const char* d_name) is_dotdir(const char *d_name)
{ {
return d_name[0] == '\0' || (d_name[1] == '\0' && d_name[0] == '.') || /* dotdir? */
(d_name[2] == '\0' && d_name[0] == '.' && d_name[1] == '.'); if (d_name[0] == '\0' || (d_name[1] == '\0' && d_name[0] == '.') ||
(d_name[2] == '\0' && d_name[0] == '.' && d_name[1] == '.'))
return true;
/* gnus? */
if (d_name[0] == '.' && g_strcmp0(d_name + 1, "nnmaildir") == 0)
return true;
return false;
}
static bool
is_ignoredir(const char *d_name)
{
/* gnus? */
if (d_name[0] == '.' && g_strcmp0(d_name + 1, "nnmaildir") == 0)
return true;
return false;
} }
bool bool
Scanner::Private::process_dentry(const std::string& path, struct dirent* dentry, Scanner::Private::process_dentry(const std::string& path, struct dirent *dentry,
bool is_maildir) bool is_maildir)
{ {
const auto d_name{dentry->d_name}; const auto d_name{dentry->d_name};
if (is_special_dir(d_name) || std::strcmp(d_name, "tmp") == 0) if (is_dotdir(d_name) || std::strcmp(d_name, "tmp") == 0)
return true; // ignore. return true; // ignore.
if (is_ignoredir(d_name)) {
g_debug("skip %s/%s (ignore-dir)", path.c_str(), d_name);
return true; // ignore
}
const auto fullpath{path + "/" + d_name}; const auto fullpath{path + "/" + d_name};
struct stat statbuf { struct stat statbuf {};
};
if (::stat(fullpath.c_str(), &statbuf) != 0) { if (::stat(fullpath.c_str(), &statbuf) != 0) {
g_warning("failed to stat %s: %s", fullpath.c_str(), g_strerror(errno)); g_warning("failed to stat %s: %s", fullpath.c_str(), g_strerror(errno));
return false; return false;
@ -180,7 +200,7 @@ Scanner::Private::start()
process_dir(root_dir_, is_maildir); process_dir(root_dir_, is_maildir);
const auto elapsed = std::chrono::steady_clock::now() - start; const auto elapsed = std::chrono::steady_clock::now() - start;
g_debug("finished scan of %s in %" G_GINT64_FORMAT " ms", root_dir_.c_str(), g_debug("finished scan of %s in %" G_GINT64_FORMAT " ms", root_dir_.c_str(),
to_ms(elapsed)); to_ms(elapsed));
running_ = false; running_ = false;
return true; return true;