chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Disobedience memory/widget debugging stuff has thoroughly rotted, so
[disorder]
/
server
/
rescan.c
diff --git
a/server/rescan.c
b/server/rescan.c
index 2d390f815e00468e3f0049783aebf95853a00b6c..1c2c973ac0e4ecb929f720b67380e3304af32b7e 100644
(file)
--- a/
server/rescan.c
+++ b/
server/rescan.c
@@
-18,42
+18,9
@@
* USA
*/
* USA
*/
-#include <config.h>
-#include "types.h"
-
-#include <getopt.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <db.h>
-#include <locale.h>
-#include <errno.h>
-#include <sys/types.h>
-#include <unistd.h>
-#include <pcre.h>
-#include <fnmatch.h>
-#include <sys/wait.h>
-#include <string.h>
-#include <syslog.h>
-#include <time.h>
-
-#include "configuration.h"
-#include "syscalls.h"
-#include "log.h"
-#include "defs.h"
-#include "mem.h"
-#include "plugin.h"
-#include "inputline.h"
-#include "charset.h"
-#include "wstat.h"
-#include "kvp.h"
-#include "printf.h"
-#include "rights.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "trackname.h"
-#include "unicode.h"
-#include "version.h"
+#include "disorder-server.h"
+static time_t last_report;
static DB_TXN *global_tid;
static const struct option options[] = {
static DB_TXN *global_tid;
static const struct option options[] = {
@@
-165,8
+132,10
@@
static void rescan_collection(const struct collection *c) {
if(n < config->player.n) {
nnew += !!trackdb_notice(track, path);
++ntracks;
if(n < config->player.n) {
nnew += !!trackdb_notice(track, path);
++ntracks;
- if(ntracks % 100
0 == 0)
+ if(ntracks % 100
== 0 && time(0) > last_report + 10) {
info("rescanning %s, %ld tracks so far", c->root, ntracks);
info("rescanning %s, %ld tracks so far", c->root, ntracks);
+ time(&last_report);
+ }
}
}
/* tidy up */
}
}
/* tidy up */
@@
-329,11
+298,12
@@
static void recheck_collection(const struct collection *c) {
return;
recheck_track(&cs, t);
++nrc;
return;
recheck_track(&cs, t);
++nrc;
- if(nrc % 100 == 0) {
+ if(nrc % 100 == 0
&& time(0) > last_report + 10
) {
if(c)
info("rechecking %s, %ld tracks so far", c->root, nrc);
else
info("rechecking all tracks, %ld tracks so far", nrc);
if(c)
info("rechecking %s, %ld tracks so far", c->root, nrc);
else
info("rechecking all tracks, %ld tracks so far", nrc);
+ time(&last_report);
}
}
if(c)
}
}
if(c)