X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/ffac51d73ab97c4c9c1e6c43b18d54d716000bf6..0e72bf84b9d3a45de98bb3dbb30ef2d2aaabb4ca:/server/rescan.c diff --git a/server/rescan.c b/server/rescan.c index 47dcf99..1380e24 100644 --- a/server/rescan.c +++ b/server/rescan.c @@ -1,58 +1,28 @@ /* * This file is part of DisOrder - * Copyright (C) 2005, 2006, 2007 Richard Kettlewell + * Copyright (C) 2005-2008 Richard Kettlewell * - * This program is free software; you can redistribute it and/or modify + * 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 - * the Free Software Foundation; either version 2 of the License, or + * the Free Software Foundation, either version 3 of the License, or * (at your option) any later version. * - * This program is distributed in the hope that it will be useful, but - * WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 - * USA + * along with this program. If not, see . */ +/** @file server/rescan.c + * @brief Rescanning utility + * + * Invoked by the server. + */ +#include "disorder-server.h" -#include -#include "types.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include "configuration.h" -#include "syscalls.h" -#include "log.h" -#include "defs.h" -#include "mem.h" -#include "plugin.h" -#include "inputline.h" -#include "charset.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 time_t last_report; static DB_TXN *global_tid; static const struct option options[] = { @@ -86,13 +56,6 @@ static void help(void) { exit(0); } -/* display version number and terminate */ -static void version(void) { - xprintf("%s", disorder_version_string); - xfclose(stdout); - exit(0); -} - static volatile sig_atomic_t signalled; static void signal_handler(int sig) { @@ -171,8 +134,10 @@ static void rescan_collection(const struct collection *c) { if(n < config->player.n) { nnew += !!trackdb_notice(track, path); ++ntracks; - if(ntracks % 1000 == 0) + if(ntracks % 100 == 0 && time(0) > last_report + 10) { info("rescanning %s, %ld tracks so far", c->root, ntracks); + time(&last_report); + } } } /* tidy up */ @@ -213,6 +178,7 @@ struct recheck_track { /* called for each non-alias track */ static int recheck_list_callback(const char *track, struct kvp attribute((unused)) *data, + struct kvp attribute((unused)) *prefs, void *u, DB_TXN attribute((unused)) *tid) { struct recheck_state *cs = u; @@ -334,11 +300,12 @@ static void recheck_collection(const struct collection *c) { return; recheck_track(&cs, t); ++nrc; - if(nrc % 100 == 0) { + if(nrc % 100 == 0 && time(0) > last_report + 10) { if(c) info("rechecking %s, %ld tracks so far", c->root, nrc); else info("rechecking all tracks, %ld tracks so far", nrc); + time(&last_report); } } if(c) @@ -398,7 +365,7 @@ int main(int argc, char **argv) { while((n = getopt_long(argc, argv, "hVc:dDSsKC", options, 0)) >= 0) { switch(n) { case 'h': help(); - case 'V': version(); + case 'V': version("disorder-rescan"); case 'c': configfile = optarg; break; case 'd': debugging = 1; break; case 'D': debugging = 0; break;