X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/026a72d4f3e7d69c31c9523aa08554d159e21e1a..c3feb35be30a8018ae00b08baeaf60060f99c1b2:/server/choose.c
diff --git a/server/choose.c b/server/choose.c
index c39e27b..7347fb1 100644
--- a/server/choose.c
+++ b/server/choose.c
@@ -3,22 +3,20 @@
* Copyright (C) 2008 Richard Kettlewell
* Copyright (C) 2008 Mark Wooding
*
- * 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 choose.c
+/** @file server/choose.c
* @brief Random track chooser
*
* Picks a track at random and writes it to standard output. If for
@@ -26,37 +24,7 @@
* deadlock - it just exits and expects the server to try again.
*/
-#include
-#include "types.h"
-
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-
-#include "configuration.h"
-#include "log.h"
-#include "defs.h"
-#include "mem.h"
-#include "kvp.h"
-#include "syscalls.h"
-#include "printf.h"
-#include "trackdb.h"
-#include "trackdb-int.h"
-#include "version.h"
-#include "trackname.h"
-#include "queue.h"
-#include "server-queue.h"
-#include "random.h"
+#include "disorder-server.h"
#define BASE_WEIGHT 90000
@@ -84,7 +52,7 @@ static void help(void) {
" --debug, -d Turn on debugging\n"
" --[no-]syslog Enable/disable logging to syslog\n"
"\n"
- "Track choose for DisOrder. Not intended to be run\n"
+ "Track chooser for DisOrder. Not intended to be run\n"
"directly.\n");
xfclose(stdout);
exit(0);
@@ -124,7 +92,7 @@ static unsigned long compute_weight(const char *track,
struct kvp *prefs) {
const char *s;
char **track_tags;
- time_t last, now = time(0);
+ time_t last, now = xtime(0);
/* Reject tracks not in any collection (race between edit config and
* rescan) */
@@ -313,7 +281,7 @@ int main(int argc, char **argv) {
openlog(progname, LOG_PID, LOG_DAEMON);
log_default = &log_syslog;
}
- if(config_read(0)) fatal(0, "cannot read configuration");
+ if(config_read(0, NULL)) fatal(0, "cannot read configuration");
/* Find out current queue/recent list */
queue_read();
recent_read();
@@ -327,11 +295,13 @@ int main(int argc, char **argv) {
if((err = trackdb_get_global_tid("prohibited-tags", global_tid, &tags)))
fatal(0, "error getting prohibited-tags: %s", db_strerror(err));
prohibited_tags = parsetags(tags);
- if(trackdb_scan(0, collect_tracks_callback, 0, global_tid))
+ if(trackdb_scan(0, collect_tracks_callback, 0, global_tid)) {
+ global_tid->abort(global_tid);
exit(1);
+ }
trackdb_commit_transaction(global_tid);
trackdb_close();
- trackdb_deinit();
+ trackdb_deinit(NULL);
D(("ntracks=%ld total_weight=%lld", ntracks, total_weight));
if(!total_weight)
fatal(0, "no tracks match random choice criteria");