X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/eb525fcd474c7c30e98e0764698a6fac33eb10ce..f9635e06947ec6bc61c7977e7a3f9dba2c43d784:/server/rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index 6f024af..b9be72d 100644
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -34,6 +34,7 @@
 #include <sys/wait.h>
 #include <string.h>
 #include <syslog.h>
+#include <time.h>
 
 #include "configuration.h"
 #include "syscalls.h"
@@ -48,6 +49,8 @@
 #include "printf.h"
 #include "trackdb.h"
 #include "trackdb-int.h"
+#include "trackname.h"
+#include "unicode.h"
 
 static DB_TXN *global_tid;
 
@@ -57,6 +60,8 @@ static const struct option options[] = {
   { "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 }
 };
 
@@ -69,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"
+          "  --[no-]syslog           Force logging\n"
           "\n"
           "Rescanner for DisOrder.  Not intended to be run\n"
           "directly.\n");
@@ -146,6 +152,11 @@ static void rescan_collection(const struct collection *c) {
       error(0, "cannot convert track path to UTF-8: %s", path);
       continue;
     }
+    /* 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
@@ -154,6 +165,8 @@ static void rescan_collection(const struct collection *c) {
     if(n < config->player.n) {
       nnew += !!trackdb_notice(track, path);
       ++ntracks;
+      if(ntracks % 1000 == 0)
+        info("rescanning %s, %ld tracks so far", c->root, ntracks);
     }
   }
   /* tidy up */
@@ -182,7 +195,7 @@ done:
 
 struct recheck_state {
   const struct collection *c;
-  long nobsolete, nlength;
+  long nobsolete, nnocollection, nlength;
 };
 
 /* called for each non-alias track */
@@ -194,11 +207,20 @@ static int recheck_callback(const char *track,
   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));
+  /* if we're not checking a specific collection, find the right collection */
+  if(!c) {
+    if(!(c = find_track_collection(track))) {
+      D(("obsoleting %s", track));
+      if((err = trackdb_obsolete(track, tid))) return err;
+      ++cs->nnocollection;
+      return 0;
+    }
+  }
   /* see if the track has evaporated */
   if(check(c->module, c->root, path) == 0) {
     D(("obsoleting %s", track));
@@ -209,13 +231,20 @@ static int recheck_callback(const char *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;
@@ -225,13 +254,17 @@ static int recheck_callback(const char *track,
 static void recheck_collection(const struct collection *c) {
   struct recheck_state cs;
 
-  info("rechecking %s", c->root);
+  if(c)
+    info("rechecking %s", c->root);
+  else
+    info("rechecking all tracks");
   for(;;) {
     checkabort();
     global_tid = trackdb_begin_transaction();
     memset(&cs, 0, sizeof cs);
     cs.c = c;
-    if(trackdb_scan(c->root, recheck_callback, &cs, global_tid)) goto fail;
+    if(trackdb_scan(c ? c->root : 0, recheck_callback, &cs, global_tid))
+      goto fail;
     break;
   fail:
     /* Maybe we need to shut down */
@@ -242,12 +275,19 @@ static void recheck_collection(const struct collection *c) {
     /* Let anything else that is going on get out of the way. */
     sleep(10);
     checkabort();
-    info("resuming recheck of %s", c->root);
+    if(c)
+      info("resuming recheck of %s", c->root);
+    else
+      info("resuming global recheck");
   }
   trackdb_commit_transaction(global_tid);
   global_tid = 0;
-  info("rechecked %s, %ld obsoleted, %ld lengths calculated",
-       c->root, cs.nobsolete, cs.nlength);
+  if(c)
+    info("rechecked %s, %ld obsoleted, %ld lengths calculated",
+         c->root, cs.nobsolete, cs.nlength);
+  else
+    info("rechecked all tracks, %ld no collection, %ld obsoleted, %ld lengths calculated",
+         cs.nnocollection, cs.nobsolete, cs.nlength);
 }
 
 /* rescan/recheck a collection by name */
@@ -280,29 +320,38 @@ static void do_all(void (*fn)(const struct collection *c)) {
    */
 }
 
+/** @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(1);
+  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;
@@ -313,12 +362,18 @@ int main(int argc, char **argv) {
   trackdb_init(0);
   trackdb_open();
   if(optind == argc) {
+    /* Rescan all collections */
     do_all(rescan_collection);
-    do_all(recheck_collection);
+    /* Check that every track still exists */
+    recheck_collection(0);
+    /* Expire noticed.db */
+    expire_noticed();
   }
   else {
+    /* Rescan specified collections */
     for(n = optind; n < argc; ++n)
       do_directory(argv[n], rescan_collection);
+    /* Check specified collections for tracks that have gone */
     for(n = optind; n < argc; ++n)
       do_directory(argv[n], recheck_collection);
   }