From: Andre Noll <maan@systemlinux.org>
Date: Thu, 1 Nov 2007 18:03:14 +0000 (+0100)
Subject: Split lyrics and image lines in stat output.
X-Git-Tag: v0.3.0~144
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=74cfed2536a16ca85bc0ce97f6bf307c96ae0d3d;p=paraslash.git

Split lyrics and image lines in stat output.

It's better to have the id and the name of the corresponding
blob as two different status items.
---

diff --git a/aft.c b/aft.c
index df8774aa..95de8801 100644
--- a/aft.c
+++ b/aft.c
@@ -811,23 +811,25 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
 	return att_lines;
 }
 
-static char *make_lyrics_line(struct afs_info *afsi)
+static char *make_lyrics_lines(struct afs_info *afsi)
 {
 	char *lyrics_name;
 
 	lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
 	if (!lyrics_name)
-		return make_message("%u", afsi->lyrics_id);
-	return make_message("%u (%s)", afsi->lyrics_id, lyrics_name);
+		return make_message("lyrics_id: %u\n", afsi->lyrics_id);
+	return make_message("lyrics_id: %u\nlyrics_name: %s\n",
+		afsi->lyrics_id, lyrics_name);
 }
 
-static char *make_image_line(struct afs_info *afsi)
+static char *make_image_lines(struct afs_info *afsi)
 {
 	char *image_name;
 	img_get_name_by_id(afsi->image_id, &image_name);
 	if (!image_name)
-		return make_message("%u", afsi->image_id);
-	return make_message("%u (%s)", afsi->image_id, image_name);
+		return make_message("image_id: %u\n", afsi->image_id);
+	return make_message("image_id: %u\nimage_name: %s\n",
+		afsi->image_id, image_name);
 }
 
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
@@ -843,7 +845,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_lines, *lyrics_line, *image_line;
+	char *att_lines, *lyrics_lines, *image_lines;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -893,16 +895,16 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	}
 	hash_to_asc(d->hash, asc_hash);
 	att_lines = make_attribute_lines(att_buf, afsi);
-	lyrics_line = make_lyrics_line(afsi);
-	image_line = make_image_line(afsi);
+	lyrics_lines = make_lyrics_lines(afsi);
+	image_lines = make_image_lines(afsi);
 	if (opts->mode == LS_MODE_VERBOSE) {
 		para_printf(b,
 			"%s: %s\n" /* path */
 			"%s%s%s" /* score */
 			"attributes: %s\n"
 			"hash: %s\n"
-			"image_id: %s\n"
-			"lyrics_id: %s\n"
+			"%s" /* image id, image name */
+			"%s" /* lyrics */
 			"bitrate: %dkbit/s\n"
 			"format: %s\n"
 			"frequency: %dHz\n"
@@ -917,8 +919,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 				have_score? "\n" : "",
 			att_lines,
 			asc_hash,
-			image_line,
-			lyrics_line,
+			image_lines,
+			lyrics_lines,
 			afhi->bitrate,
 			audio_format_name(afsi->audio_format_id),
 			afhi->frequency,
@@ -938,7 +940,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"%s%s%s" /* score */
 			"%s\n" /* attributes */
 			"hash: %s\n"
-			"image_id: %s\n"
+			"%s\n" /* image id, image name */
 			"lyrics_id: %s\n"
 			"bitrate: %dkbit/s\n"
 			"format: %s\n"
@@ -954,8 +956,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 				have_score? "\n" : "",
 			att_lines,
 			asc_hash,
-			image_line,
-			lyrics_line,
+			image_lines,
+			lyrics_lines,
 			afhi->bitrate,
 			audio_format_name(afsi->audio_format_id),
 			afhi->frequency,
@@ -970,8 +972,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			osl_close_disk_object(lyrics_def.data);
 	}
 	free(att_lines);
-	free(lyrics_line);
-	free(image_line);
+	free(lyrics_lines);
+	free(image_lines);
 	return 1;
 }