X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=20fa3a96a4ccf1139d6d369ae8ff5764103e7822;hp=6c7f66643f1077083ab8317365aed9b622d12907;hb=20ad4f0f93da79e2ec0a9699dff58b9922556438;hpb=75e7f758f8f2873f5c00430d5a6046b95d49cecd;ds=sidebyside

diff --git a/aft.c b/aft.c
index 6c7f6664..20fa3a96 100644
--- a/aft.c
+++ b/aft.c
@@ -74,6 +74,8 @@ enum ls_flags {
 	LS_FLAG_ADMISSIBLE_ONLY = 2,
 	/** -r */
 	LS_FLAG_REVERSE = 4,
+	/** -d */
+	LS_FLAG_UNIXDATE = 8,
 };
 
 /**
@@ -800,10 +802,15 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		goto out;
 	}
 	get_attribute_bitmap(&afsi->attributes, att_buf);
-	ret = get_local_time(&afsi->last_played, last_played_time,
-		sizeof(last_played_time), current_time, opts->mode);
-	if (ret < 0)
-		goto out;
+	if (opts->flags & LS_FLAG_UNIXDATE)
+		sprintf(last_played_time, "%llu",
+			(long long unsigned)afsi->last_played);
+	else {
+		ret = get_local_time(&afsi->last_played, last_played_time,
+			sizeof(last_played_time), current_time, opts->mode);
+		if (ret < 0)
+			goto out;
+	}
 	get_duration_buf(afhi->seconds_total, duration_buf, opts);
 	if (have_score) {
 		if (opts->mode == LS_MODE_LONG)
@@ -980,16 +987,95 @@ void make_empty_status_items(char *buf)
 	);
 }
 
-static int make_status_items(struct ls_data *d, struct para_buffer *pb)
+static void fixup_taginfo(char *begin, char *end)
+{
+	char *p = begin;
+
+	for (;;) {
+		p = strchr(p, '\n');
+		if (!p)
+			break;
+		if (p >= end - 1)
+			break;
+		*p = ' ';
+		p++;
+	}
+}
+
+/* crap, remove this ASAP. */
+static int fixup_info_string(char *info_string)
+{
+	char *t1, *t2, *end;
+
+	if (strncmp(info_string, "audio_file_info:", 16))
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	t1 = strstr(info_string, "\ntaginfo1:");
+	if (!t1)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+	t2 = strstr(info_string, "\ntaginfo2: ");
+	if (!t2)
+		return -ERRNO_TO_PARA_ERROR(EINVAL);
+
+	end = t2 + strlen(t2) + 1;
+	fixup_taginfo(info_string + 16, t1);
+	fixup_taginfo(t1 + 10, t2);
+	fixup_taginfo(t2 + 10, end);
+
+	if (t1 - info_string < 80 && t2 - t1 < 80 && end - t2 < 80)
+		return 0;
+	if (t1 - info_string >= 80) {
+		memmove(info_string + 80, t1, end - t1);
+		t1 = info_string + 80;
+		t2 -= t1 - info_string - 80;
+		end -= t1 - info_string - 80;
+	}
+	if (t2 - t1 >= 80) {
+		memmove(t1 + 80, t2, end - t2);
+		end -= t2 - t1 - 80;
+		t2 = t1 + 80;
+	}
+	if (end - t2 >= 80) {
+		t2[78] = '\n';
+		t2[79] = '\0';
+	}
+	return 1;
+}
+
+static int make_status_items(struct audio_file_data *afd,
+		struct afs_info *afsi, char *path, long score,
+		HASH_TYPE *hash)
 {
+	struct ls_data d = {
+		.afhi = afd->afhi,
+		.afsi = *afsi,
+		.path = path,
+		.score = score,
+		.hash = hash
+	};
 	struct ls_options opts = {
 		.flags = LS_FLAG_FULL_PATH | LS_FLAG_ADMISSIBLE_ONLY,
 		.mode = LS_MODE_VERBOSE,
 	};
+	struct para_buffer pb = {.max_size = VERBOSE_LS_OUTPUT_SIZE - 1};
 	time_t current_time;
+	int ret;
 
+	ret = fixup_info_string(afd->afhi.info_string);
+	if (ret < 0) {
+		PARA_WARNING_LOG("ignoring invalid tag info\n");
+		afd->afhi.info_string[0] = '\0';
+	} else if (ret)
+		PARA_NOTICE_LOG("truncated overlong tag info\n");
 	time(&current_time);
-	return print_list_item(d, &opts, pb, current_time);
+	ret = print_list_item(&d, &opts, &pb, current_time); /* frees info string */
+	afd->afhi.info_string = NULL;
+	if (ret < 0)
+		goto out;
+	strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
+	afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
+out:
+	free(pb.buf);
+	return ret;
 }
 
 /**
@@ -1052,23 +1138,9 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	save_afsi(&new_afsi, &afsi_obj); /* in-place update */
 
 	load_chunk_table(&afd->afhi, chunk_table_obj.data);
-	{
-		struct ls_data d = {
-			.afhi = afd->afhi, /* struct copy */
-			.afsi = old_afsi,
-			.path = path,
-			.score = score,
-			.hash = file_hash
-		};
-		struct para_buffer pb = {.max_size = VERBOSE_LS_OUTPUT_SIZE - 1};
-		ret = make_status_items(&d, &pb); /* frees info string */
-		afd->afhi.info_string = NULL;
-		if (ret < 0)
-			goto err;
-		strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
-		afd->verbose_ls_output[VERBOSE_LS_OUTPUT_SIZE - 1] = '\0';
-		free(pb.buf);
-	}
+	ret = make_status_items(afd, &old_afsi, path, score, file_hash);
+	if (ret < 0)
+		goto err;
 	aced.aft_row = aft_row;
 	aced.old_afsi = &old_afsi;
 	afs_event(AFSI_CHANGE, NULL, &aced);
@@ -1393,6 +1465,10 @@ int com_ls(int fd, int argc, char * const * const argv)
 			flags |= LS_FLAG_REVERSE;
 			continue;
 		}
+		if (!strcmp(arg, "-d")) {
+			flags |= LS_FLAG_UNIXDATE;
+			continue;
+		}
 		if (!strncmp(arg, "-s", 2)) {
 			if (!*(arg + 2) || *(arg + 3))
 				return -E_AFT_SYNTAX;