chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge playlist support.
[disorder]
/
server
/
rescan.c
diff --git
a/server/rescan.c
b/server/rescan.c
index 1380e24fd493709bc188011b0b9104b2c745cfd2..dfe855a4afb6b0684153dc13cb3e56134f5db4ab 100644
(file)
--- a/
server/rescan.c
+++ b/
server/rescan.c
@@
-134,9
+134,9
@@
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 && time(0) > last_report + 10) {
+ if(ntracks % 100 == 0 &&
x
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);
+
x
time(&last_report);
}
}
}
}
}
}
@@
-300,12
+300,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 && time(0) > last_report + 10) {
+ if(nrc % 100 == 0 &&
x
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);
+
x
time(&last_report);
}
}
if(c)
}
}
if(c)
@@
-350,7
+350,7
@@
static void do_all(void (*fn)(const struct collection *c)) {
static void expire_noticed(void) {
time_t now;
static void expire_noticed(void) {
time_t now;
- time(&now);
+
x
time(&now);
trackdb_expire_noticed(now - config->noticed_history * 86400);
}
trackdb_expire_noticed(now - config->noticed_history * 86400);
}
@@
-380,7
+380,7
@@
int main(int argc, char **argv) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
- if(config_read(0)) fatal(0, "cannot read configuration");
+ if(config_read(0
, NULL
)) fatal(0, "cannot read configuration");
xnice(config->nice_rescan);
sa.sa_handler = signal_handler;
sa.sa_flags = SA_RESTART;
xnice(config->nice_rescan);
sa.sa_handler = signal_handler;
sa.sa_flags = SA_RESTART;