X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=6010d5def12175af7b3be545bd2d475aa7703b7b;hb=8ea7c22ed366c4c895f431aa663b9bb227b2bead;hp=62db6e7b42bf663af95df97e6764c5ee8891fffc;hpb=518a2727540cf5e105d28aa8fd31bb6afad05bf6;p=paraslash.git

diff --git a/aft.c b/aft.c
index 62db6e7b..6010d5de 100644
--- a/aft.c
+++ b/aft.c
@@ -351,9 +351,9 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->seconds_total = read_u32(buf + AFHI_SECONDS_TOTAL_OFFSET);
 	afhi->bitrate = read_u32(buf + AFHI_BITRATE_OFFSET);
 	afhi->frequency = read_u32(buf + AFHI_FREQUENCY_OFFSET);
-	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	afhi->header_offset = read_u32(buf + AFHI_HEADER_OFFSET_OFFSET);
 	afhi->header_len = read_u32(buf + AFHI_HEADER_LEN_OFFSET);
+	afhi->channels = read_u8(buf + AFHI_CHANNELS_OFFSET);
 	ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
 	strcpy(afhi->info_string, buf + AFHI_INFO_STRING_OFFSET);
 }
@@ -663,13 +663,14 @@ int load_afd(int shmid, struct audio_file_data *afd)
  * and the lastplayed time is set to the current time. Finally, the score of
  * the audio file is updated.
  *
- * \return Positive on success, negative on errors.
+ * \return Positive shmid 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;
-	struct afs_info new_afsi;
+	struct afs_info old_afsi, new_afsi;
 	int ret = get_hash_of_row(aft_row, &aft_hash);
 	struct afsi_change_event_data aced;
 	struct osl_object map, chunk_table_obj;
@@ -680,12 +681,10 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	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;
-	ret = load_afsi(&afd->afsi, &afsi_obj);
+	ret = load_afsi(&old_afsi, &afsi_obj);
 	if (ret < 0)
 		return ret;
 	ret = get_afhi_of_row(aft_row, &afd->afhi);
@@ -706,7 +705,7 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 		ret = -E_HASH_MISMATCH;
 		goto err;
 	}
-	new_afsi = afd->afsi;
+	new_afsi = old_afsi;
 	new_afsi.num_played++;
 	new_afsi.last_played = time(NULL);
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
@@ -717,21 +716,21 @@ int open_and_update_audio_file(struct osl_row *aft_row, struct audio_file_data *
 	{
 		struct ls_data d = {
 			.afhi = afd->afhi,
-			.afsi = afd->afsi,
+			.afsi = old_afsi,
 			.path = path,
-			.score = afd->score,
+			.score = 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 - 1] = '\0';
+		strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
+		afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
 		free(pb.buf);
 	}
 	aced.aft_row = aft_row;
-	aced.old_afsi = &afd->afsi;
+	aced.old_afsi = &old_afsi;
 	afs_event(AFSI_CHANGE, NULL, &aced);
 	ret = save_afd(afd);
 	if (ret < 0)
@@ -787,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)
@@ -805,8 +810,9 @@ 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_bitmap, att_text);
+	att_lines = make_message("%s: %s\n%s: %s",
+		status_item_list[SI_ATTRIBUTES_BITMAP], att_bitmap,
+		status_item_list[SI_ATTRIBUTES_TXT], att_text);
 	free(att_text);
 	return att_lines;
 }
@@ -828,6 +834,23 @@ static char *make_image_lines(struct afs_info *afsi)
 		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,
 	struct para_buffer *b, time_t current_time)
 {
@@ -841,7 +864,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_lines, *image_lines;
+	char *att_lines, *lyrics_lines, *image_lines, *filename_lines;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -852,7 +875,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);
@@ -893,35 +916,37 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	att_lines = make_attribute_lines(att_buf, 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"
 			"%s" /* image id, image name */
 			"%s" /* lyrics */
-			"bitrate: %dkbit/s\n"
+			"%s: %dkbit/s\n" /* bitrate */
 			"format: %s\n"
-			"frequency: %dHz\n"
+			"%s: %dHz\n" /* frequency */
 			"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,
+			"%s\n", /* tag info */
+			filename_lines,
 			have_score? "score: " : "", score_buf,
 				have_score? "\n" : "",
 			att_lines,
 			asc_hash,
 			image_lines,
 			lyrics_lines,
-			afhi->bitrate,
+			status_item_list[SI_BITRATE], afhi->bitrate,
 			audio_format_name(afsi->audio_format_id),
-			afhi->frequency,
+			status_item_list[SI_FREQUENCY], afhi->frequency,
 			afhi->channels,
 			duration_buf,
+			afhi->seconds_total,
 			afsi->num_played,
 			last_played_time,
 			afhi->info_string
@@ -944,7 +969,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			"channels: %d\n"
 			"duration: %s\n"
 			"num_played: %d\n"
-			"tag info: %s\n"
+			"%s\n" /* tag info */
 			"%s%s\n",
 			last_played_time,
 			d->path,
@@ -970,6 +995,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	free(att_lines);
 	free(lyrics_lines);
 	free(image_lines);
+	free(filename_lines);
 	return 1;
 }
 
@@ -1584,6 +1610,7 @@ static int com_add_callback(const struct osl_object *query,
 	objs[AFTCOL_AFSI].size = AFSI_SIZE;
 	save_afsi(&default_afsi, &objs[AFTCOL_AFSI]);
 	ret = osl_add_and_get_row(audio_file_table, objs, &aft_row);
+	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 out:
 	if (ret < 0)
 		para_printf(&msg, "%s\n", PARA_STRERROR(-ret));
@@ -1591,7 +1618,6 @@ out:
 		return 0;
 	result->data = msg.buf;
 	result->size = msg.size;
-	afs_event(AUDIO_FILE_ADD, &msg, aft_row);
 	return 1;
 }