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

diff --git a/aft.c b/aft.c
index 93c96cb4..e45938d3 100644
--- a/aft.c
+++ b/aft.c
@@ -96,20 +96,6 @@ struct ls_widths {
 	unsigned short num_played_width;
 };
 
-/** Data passed to the different compare functions (called by qsort()). */
-struct ls_data {
-	/** Usual audio format handler information. */
-	struct afh_info afhi;
-	/** Audio file selector information. */
-	struct afs_info afsi;
-	/** The full path of the audio file. */
-	char *path;
-	/** The score value (if -a was given). */
-	long score;
-	/** The sha1 hash of audio file. */
-	HASH_TYPE *hash;
-};
-
 /** Data passed from the ls command handler to its callback function. */
 struct ls_options {
 	/** The given command line flags. */
@@ -736,6 +722,22 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	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,
+			.hash = file_hash
+		};
+		struct para_buffer pb = {.buf = NULL};
+		ret = make_status_items(&d, &pb);
+		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';
+		free(pb.buf);
+	}
 	aced.aft_row = aft_row;
 	aced.old_afsi = &afd->afsi;
 	afs_event(AFSI_CHANGE, NULL, &aced);
@@ -901,7 +903,6 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	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 */
@@ -982,6 +983,19 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	return 1;
 }
 
+int make_status_items(struct ls_data *d, struct para_buffer *pb)
+{
+	struct ls_options opts = {
+		.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
+		.mode = LS_MODE_VERBOSE,
+	};
+	time_t current_time;
+
+	time(&current_time);
+	return print_list_item(d, &opts, pb, current_time);
+}
+
+
 static int ls_audio_format_compare(const void *a, const void *b)
 {
 	struct ls_data *d1 = *(struct ls_data **)a, *d2 = *(struct ls_data **)b;
@@ -1702,7 +1716,7 @@ static int add_one_audio_file(const char *path, const void *private_data)
 	save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
 	ret = send_callback_request(com_add_callback, &obj, &result);
-	if (ret >= 0 && result.data && result.size) {
+	if (ret > 0) {
 		ret2 = send_va_buffer(pad->fd, "%s", (char *)result.data);
 		free(result.data);
 		if (ret >= 0 && ret2 < 0)