X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=99b132dd9d249a9991805068161fc1faf729ada5;hb=55030e0d1a28ded2076d62fb9aac3539ff337275;hp=bcceb4b0b7911707f88644c6f505189db2189934;hpb=1a4b98e797ab5ebb1ee1daa707aa0d520379ccc9;p=paraslash.git

diff --git a/aft.c b/aft.c
index bcceb4b0..99b132dd 100644
--- a/aft.c
+++ b/aft.c
@@ -592,7 +592,7 @@ static int get_hash_of_row(const struct osl_row *row, HASH_TYPE **hash)
  *
  * \sa get_chunk_table_of_row().
  */
-static int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
+int get_afhi_of_row(const struct osl_row *row, struct audio_format_info *afhi)
 {
 	struct osl_object obj;
 	int ret = osl_get_object(audio_file_table, row, AFTCOL_AFHI,
@@ -683,12 +683,17 @@ err:
 }
 
 static int get_local_time(uint64_t *seconds, char *buf, size_t size,
-	time_t current_time)
+	time_t current_time, enum ls_listing_mode lm)
 {
 	struct tm t;
 
 	if (!localtime_r((time_t *)seconds, &t))
 		return -E_LOCALTIME;
+	if (lm == LS_MODE_MBOX) {
+		if (!strftime(buf, size, "%c", &t))
+			return -E_STRFTIME;
+		return 1;
+	}
 	if (*seconds + 6 * 30 * 24 * 3600 > current_time) {
 		if (!strftime(buf, size, "%b %e %k:%M", &t))
 			return -E_STRFTIME;
@@ -775,6 +780,8 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	struct audio_format_info *afhi = &d->afhi;
 	struct ls_widths *w = &opts->widths;
 	int have_score = opts->flags & LS_FLAG_ADMISSIBLE_ONLY;
+	char asc_hash[2 * HASH_SIZE + 1];
+	char *att_line, *lyrics_line, *image_line;
 
 	if (opts->mode == LS_MODE_SHORT) {
 		para_printf(b, "%s\n", d->path);
@@ -782,7 +789,7 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 	}
 	get_attribute_bitmap(&afsi->attributes, att_buf);
 	ret = get_local_time(&afsi->last_played, last_played_time,
-		sizeof(last_played_time), current_time);
+		sizeof(last_played_time), current_time, opts->mode);
 	if (ret < 0)
 		return ret;
 	get_duration_buf(afhi->seconds_total, duration_buf, w->duration_width);
@@ -823,14 +830,12 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 		);
 		return 1;
 	}
+	hash_to_asc(d->hash, asc_hash);
+	att_line = make_attribute_line(att_buf, afsi);
+	lyrics_line = make_lyrics_line(afsi);
+	image_line = make_image_line(afsi);
 	if (opts->mode == LS_MODE_VERBOSE) {
-		char asc_hash[2 * HASH_SIZE + 1];
-		char *att_line, *lyrics_line, *image_line;
 
-		hash_to_asc(d->hash, asc_hash);
-		att_line = make_attribute_line(att_buf, afsi);
-		lyrics_line = make_lyrics_line(afsi);
-		image_line = make_image_line(afsi);
 		para_printf(b,
 			"%s: %s\n" /* path */
 			"%s%s%s" /* score */
@@ -863,11 +868,50 @@ static int print_list_item(struct ls_data *d, struct ls_options *opts,
 			last_played_time,
 			afhi->info_string
 		);
-		free(att_line);
-		free(lyrics_line);
-		free(image_line);
-		return 1;
+	} else { /* mbox mode */
+		struct osl_object lyrics_def;
+		lyr_get_def_by_id(afsi->lyrics_id, &lyrics_def);
+		para_printf(b,
+			"From foo@localhost %s\n"
+			"Received: from\nTo: bar\nFrom: a\n"
+			"Subject: %s\n\n" /* path */
+			"%s%s%s" /* score */
+			"attributes: %s\n"
+			"hash: %s\n"
+			"image_id: %s\n"
+			"lyrics_id: %s\n"
+			"bitrate: %dkbit/s\n"
+			"format: %s\n"
+			"frequency: %dHz\n"
+			"channels: %d\n"
+			"duration: %s\n"
+			"num_played: %d\n"
+			"tag info: %s\n"
+			"%s%s\n",
+			last_played_time,
+			d->path,
+			have_score? "score: " : "", score_buf,
+				have_score? "\n" : "",
+			att_line,
+			asc_hash,
+			image_line,
+			lyrics_line,
+			afhi->bitrate,
+			audio_format_name(afsi->audio_format_id),
+			afhi->frequency,
+			afhi->channels,
+			duration_buf,
+			afsi->num_played,
+			afhi->info_string,
+			lyrics_def.data? "Lyrics:\n~~~~~~~\n" : "",
+			lyrics_def.data? (char *)lyrics_def.data : ""
+		);
+		if (lyrics_def.data)
+			osl_close_disk_object(lyrics_def.data);
 	}
+	free(att_line);
+	free(lyrics_line);
+	free(image_line);
 	return 1;
 }
 
@@ -1017,7 +1061,7 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 	}
 	if (options->num_patterns) {
 		for (i = 0; i < options->num_patterns; i++) {
-			ret = fnmatch(options->patterns[i], path, FNM_PATHNAME);
+			ret = fnmatch(options->patterns[i], path, 0);
 			if (!ret)
 				break;
 			if (ret == FNM_NOMATCH)
@@ -1357,6 +1401,7 @@ afhi <=> force or no HS
 #define ADD_FLAG_LAZY 1
 #define ADD_FLAG_FORCE 2
 #define ADD_FLAG_VERBOSE 4
+#define ADD_FLAG_ALL 8
 
 /* TODO: change log messages so that they get written to the result buffer */
 
@@ -1520,6 +1565,9 @@ static int add_one_audio_file(const char *arg, const void *private_data)
 	ret = verify_path(arg, &path);
 	if (ret < 0)
 		goto out_free;
+	ret = guess_audio_format(path);
+	if (ret < 0 && !(pad->flags & ADD_FLAG_ALL))
+		goto out_free;
 	query.data = path;
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query, &result);
@@ -1605,6 +1653,10 @@ int com_add(int fd, int argc, char * const * const argv)
 			i++;
 			break;
 		}
+		if (!strcmp(arg, "-a")) {
+			pad.flags |= ADD_FLAG_ALL;
+			continue;
+		}
 		if (!strcmp(arg, "-l")) {
 			pad.flags |= ADD_FLAG_LAZY;
 			continue;