X-Git-Url: http://git.tuebingen.mpg.de/?a=blobdiff_plain;f=aft.c;h=cbea5eb1593a1ed8f0fdaa02de634a9e1f0e92e9;hb=fbfc694f85103a86c18469c6fdd2f4f03c812337;hp=c5effc66e68cce996dc99260b7f8da843a985532;hpb=07010f70da6ea0ba9940116eef83abeb02fa8d5d;p=paraslash.git

diff --git a/aft.c b/aft.c
index c5effc66..cbea5eb1 100644
--- a/aft.c
+++ b/aft.c
@@ -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,14 @@ 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)) {
+		if (pad->flags & ADD_FLAG_VERBOSE)
+			ret = send_va_buffer(pad->fd, "%s: %s\n",
+				PARA_STRERROR(-ret), path);
+		ret = 1;
+		goto out_free;
+	}
 	query.data = path;
 	query.size = strlen(path) + 1;
 	ret = send_callback_request(path_brother_callback, &query, &result);
@@ -1570,8 +1623,11 @@ static int add_one_audio_file(const char *arg, const void *private_data)
 		format_num = ret;
 		afhi_ptr = &afhi;
 	}
-	if (pad->flags & ADD_FLAG_VERBOSE)
-		send_va_buffer(pad->fd, "adding %s\n", path);
+	if (pad->flags & ADD_FLAG_VERBOSE) {
+		ret = send_va_buffer(pad->fd, "adding %s\n", path);
+		if (ret < 0)
+			goto out_unmap;
+	}
 	munmap(map.data, map.size);
 	save_audio_file_info(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
@@ -1581,14 +1637,15 @@ static int add_one_audio_file(const char *arg, const void *private_data)
 out_unmap:
 	munmap(map.data, map.size);
 out_free:
-	if (ret < 0)
+	if (ret < 0 && ret != -E_SEND)
 		send_va_buffer(pad->fd, "failed to add %s (%s)\n", path?
 			path : arg, PARA_STRERROR(-ret));
 	free(obj.data);
 	free(path);
 	if (afhi_ptr)
 		free(afhi_ptr->chunk_table);
-	return 1; /* it's not an error if not all files could be added */
+	/* it's not an error if not all files could be added */
+	return ret == -E_SEND? ret : 1;
 }
 
 int com_add(int fd, int argc, char * const * const argv)
@@ -1605,6 +1662,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;
@@ -1629,12 +1690,18 @@ int com_add(int fd, int argc, char * const * const argv)
 		if (ret < 0)
 			PARA_NOTICE_LOG("failed to stat %s (%s)", path,
 				strerror(errno));
-		else
+		else {
 			if (S_ISDIR(statbuf.st_mode))
-				for_each_file_in_dir(path, add_one_audio_file,
+				ret = for_each_file_in_dir(path, add_one_audio_file,
 					&pad);
 			else
-				add_one_audio_file(path, &pad);
+				ret = add_one_audio_file(path, &pad);
+			if (ret < 0) {
+				send_va_buffer(fd, "%s: %s\n", path, PARA_STRERROR(-ret));
+				free(path);
+				return ret;
+			}
+		}
 		free(path);
 	}
 	ret = 1;