X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=playlist_selector.c;h=c40976d4635f1fb04fd0ebae422410e4c6651b23;hp=e5329bac5074f40a19277324adae4e94ed44e288;hb=b71d1e5ef301b21c2bb33c1a205c971b0a51b769;hpb=e0e5a7c1a04c6a2ee4a475e823657e06e6df2f99;ds=sidebyside

diff --git a/playlist_selector.c b/playlist_selector.c
index e5329bac..c40976d4 100644
--- a/playlist_selector.c
+++ b/playlist_selector.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
  *
  *     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
@@ -24,6 +24,8 @@
 #include "net.h"
 #include "string.h"
 #include "ipc.h"
+#include "user_list.h"
+#include "playlist_selector_command_list.h"
 
 /**
  * structure used for transmission of the playlist
@@ -61,34 +63,8 @@ static unsigned playlist_len, playlist_size, current_playlist_entry;
 static char **playlist;
 static struct audio_file_selector *self;
 
-static int com_ppl(int, int, char **);
-static int com_lpl(int, int, char **);
 extern struct misc_meta_data *mmd;
 
-/* array of supported commands */
-static struct server_command cmds[] = {
-{
-.name = "ppl",
-.handler = com_ppl,
-.perms = DB_READ,
-.description = "print playlist",
-.synopsis = "ppl",
-.help =
-"Print out the current playlist"
-}, {
-.name = "lpl",
-.handler = com_lpl,
-.perms = DB_WRITE,
-.description = "load playlist",
-.synopsis = "lpl",
-.help =
-"Read a new playlist from stdin. Example:\n"
-"\tfind /audio -name '*.mp3' | para_client lpl"
-}, {
-.name = NULL,
-}
-};
-
 static void playlist_add(char *path)
 {
 	if (playlist_len >= playlist_size) {
@@ -142,7 +118,7 @@ out:
 	return ret;
 }
 
-static int com_lpl(int fd, __a_unused int argc, __a_unused char *argv[])
+int com_lpl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned loaded = 0;
 	size_t bufsize = 4096; /* guess that's enough */
@@ -173,7 +149,7 @@ out:
 	return ret;
 }
 
-static int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
+int com_ppl(int fd, __a_unused int argc, __a_unused char *argv[])
 {
 	unsigned i;
 
@@ -192,12 +168,12 @@ static char **pls_get_audio_file_list(unsigned int num)
 	char **file_list;
 	unsigned i;
 
-	num = MIN(num, playlist_len);
+	num = PARA_MIN(num, playlist_len);
 	if (!num)
 		return NULL;
 	file_list = para_malloc((num + 1) * sizeof(char *));
 	for (i = 0; i < num; i++) {
-		unsigned j = (current_playlist_entry + i) % playlist_len;
+		unsigned j = (current_playlist_entry + i + 1) % playlist_len;
 		file_list[i] = para_strdup(playlist[j]);
 	}
 	file_list[i] = NULL;
@@ -251,6 +227,8 @@ static void pls_post_select(__a_unused fd_set *rfds, __a_unused fd_set *wfds)
 	ret = for_each_line((char *)shm, pcd->size, &playlist_add);
 	shm_detach(shm);
 	PARA_NOTICE_LOG("new playlist (%d entries)\n", playlist_len);
+	sprintf(mmd->selector_info, "dbinfo1:new playlist: %d files\n"
+		"dbinfo2:\ndbinfo3:\n", playlist_len);
 	pcd->retval = 1;
 	pcd->size = 0;
 	mutex_unlock(pcd->mutex);
@@ -258,16 +236,44 @@ out:
 	mutex_unlock(ppd->server_mutex);
 }
 
+static size_t string_offset(const char *str, size_t max)
+{
+	size_t l = strlen(str);
+
+	if (l <= max)
+		return 0;
+	return l - max;
+}
+
 void pls_update_audio_file(char *audio_file)
 {
 	unsigned i;
-
-	for (i = 0; i < playlist_len; i++) {
+	char *dir = para_dirname(audio_file),
+		*prev = playlist[current_playlist_entry % playlist_len];
+	size_t dir_off = string_offset(dir, 50),
+		prev_off = string_offset(prev, 70);
+
+	for (i = 1; i <= playlist_len; i++) {
+		char *next;
+		size_t next_off;
 		unsigned j = (current_playlist_entry + i) % playlist_len;
 		if (strcmp(playlist[j], audio_file))
 			continue;
-		current_playlist_entry = (j + 1) % playlist_len;
+		current_playlist_entry = j;
+		next = playlist[(j + 1) %playlist_len];
+		next_off = string_offset(next, 70);
+		snprintf(mmd->selector_info, MMD_INFO_SIZE,
+			"dbinfo1: %d files, current dir: %s%s\n"
+			"dbinfo2: prev: %s%s\n"
+			"dbinfo3: next: %s%s\n",
+			playlist_len,
+			dir_off? "... " : "", dir + dir_off,
+			prev_off? "... " : "", prev + prev_off,
+			next_off? "... " : "", next + next_off
+		);
+		break;
 	}
+	free(dir);
 }
 
 /**
@@ -285,7 +291,7 @@ int playlist_selector_init(struct audio_file_selector *db)
 	void *shm = NULL;
 
 	self = db;
-	db->cmd_list = cmds;
+	db->cmd_list = playlist_selector_cmds;
 	db->get_audio_file_list = pls_get_audio_file_list;
 	db->shutdown = pls_shutdown;
 	db->post_select = pls_post_select;
@@ -318,7 +324,8 @@ int playlist_selector_init(struct audio_file_selector *db)
 		goto err_out;
 	ppd->client_data = shm;
 	ppd->client_data->size = 0;
-	sprintf(mmd->selector_info, "playlist selector initialized");
+	sprintf(mmd->selector_info, "dbinfo1: Welcome to the playlist "
+		"selector\ndbinfo2: no playlist loaded\ndbinfo3:\n");
 	return 1;
 err_out:
 	if (ppd->client_data_shm_id >= 0)