tris/recoll
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

comments

Browse Source
This commit is contained in:
Jean-Francois Dockes 2022-08-26 10:42:07 +02:00
parent c218d5bbcc
commit 35753d17d0
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/index/indexer.cpp
View File

@ -63,9 +63,6 @@ bool runWebFilesMoverScript(RclConfig *config)
} }
downloadsdir = path_tildexpand(downloadsdir); downloadsdir = path_tildexpand(downloadsdir);
} }
vector<string> cmdvec;
config->pythonCmd("recoll-we-move-files.py", cmdvec);
/* Arrange to not actually run the script if the directory did not change */ /* Arrange to not actually run the script if the directory did not change */
static time_t dirmtime; static time_t dirmtime;
time_t ndirmtime = 0; time_t ndirmtime = 0;
@ -73,16 +70,15 @@ bool runWebFilesMoverScript(RclConfig *config)
if (path_fileprops(downloadsdir.c_str(), &st) == 0) { if (path_fileprops(downloadsdir.c_str(), &st) == 0) {
ndirmtime = st.pst_mtime; ndirmtime = st.pst_mtime;
} }
/* If stat fails, presumably Downloads does not exist or is not // If stat fails, presumably Downloads does not exist or is not accessible, dirmtime and
accessible, dirmtime and mdirmtime stay at 0, and we never // mdirmtime stay at 0, and we never execute the script, which is the right thing.
execute the script, which is the right thing. */
if (dirmtime != ndirmtime) { if (dirmtime != ndirmtime) {
/* The script is going to change the directory, so updating // The script is going to change the directory, so updating dirmtime before it runs means
dirmtime before it runs means that we are going to execute // that we are going to execute it one time too many (it will run without doing anything),
it one time too many (it will run without doing anything), // but we can't set the mtime to after the run in case files are created during the run.
but we can't set the mtime to after the run in case files
are created during the run. */
dirmtime = ndirmtime; dirmtime = ndirmtime;
vector<string> cmdvec;
config->pythonCmd("recoll-we-move-files.py", cmdvec);
ExecCmd cmd; ExecCmd cmd;
cmd.putenv("RECOLL_CONFDIR", config->getConfDir()); cmd.putenv("RECOLL_CONFDIR", config->getConfDir());
int status = cmd.doexec1(cmdvec); int status = cmd.doexec1(cmdvec);