X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=d2c7ced438e6ae8cfa653b215f18a590e7b7e780;hp=e45938d3942619989cc6eecbc9f29e986d3f5f30;hb=192417698d9dab017ef6108fa6e9fd5ea1dc5633;hpb=8769ef42c84de55cea4cd6820802e8b8f53393c8

diff --git a/aft.c b/aft.c
index e45938d3..d2c7ced4 100644
--- a/aft.c
+++ b/aft.c
@@ -665,7 +665,8 @@ int load_afd(int shmid, struct audio_file_data *afd)
  *
  * \return Positive on success, negative on errors.
  */
-int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *afd)
+int open_and_update_audio_file(struct osl_row *aft_row,
+	struct audio_file_data *afd, long score)
 {
 	HASH_TYPE *aft_hash, file_hash[HASH_SIZE];
 	struct osl_object afsi_obj;
@@ -673,15 +674,13 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	int ret = get_hash_of_row(aft_row, &aft_hash);
 	struct afsi_change_event_data aced;
 	struct osl_object map, chunk_table_obj;
-	char *tmp, *path;
+	char *path;
 
 	if (ret < 0)
 		return ret;
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
-	strncpy(afd->path, path, sizeof(afd->path) - 1);
-	afd->path[sizeof(afd->path) - 1] = '\0';
 	ret = get_afsi_object_of_row(aft_row, &afsi_obj);
 	if (ret < 0)
 		return ret;
@@ -714,20 +713,12 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	ret = load_chunk_info(&chunk_table_obj, &afd->afhi);
 	if (ret < 0)
 		goto err;
-	ret = get_attribute_text(&afd->afsi.attributes, " ", &tmp);
-	if (ret < 0)
-		goto err;
-	assert(tmp);
-	strncpy(afd->attributes_string, tmp, sizeof(afd->attributes_string));
-	afd->attributes_string[sizeof(afd->attributes_string) - 1] = '\0';
-	free(tmp);
-
 	{
 		struct ls_data d = {
 			.afhi = afd->afhi,
 			.afsi = afd->afsi,
 			.path = path,
-			.score = afd->score,
+			.score = score,
 			.hash = file_hash
 		};
 		struct para_buffer pb = {.buf = NULL};
@@ -735,7 +726,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 		if (ret < 0)
 			goto err;
 		strncpy(afd->afs_status_info, pb.buf, AFS_STATUS_INFO_SIZE);
-		afd->afs_status_info[AFS_STATUS_INFO_SIZE] = '\0';
+		afd->afs_status_info[AFS_STATUS_INFO_SIZE - 1] = '\0';
 		free(pb.buf);
 	}
 	aced.aft_row = aft_row;
@@ -795,15 +786,21 @@ static short unsigned get_duration_width(int seconds)
 	return width + 6;
 }
 
-static void get_duration_buf(int seconds, char *buf, short unsigned max_width)
+static void get_duration_buf(int seconds, char *buf, struct ls_options *opts)
 {
 	unsigned hours = seconds / 3600, mins = (seconds % 3600) / 60;
+	short unsigned max_width;
 
-	if (!hours) /* m:ss or mm:ss */
+	if (!hours) { /* m:ss or mm:ss */
+		max_width = opts->mode == LS_MODE_LONG?
+			opts->widths.duration_width : 4;
 		sprintf(buf, "%*u:%02u", max_width - 3, mins, seconds % 60);
-	else /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
+	} else { /* more than one hour => h:mm:ss, hh:mm:ss, hhh:mm:ss, ... */
+		max_width = opts->mode == LS_MODE_LONG?
+			opts->widths.duration_width : 7;
 		sprintf(buf, "%*u:%02u:%02u", max_width - 6, hours, mins,
 			seconds % 60);
+	}
 }
 
 static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
@@ -813,29 +810,44 @@ static char *make_attribute_lines(const char *att_bitmap, struct afs_info *afsi)
 	get_attribute_text(&afsi->attributes, " ", &att_text);
 	if (!att_text)
 		return para_strdup(att_bitmap);
-	att_lines = make_message("%s\nattributes_txt: %s",
+	att_lines = make_message("attributes: %s\nattributes_txt: %s",
 		att_bitmap, att_text);
 	free(att_text);
 	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\nlyrics_name: %s\n",
+		afsi->lyrics_id, lyrics_name? lyrics_name : "(none)");
 }
 
-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\nimage_name: %s\n",
+		afsi->image_id, image_name? image_name : "(none)");
+}
+
+static char *make_filename_lines(const char *path, unsigned flags)
+{
+	char *basename, *dirname;
+	char *ret;
+
+	if (!(flags & LS_FLAG_FULL_PATH))
+		return make_message("%s: %s\n%s:\n", "basename", path,
+			"dir");
+	basename = para_basename(path),
+	dirname = para_dirname(path);
+	ret = make_message("%s: %s\n%s: %s\n%s: %s\n", "path", path,
+		"dir", dirname, "basename", basename);
+	free(basename);
+	free(dirname);
+	return ret;
 }
 
 static int print_list_item(struct ls_data *d, struct ls_options *opts,
@@ -851,7 +863,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, *filename_lines;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -862,7 +874,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		sizeof(last_played_time), current_time, opts->mode);
 	if (ret < 0)
 		return ret;
-	get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width);
+	get_duration_buf(afhi->seconds_total, duration_buf, opts);
 	if (have_score) {
 		if (opts->mode == LS_MODE_LONG)
 			sprintf(score_buf, "%*li ", w->score_width, d->score);
@@ -901,37 +913,39 @@ 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);
+	filename_lines = make_filename_lines(d->path, opts->flags);
 	if (opts->mode == LS_MODE_VERBOSE) {
 		para_printf(b,
-			"%s: %s\n" /* path */
+			"%s" /* filename stuff */
 			"%s%s%s" /* score */
-			"attributes: %s\n"
+			"%s\n" /* attributes */
 			"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"
 			"channels: %d\n"
 			"duration: %s\n"
+			"seconds_total: %lu\n"
 			"num_played: %d\n"
 			"last_played: %s\n"
 			"tag info: %s\n",
-			(opts->flags & LS_FLAG_FULL_PATH)?
-				"path" : "file", d->path,
+			filename_lines,
 			have_score? "score: " : "", score_buf,
 				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,
 			afhi->channels,
 			duration_buf,
+			afhi->seconds_total,
 			afsi->num_played,
 			last_played_time,
 			afhi->info_string
@@ -946,7 +960,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"
@@ -962,8 +976,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,
@@ -978,8 +992,9 @@ 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);
+	free(filename_lines);
 	return 1;
 }