X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/460b9539a7c15580e41a71bbc0f47ae776238915..1e64e9fbf7c8029420562eef6da3d7111e763505:/server/rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index 0c1e6de..53c566c 100644
--- a/server/rescan.c
+++ b/server/rescan.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder 
- * Copyright (C) 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2005, 2006, 2007 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -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,7 @@
 #include "printf.h"
 #include "trackdb.h"
 #include "trackdb-int.h"
+#include "trackname.h"
 
 static DB_TXN *global_tid;
 
@@ -154,6 +156,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 +186,7 @@ done:
 
 struct recheck_state {
   const struct collection *c;
-  long nobsolete, nlength;
+  long nobsolete, nnocollection, nlength;
 };
 
 /* called for each non-alias track */
@@ -199,6 +203,15 @@ static int recheck_callback(const char *track,
 
   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));
@@ -225,13 +238,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 +259,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 */
@@ -270,6 +294,22 @@ static void do_all(void (*fn)(const struct collection *c)) {
 
   for(n = 0; n < config->collection.n; ++n)
     fn(&config->collection.s[n]);
+  /* TODO: we need to tidy up tracks from collections now removed.  We could do
+   * this two ways: either remember collections we think there are and spot
+   * their disappearance, or iterate over all tracks and gc any that don't fit
+   * into some collection.
+   *
+   * Having a way to rename collections would be rather convenient too but
+   * that's another kettle of monkeys.
+   */
+}
+
+/** @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) {
@@ -277,7 +317,7 @@ int main(int argc, char **argv) {
   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) {
     switch(n) {
@@ -294,7 +334,7 @@ int main(int argc, char **argv) {
     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;
@@ -305,12 +345,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);
   }
@@ -328,4 +374,3 @@ fill-column:79
 indent-tabs-mode:nil
 End:
 */
-/* arch-tag:yBYnk5wX3mDtVI1MI3LlWg */