#include <sys/wait.h>
#include <string.h>
#include <syslog.h>
+#include <time.h>
#include "configuration.h"
#include "syscalls.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"
static DB_TXN *global_tid;
{ "config", required_argument, 0, 'c' },
{ "debug", no_argument, 0, 'd' },
{ "no-debug", no_argument, 0, 'D' },
+ { "syslog", no_argument, 0, 's' },
+ { "no-syslog", no_argument, 0, 'S' },
{ 0, 0, 0, 0 }
};
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
+ " --[no-]syslog Force logging\n"
"\n"
"Rescanner for DisOrder. Not intended to be run\n"
"directly.\n");
/* display version number and terminate */
static void version(void) {
- xprintf("disorder-rescan version %s\n", disorder_version_string);
+ xprintf("%s", disorder_version_string);
xfclose(stdout);
exit(0);
}
error(0, "cannot convert track path to UTF-8: %s", path);
continue;
}
+ if(config->dbversion > 1) {
+ /* We use NFC track names */
+ if(!(track = utf8_compose_canon(track, strlen(track), 0))) {
+ error(0, "cannot convert track path to NFC: %s", path);
+ continue;
+ }
+ }
D(("track %s", track));
/* only tracks with a known player are admitted */
for(n = 0; (n < config->player.n
const struct collection *c = cs->c;
const char *path = kvp_get(data, "_path");
char buffer[20];
- int err;
- long n;
+ int err, n;
+ long length;
if(aborted()) return EINTR;
D(("rechecking %s", track));
/* make sure we know the length */
if(!kvp_get(data, "_length")) {
D(("recalculating length of %s", track));
- n = tracklength(track, path);
- if(n > 0) {
- byte_snprintf(buffer, sizeof buffer, "%ld", n);
- kvp_set(&data, "_length", buffer);
- if((err = trackdb_putdata(trackdb_tracksdb, track, data, tid, 0)))
- return err;
- ++cs->nlength;
+ for(n = 0; n < config->tracklength.n; ++n)
+ if(fnmatch(config->tracklength.s[n].s[0], track, 0) == 0)
+ break;
+ if(n >= config->tracklength.n)
+ error(0, "no tracklength plugin found for %s", track);
+ else {
+ length = tracklength(config->tracklength.s[n].s[1], track, path);
+ if(length > 0) {
+ byte_snprintf(buffer, sizeof buffer, "%ld", length);
+ kvp_set(&data, "_length", buffer);
+ if((err = trackdb_putdata(trackdb_tracksdb, track, data, tid, 0)))
+ return err;
+ ++cs->nlength;
+ }
}
}
return 0;
*/
}
+/** @brief Expire noticed.db */
+static void expire_noticed(void) {
+ time_t now;
+
+ time(&now);
+ trackdb_expire_noticed(now - config->noticed_history * 86400);
+}
+
int main(int argc, char **argv) {
- int n;
+ int n, logsyslog = !isatty(2);
struct sigaction sa;
set_progname(argv);
mem_init();
if(!setlocale(LC_CTYPE, "")) fatal(errno, "error calling setlocale");
- while((n = getopt_long(argc, argv, "hVc:dD", options, 0)) >= 0) {
+ while((n = getopt_long(argc, argv, "hVc:dDSs", options, 0)) >= 0) {
switch(n) {
case 'h': help();
case 'V': version();
case 'c': configfile = optarg; break;
case 'd': debugging = 1; break;
case 'D': debugging = 0; break;
+ case 'S': logsyslog = 0; break;
+ case 's': logsyslog = 1; break;
default: fatal(0, "invalid option");
}
}
- /* If stderr is a TTY then log there, otherwise to syslog. */
- if(!isatty(2)) {
+ if(logsyslog) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
- if(config_read()) fatal(0, "cannot read configuration");
+ if(config_read(0)) fatal(0, "cannot read configuration");
xnice(config->nice_rescan);
sa.sa_handler = signal_handler;
sa.sa_flags = SA_RESTART;
xsigaction(SIGTERM, &sa, 0);
xsigaction(SIGINT, &sa, 0);
info("started");
- trackdb_init(0);
- trackdb_open();
+ trackdb_init(TRACKDB_NO_RECOVER);
+ trackdb_open(TRACKDB_NO_UPGRADE);
if(optind == argc) {
/* Rescan all collections */
do_all(rescan_collection);
/* Check that every track still exists */
recheck_collection(0);
+ /* Expire noticed.db */
+ expire_noticed();
}
else {
/* Rescan specified collections */