X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command.c;h=e294e87c9cbbe6e9ce1e2358ceb9b10e30035a09;hp=977e45673086fc517237fa2099e7803c61f94149;hb=75facba4cf88fd781d99199cc6098b596562b4ac;hpb=7a51f686d02cf4b2463d9aee2ca79addea4261f5

diff --git a/command.c b/command.c
index 977e4567..e294e87c 100644
--- a/command.c
+++ b/command.c
@@ -97,37 +97,43 @@ static char *vss_get_status_flags(unsigned int flags)
 
 static char *get_status(struct misc_meta_data *nmmd)
 {
-	char *bar, *ret, mtime[30] = "";
+	char *basename, *dirname, *ret, mtime[30] = "";
 	char *status, *flags; /* vss status info */
 	char *ut = uptime_str();
 	long offset = (nmmd->offset + 500) / 1000;
 	struct timeval now;
 	struct tm mtime_tm;
 
-	localtime_r(&nmmd->mtime, &mtime_tm);
-	strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
 	/* report real status */
 	status = vss_status_tohuman(nmmd->vss_status_flags);
 	flags = vss_get_status_flags(nmmd->vss_status_flags);
-	bar = para_basename(nmmd->filename);
+	basename = para_basename(nmmd->afd.path);
+	dirname = para_dirname(nmmd->afd.path);
+	if (basename) {
+		localtime_r(&nmmd->mtime, &mtime_tm);
+		strftime(mtime, 29, "%a %b %d %Y", &mtime_tm);
+	}
 	gettimeofday(&now, NULL);
 	ret = make_message(
 		"%s:%zu\n"	"%s:%s\n"		"%s:%lu\n"	"%s:%u\n"
-		"%s:%s\n"	"%s:%s\n"	"%s:%s\n"	"%s:%s\n"
+		"%s:%s\n"	"%s:%s\n"	"%s:%s\n"	"%s:%u\n"
 		"%s:%li\n" 	"%s:%s\n"	"%s:%s\n" "%s"
-		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n",
+		"%s:%s\n"	"%s:%lu.%lu\n"	"%s:%lu.%lu\n" "%s:%s\n"
+		"%s:%s\n"	"%s:%u\n",
 		status_item_list[SI_FILE_SIZE], nmmd->size / 1024,
 		status_item_list[SI_MTIME], mtime,
 		status_item_list[SI_LENGTH], nmmd->afd.afhi.seconds_total,
 		status_item_list[SI_NUM_PLAYED], nmmd->num_played,
 
-		status_item_list[SI_STATUS_BAR], bar ? bar : "(none)",
+		status_item_list[SI_BASENAME], basename ? basename : "(none)",
 		status_item_list[SI_STATUS], status,
 		status_item_list[SI_STATUS_FLAGS], flags,
-		status_item_list[SI_SELECTOR], "FIXME",
+		status_item_list[SI_IMAGE_ID], nmmd->afd.afsi.image_id,
 
 		status_item_list[SI_OFFSET], offset,
-		status_item_list[SI_FORMAT], audio_format_name(nmmd->afd.afsi.audio_format_id),
+		status_item_list[SI_FORMAT], basename?
+			audio_format_name(nmmd->afd.afsi.audio_format_id)
+			: "",
 		status_item_list[SI_AFS_MODE], mmd->afs_mode_string,
 		nmmd->afd.afhi.info_string,
 
@@ -137,10 +143,15 @@ static char *get_status(struct misc_meta_data *nmmd)
 			(long unsigned)nmmd->stream_start.tv_usec,
 		status_item_list[SI_CURRENT_TIME],
 			(long unsigned)now.tv_sec,
-			(long unsigned)now.tv_usec
+			(long unsigned)now.tv_usec,
+		status_item_list[SI_ATTRIBUTES], mmd->afd.attributes_string,
+
+		status_item_list[SI_DIRECTORY], dirname? dirname : "(none)",
+		status_item_list[SI_LYRICS_ID], nmmd->afd.afsi.lyrics_id
 
 	);
-	free(bar);
+	free(basename);
+	free(dirname);
 	free(flags);
 	free(status);
 	free(ut);
@@ -588,17 +599,12 @@ static struct server_command *parse_cmd(const char *cmdstr)
 	return get_cmd_ptr(buf, NULL);
 }
 
-static long int para_rand(long unsigned max)
-{
-	return (long int) ((max + 0.0) * (random() / (RAND_MAX + 1.0)));
-}
-
 static void init_rc4_keys(void)
 {
 	int i;
 
 	for (i = 0; i < 2 * RC4_KEY_LEN; i++)
-		rc4_buf[i] = para_rand(256);
+		rc4_buf[i] = para_random(256);
 	PARA_DEBUG_LOG("rc4 keys initialized (%u:%u)\n",
 		(unsigned char) rc4_buf[0],
 		(unsigned char) rc4_buf[RC4_KEY_LEN]);