X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;ds=sidebyside;f=aft.c;h=23b36a88e51e3469f3b4fd00770a5d4e1881872e;hb=343a65bc48b4e0cda4d9a14afcd7e96cca9c5de9;hp=f425b6d3d81431b61fe0541742905c4af6b1af96;hpb=e9cb243a24785f2142e19a9ba0dc75232eb39baf;p=paraslash.git

diff --git a/aft.c b/aft.c
index f425b6d3..23b36a88 100644
--- a/aft.c
+++ b/aft.c
@@ -352,23 +352,29 @@ enum afhi_offsets {
 	CHUNK_TV_TV_USEC_OFFSET = 36,
 	/** Number of channels is stored here. (1 byte) */
 	AFHI_CHANNELS_OFFSET = 40,
-	/** EOF timeout in ms. (2 byte) */
-	AFHI_EOF_OFFSET = 41,
 	/** The tag info position. */
-	AFHI_INFO_STRING_OFFSET = 43,
+	AFHI_INFO_STRING_OFFSET = 41,
 	/** Minimal on-disk size of a valid afhi struct. */
-	MIN_AFHI_SIZE = 44
+	MIN_AFHI_SIZE = 47, /* at least 6 null bytes for techinfo/tags */
 };
 
 static unsigned sizeof_afhi_buf(const struct afh_info *afhi)
 {
 	if (!afhi)
 		return 0;
-	return strlen(afhi->info_string) + MIN_AFHI_SIZE;
+	return MIN_AFHI_SIZE
+		+ strlen(afhi->techinfo)
+		+ strlen(afhi->tags.artist)
+		+ strlen(afhi->tags.title)
+		+ strlen(afhi->tags.year)
+		+ strlen(afhi->tags.album)
+		+ strlen(afhi->tags.comment);
 }
 
 static void save_afhi(struct afh_info *afhi, char *buf)
 {
+	char *p;
+
 	if (!afhi)
 		return;
 	write_u32(buf + AFHI_SECONDS_TOTAL_OFFSET, afhi->seconds_total);
@@ -382,8 +388,14 @@ static void save_afhi(struct afh_info *afhi, char *buf)
 	write_u32(buf + HEADER_OFFSET_OFFSET, afhi->header_offset);
 	write_u32(buf + CHUNK_TV_TV_SEC_OFFSET, afhi->chunk_tv.tv_sec);
 	write_u32(buf + CHUNK_TV_TV_USEC_OFFSET, afhi->chunk_tv.tv_usec);
-	write_u16(buf + AFHI_EOF_OFFSET, tv2ms(&afhi->eof_tv));
-	strcpy(buf + AFHI_INFO_STRING_OFFSET, afhi->info_string); /* OK */
+	p = buf + AFHI_INFO_STRING_OFFSET;
+	/* The sprintf's below are OK as our caller made sure that buf is large enough */
+	p += sprintf(p, "%s", afhi->techinfo) + 1;
+	p += sprintf(p, "%s", afhi->tags.artist) + 1;
+	p += sprintf(p, "%s", afhi->tags.title) + 1;
+	p += sprintf(p, "%s", afhi->tags.year) + 1;
+	p += sprintf(p, "%s", afhi->tags.album) + 1;
+	sprintf(p, "%s", afhi->tags.comment);
 }
 
 static void load_afhi(const char *buf, struct afh_info *afhi)
@@ -399,8 +411,12 @@ static void load_afhi(const char *buf, struct afh_info *afhi)
 	afhi->header_offset = read_u32(buf + HEADER_OFFSET_OFFSET);
 	afhi->chunk_tv.tv_sec = read_u32(buf + CHUNK_TV_TV_SEC_OFFSET);
 	afhi->chunk_tv.tv_usec = read_u32(buf + CHUNK_TV_TV_USEC_OFFSET);
-	ms2tv(read_u16(buf + AFHI_EOF_OFFSET), &afhi->eof_tv);
-	afhi->info_string = para_strdup(buf + AFHI_INFO_STRING_OFFSET);
+	afhi->techinfo = buf + AFHI_INFO_STRING_OFFSET;
+	afhi->tags.artist = afhi->techinfo + strlen(afhi->techinfo) + 1;
+	afhi->tags.title = afhi->tags.artist + strlen(afhi->tags.artist) + 1;
+	afhi->tags.year = afhi->tags.title + strlen(afhi->tags.title) + 1;
+	afhi->tags.album = afhi->tags.year + strlen(afhi->tags.year) + 1;
+	afhi->tags.comment = afhi->tags.album + strlen(afhi->tags.album) + 1;
 }
 
 static unsigned sizeof_chunk_table(struct afh_info *afhi)
@@ -446,7 +462,7 @@ int aft_get_row_of_path(const char *path, struct osl_row **row)
  * Get the row of the audio file table corresponding to the given hash value.
  *
  * \param hash The hash value of the desired audio file.
- * \param row resul pointer.
+ * \param row Result pointer.
  *
  * \return Standard.
  */
@@ -891,10 +907,15 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		"%s: %lu\n" /* seconds total */
 		"%s: %s\n" /* last played time */
 		"%s: %d\n" /* num_played */
-		"%s: %u\n" /* ampplification */
-		"%s" /* tag info */
+		"%s: %u\n" /* amplification */
 		"%s: %lu\n" /* chunk time */
-		"%s: %lu\n", /* num chunks */
+		"%s: %lu\n" /* num chunks */
+		"%s: %s\n" /* techinfo */
+		"%s: %s\n" /* artist */
+		"%s: %s\n" /* title */
+		"%s: %s\n" /* year */
+		"%s: %s\n" /* album */
+		"%s: %s\n", /* comment */
 		filename_lines,
 		have_score? status_item_list[SI_SCORE] : "",
 			have_score? ": " : "",
@@ -913,9 +934,14 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		status_item_list[SI_LAST_PLAYED], last_played_time,
 		status_item_list[SI_NUM_PLAYED], afsi->num_played,
 		status_item_list[SI_AMPLIFICATION], afsi->amp,
-		afhi->info_string,
 		status_item_list[SI_CHUNK_TIME], tv2ms(&afhi->chunk_tv),
-		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total
+		status_item_list[SI_NUM_CHUNKS], afhi->chunks_total,
+		status_item_list[SI_TECHINFO], afhi->techinfo,
+		status_item_list[SI_ARTIST], afhi->tags.artist,
+		status_item_list[SI_TITLE], afhi->tags.title,
+		status_item_list[SI_YEAR], afhi->tags.year,
+		status_item_list[SI_ALBUM], afhi->tags.album,
+		status_item_list[SI_COMMENT], afhi->tags.comment
 	);
 	if (ret < 0)
 		goto out;
@@ -933,7 +959,6 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	free(image_lines);
 	free(filename_lines);
 out:
-	free(afhi->info_string);
 	return ret;
 }
 
@@ -966,9 +991,12 @@ void make_empty_status_items(char *buf)
 		"%s: \n" /* seconds total */
 		"%s: \n" /* num played */
 		"%s: \n" /* last played */
-		"%s: \n" /* audio file info */
-		"%s: \n" /* taginfo1 */
-		"%s: \n" /* taginfo2 */
+		"%s: \n" /* techinfo */
+		"%s: \n" /* artist */
+		"%s: \n" /* title */
+		"%s: \n" /* year */
+		"%s: \n" /* album */
+		"%s: \n" /* comment */
 		"%s: \n" /* amplification */
 		,
 		status_item_list[SI_PATH],
@@ -990,67 +1018,16 @@ void make_empty_status_items(char *buf)
 		status_item_list[SI_SECONDS_TOTAL],
 		status_item_list[SI_NUM_PLAYED],
 		status_item_list[SI_LAST_PLAYED],
-		status_item_list[SI_AUDIO_FILE_INFO],
-		status_item_list[SI_TAGINFO1],
-		status_item_list[SI_TAGINFO2],
+		status_item_list[SI_TECHINFO],
+		status_item_list[SI_ARTIST],
+		status_item_list[SI_TITLE],
+		status_item_list[SI_YEAR],
+		status_item_list[SI_ALBUM],
+		status_item_list[SI_COMMENT],
 		status_item_list[SI_AMPLIFICATION]
 	);
 }
 
-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)
@@ -1070,15 +1047,8 @@ static int make_status_items(struct audio_file_data *afd,
 	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);
-	ret = print_list_item(&d, &opts, &pb, current_time); /* frees info string */
-	afd->afhi.info_string = NULL;
+	ret = print_list_item(&d, &opts, &pb, current_time);
 	if (ret < 0)
 		goto out;
 	strncpy(afd->verbose_ls_output, pb.buf, VERBOSE_LS_OUTPUT_SIZE);
@@ -1157,7 +1127,6 @@ int open_and_update_audio_file(struct osl_row *aft_row, long score,
 	ret = save_afd(afd);
 err:
 	free(afd->afhi.chunk_table);
-	free(afd->afhi.info_string);
 	osl_close_disk_object(&chunk_table_obj);
 	return ret;
 }
@@ -1360,7 +1329,6 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	}
 	return 1;
 err:
-	free(d->afhi.info_string);
 	return ret;
 }
 
@@ -1924,7 +1892,12 @@ out_free:
 	free(obj.data);
 	if (afhi_ptr) {
 		free(afhi_ptr->chunk_table);
-		free(afhi_ptr->info_string);
+		free(afhi_ptr->techinfo);
+		free(afhi_ptr->tags.artist);
+		free(afhi_ptr->tags.title);
+		free(afhi_ptr->tags.year);
+		free(afhi_ptr->tags.album);
+		free(afhi_ptr->tags.comment);
 	}
 	/* Stop adding files only on send errors. */
 	return send_ret;