X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=17132e872fb265096fec0d57b9428e1bd78e387a;hp=1ca54da90191fd270c98b3001d16a4b5f5c04c53;hb=337d7784b0f8bc30b1fa9af56ace503acd97d40d;hpb=318fbe90e08b6d9c5e781d9b517b670c5a1a04d7

diff --git a/command.c b/command.c
index 1ca54da9..17132e87 100644
--- a/command.c
+++ b/command.c
@@ -11,6 +11,7 @@
 #include <sys/types.h>
 #include <dirent.h>
 #include <openssl/rc4.h>
+#include <osl.h>
 
 #include "para.h"
 #include "error.h"
@@ -102,14 +103,15 @@ static char *vss_get_status_flags(unsigned int flags)
 	return msg;
 }
 
-static char *get_status(struct misc_meta_data *nmmd)
+static char *get_status(struct misc_meta_data *nmmd, int parser_friendly)
 {
-	char *ret, mtime[30] = "";
+	char mtime[30] = "";
 	char *status, *flags; /* vss status info */
 	char *ut = uptime_str();
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval current_time;
 	struct tm mtime_tm;
+	struct para_buffer b = {.flags = parser_friendly? PBF_SIZE_PREFIX : 0};
 
 	/* report real status */
 	status = vss_status_tohuman(nmmd->vss_status_flags);
@@ -119,38 +121,22 @@ static char *get_status(struct misc_meta_data *nmmd)
 		strftime(mtime, 29, "%b %d %Y", &mtime_tm);
 	}
 	gettimeofday(&current_time, NULL);
-	ret = make_message(
-		"%s: %zu\n" /* file size */
-		"%s: %s\n" /* mtime */
-		"%s: %s\n" /* status */
-		"%s: %s\n" /* status flags */
-		"%s: %li\n" /* offset */
-		"%s: %s\n" /* afs mode */
-		"%s: %lu.%lu\n" /* stream start */
-		"%s: %lu.%lu\n" /* current server time */
-		"%s", /* afs status info */
-		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
-		status_item_list[SI_MTIME], mtime,
-		status_item_list[SI_STATUS], status,
-		status_item_list[SI_STATUS_FLAGS], flags,
-
-		status_item_list[SI_OFFSET], offset,
-		status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
-
-		status_item_list[SI_STREAM_START],
-			(long unsigned)nmmd->stream_start.tv_sec,
-			(long unsigned)nmmd->stream_start.tv_usec,
-		status_item_list[SI_CURRENT_TIME],
-			(long unsigned)current_time.tv_sec,
-			(long unsigned)current_time.tv_usec,
-
-		nmmd->afd.verbose_ls_output
-
-	);
+	WRITE_STATUS_ITEM(&b, SI_FILE_SIZE, "%zu\n", nmmd->size / 1024);
+	WRITE_STATUS_ITEM(&b, SI_MTIME, "%s\n", mtime);
+	WRITE_STATUS_ITEM(&b, SI_STATUS, "%s\n", status);
+	WRITE_STATUS_ITEM(&b, SI_STATUS_FLAGS, "%s\n", flags);
+	WRITE_STATUS_ITEM(&b, SI_OFFSET, "%li\n", offset);
+	WRITE_STATUS_ITEM(&b, SI_AFS_MODE, "%s\n", mmd->afs_mode_string);
+	WRITE_STATUS_ITEM(&b, SI_STREAM_START, "%lu.%lu\n",
+		(long unsigned)nmmd->stream_start.tv_sec,
+		(long unsigned)nmmd->stream_start.tv_usec);
+	WRITE_STATUS_ITEM(&b, SI_CURRENT_TIME, "%lu.%lu\n",
+		(long unsigned)current_time.tv_sec,
+		(long unsigned)current_time.tv_usec);
 	free(flags);
 	free(status);
 	free(ut);
-	return ret;
+	return b.buf;
 }
 
 static int check_sender_args(int argc, char * const * argv, struct sender_command_data *scd)
@@ -304,27 +290,109 @@ int com_version(int fd, int argc, __a_unused char * const * argv)
 	);
 }
 
+#define EMPTY_STATUS_ITEMS \
+	ITEM(PATH) \
+	ITEM(DIRECTORY) \
+	ITEM(BASENAME) \
+	ITEM(SCORE) \
+	ITEM(ATTRIBUTES_BITMAP) \
+	ITEM(ATTRIBUTES_TXT) \
+	ITEM(HASH) \
+	ITEM(IMAGE_ID) \
+	ITEM(IMAGE_NAME) \
+	ITEM(LYRICS_ID) \
+	ITEM(LYRICS_NAME) \
+	ITEM(BITRATE) \
+	ITEM(FORMAT) \
+	ITEM(FREQUENCY) \
+	ITEM(CHANNELS) \
+	ITEM(DURATION) \
+	ITEM(SECONDS_TOTAL) \
+	ITEM(NUM_PLAYED) \
+	ITEM(LAST_PLAYED) \
+	ITEM(TECHINFO) \
+	ITEM(ARTIST) \
+	ITEM(TITLE) \
+	ITEM(YEAR) \
+	ITEM(ALBUM) \
+	ITEM(COMMENT) \
+	ITEM(AMPLIFICATION)
+
+/**
+ * Write a list of audio-file related status items with empty values.
+ *
+ * This is used by vss when currently no audio file is open.
+ */
+static char *empty_status_items(int parser_friendly)
+{
+	if (parser_friendly)
+		return make_message(
+			#define ITEM(x) "0004 %02x:\n"
+			EMPTY_STATUS_ITEMS
+			#undef ITEM
+			#define ITEM(x) , SI_ ## x
+			EMPTY_STATUS_ITEMS
+			#undef ITEM
+		);
+	return make_message(
+		#define ITEM(x) "%s:\n"
+		EMPTY_STATUS_ITEMS
+		#undef ITEM
+		#define ITEM(x) ,status_item_list[SI_ ## x]
+		EMPTY_STATUS_ITEMS
+		#undef ITEM
+	);
+}
+#undef EMPTY_STATUS_ITEMS
+
 /* stat */
 int com_stat(int fd, int argc, char * const * argv)
 {
-	int ret, num = 0;/* status will be printed that many
-			  * times. num <= 0 means: print forever
-			  */
+	int i, ret;
 	struct misc_meta_data tmp, *nmmd = &tmp;
 	char *s;
+	int32_t num = 0;
+	int parser_friendly = 0;
 
 	para_sigaction(SIGUSR1, dummy);
 
-	if (argc > 1)
-		num = atoi(argv[1]);
+	for (i = 1; i < argc; i++) {
+		const char *arg = argv[i];
+		if (arg[0] != '-')
+			break;
+		if (!strcmp(arg, "--")) {
+			i++;
+			break;
+		}
+		if (!strncmp(arg, "-n=", 3)) {
+			ret = para_atoi32(arg + 3, &num);
+			if (ret < 0)
+				return ret;
+			continue;
+		}
+		if (!strcmp(arg, "-p")) {
+			parser_friendly = 1;
+			continue;
+		}
+	}
+	if (i != argc)
+		return -E_COMMAND_SYNTAX;
 	for (;;) {
-
 		mmd_dup(nmmd);
-		s = get_status(nmmd);
+		s = get_status(nmmd, parser_friendly);
 		ret = send_buffer(fd, s);
 		free(s);
 		if (ret < 0)
 			goto out;
+		if (nmmd->vss_status_flags & VSS_NEXT) {
+			static char *esi;
+			if (!esi)
+				esi = empty_status_items(parser_friendly);
+			ret = send_buffer(fd, esi);
+			if (ret < 0)
+				goto out;
+		} else
+			send_afs_status(fd, parser_friendly);
 		ret = 1;
 		if (num > 0 && !--num)
 			goto out;