tone down logging some more

[disorder] / server / rescan.c

diff --git a/server/rescan.c b/server/rescan.c
index 45f5a650178dd615b313d4acabce594f948050ae..aaa5f93604bedb26fc35f5f0358d6833c9c4f45b 100644 (file)
--- 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"
@@ -197,8 +198,8 @@ 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));
@@ -221,13 +222,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;
@@ -305,7 +313,10 @@ static void do_all(void (*fn)(const struct collection *c)) {
 
 /** @brief Expire noticed.db */
 static void expire_noticed(void) {
-  error(0, "expire_noticed not implemented yet TODO");
+  time_t now;
+
+  time(&now);
+  trackdb_expire_noticed(now - config->noticed_history * 86400);
 }
 
 int main(int argc, char **argv) {