chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
more thorough kvp.c testing
[disorder]
/
server
/
rescan.c
diff --git
a/server/rescan.c
b/server/rescan.c
index aaa5f93604bedb26fc35f5f0358d6833c9c4f45b..b878929a82adc97812030d3a898322ec322ac3f8 100644
(file)
--- a/
server/rescan.c
+++ b/
server/rescan.c
@@
-50,6
+50,7
@@
#include "trackdb.h"
#include "trackdb-int.h"
#include "trackname.h"
#include "trackdb.h"
#include "trackdb-int.h"
#include "trackname.h"
+#include "unicode.h"
static DB_TXN *global_tid;
static DB_TXN *global_tid;
@@
-59,6
+60,8
@@
static const struct option options[] = {
{ "config", required_argument, 0, 'c' },
{ "debug", no_argument, 0, 'd' },
{ "no-debug", no_argument, 0, 'D' },
{ "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 }
};
{ 0, 0, 0, 0 }
};
@@
-71,6
+74,7
@@
static void help(void) {
" --version, -V Display version number\n"
" --config PATH, -c PATH Set configuration file\n"
" --debug, -d Turn on debugging\n"
" --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");
"\n"
"Rescanner for DisOrder. Not intended to be run\n"
"directly.\n");
@@
-148,6
+152,13
@@
static void rescan_collection(const struct collection *c) {
error(0, "cannot convert track path to UTF-8: %s", path);
continue;
}
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
D(("track %s", track));
/* only tracks with a known player are admitted */
for(n = 0; (n < config->player.n
@@
-320,24
+331,25
@@
static void expire_noticed(void) {
}
int main(int argc, char **argv) {
}
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");
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:dD
Ss
", 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;
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");
}
}
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;
}
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
@@
-349,8
+361,8
@@
int main(int argc, char **argv) {
xsigaction(SIGTERM, &sa, 0);
xsigaction(SIGINT, &sa, 0);
info("started");
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);
if(optind == argc) {
/* Rescan all collections */
do_all(rescan_collection);