From: Andre Noll <maan@systemlinux.org>
Date: Wed, 24 Oct 2007 19:13:50 +0000 (+0200)
Subject: aft.c: Separate attribute bitmap and attribute text.
X-Git-Tag: v0.3.0~215
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=a5709c7d45c644cfdedbe25f6873d65cf7aa2a7b;p=paraslash.git

aft.c: Separate attribute bitmap and attribute text.
---

diff --git a/aft.c b/aft.c
index 85ceee9f..d201c080 100644
--- a/aft.c
+++ b/aft.c
@@ -780,16 +780,17 @@ static void get_duration_buf(int seconds, char *buf, short unsigned max_width)
 			seconds % 60);
 }
 
-static char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi)
+static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
 {
-	char *att_text, *att_line;
+	char *att_text, *att_lines;
 
 	get_attribute_text(&afsi->attributes, " ", &att_text);
 	if (!att_text)
 		return para_strdup(att_bitmap);
-	att_line = make_message("%s (%s)", att_bitmap, att_text);
+	att_lines = make_message("attributes: %s\nattributes_txt: %s",
+		att_bitmap, att_text);
 	free(att_text);
-	return att_line;
+	return att_lines;
 }
 
 static char *make_lyrics_line(struct afs_info *afsi)
@@ -824,7 +825,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	struct ls_widths *w = &opts->widths;
 	int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
 	char asc_hash[2 * HASH_SIZE + 1];
-	char *att_line, *lyrics_line, *image_line;
+	char *att_lines, *lyrics_line, *image_line;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -873,11 +874,11 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		return 1;
 	}
 	hash_to_asc(d->hash, asc_hash);
-	att_line = make_attribute_line(att_buf, afsi);
+	att_lines = make_attribute_lines(att_buf, afsi);
 	lyrics_line = make_lyrics_line(afsi);
 	image_line = make_image_line(afsi);
+	/* TODO: Merge this with status items */
 	if (opts->mode == LS_MODE_VERBOSE) {
-
 		para_printf(b,
 			"%s: %s\n" /* path */
 			"%s%s%s" /* score */
@@ -897,7 +898,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 				"path" : "file", d->path,
 			have_score? "score: " : "", score_buf,
 				have_score? "\n" : "",
-			att_line,
+			att_lines,
 			asc_hash,
 			image_line,
 			lyrics_line,
@@ -918,7 +919,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"Received: from\nTo: bar\nFrom: a\n"
 			"Subject: %s\n\n" /* path */
 			"%s%s%s" /* score */
-			"attributes: %s\n"
+			"%s"
 			"hash: %s\n"
 			"image_id: %s\n"
 			"lyrics_id: %s\n"
@@ -934,7 +935,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			d->path,
 			have_score? "score: " : "", score_buf,
 				have_score? "\n" : "",
-			att_line,
+			att_lines,
 			asc_hash,
 			image_line,
 			lyrics_line,
@@ -951,7 +952,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		if (lyrics_def.data)
 			osl_close_disk_object(lyrics_def.data);
 	}
-	free(att_line);
+	free(att_lines);
 	free(lyrics_line);
 	free(image_line);
 	return 1;