X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=9e4fec288d63e84c8c05139f727516a1a5ca4f43;hp=ec05846f870255a939a760fc15352a217b035010;hb=b58faecc81c50be4723e973dcf9a65140d30e037;hpb=5abf556a8fa8d974bf908672470f7bf09742309a

diff --git a/aft.c b/aft.c
index ec05846f..9e4fec28 100644
--- a/aft.c
+++ b/aft.c
@@ -16,38 +16,96 @@
 #include "string.h"
 #include "vss.h"
 
-#define AFS_AUDIO_FILE_DIR "/home/mp3"
+#define AFS_AUDIO_FILE_DIR "/home/mp3" /* FIXME: Use cwd instead */
 
 static struct osl_table *audio_file_table;
 
+/** The different sorting methods of the ls command. */
+enum ls_sorting_method {
+	/** -sp (default) */
+	LS_SORT_BY_PATH,
+	/** -ss */
+	LS_SORT_BY_SCORE,
+	/** -sl */
+	LS_SORT_BY_LAST_PLAYED,
+	/** -sn */
+	LS_SORT_BY_NUM_PLAYED,
+	/** -sf */
+	LS_SORT_BY_FREQUENCY,
+	/** -sc */
+	LS_SORT_BY_CHANNELS,
+	/** -si */
+	LS_SORT_BY_IMAGE_ID,
+	/** -sy */
+	LS_SORT_BY_LYRICS_ID,
+	/** -sb */
+	LS_SORT_BY_BITRATE,
+	/** -sd */
+	LS_SORT_BY_DURATION,
+	/** -sa */
+	LS_SORT_BY_AUDIO_FORMAT,
+	/** -sh */
+	LS_SORT_BY_HASH,
+};
+
+/** The different listing modes of the ls command. */
 enum ls_listing_mode {
+	/** Default listing mode. */
 	LS_MODE_SHORT,
+	/** -l or -ll */
 	LS_MODE_LONG,
+	/** -lv */
 	LS_MODE_VERBOSE,
+	/** -lm */
 	LS_MODE_MBOX
 };
 
+/** The flags accepted by the ls command. */
 enum ls_flags {
+	/** -p */
 	LS_FLAG_FULL_PATH = 1,
+	/** -a */
 	LS_FLAG_ADMISSIBLE_ONLY = 2,
+	/** -r */
 	LS_FLAG_REVERSE = 4,
 };
 
+/**
+ * The size of the individual output fields of the ls command.
+ *
+ * These depend on the actual content being listed. If, for instance only files
+ * with duration less than an hour are being listed, then the duration with is
+ * made smaller because then the duration is listed as mm:ss rather than
+ * hh:mm:ss.
+ */
 struct ls_widths {
+	/** size of the score field. */
 	unsigned short score_width;
+	/** size of the image id field. */
 	unsigned short image_id_width;
+	/** size of the lyrics id field. */
 	unsigned short lyrics_id_width;
+	/** size of the bitrate field. */
 	unsigned short bitrate_width;
+	/** size of the frequency field. */
 	unsigned short frequency_width;
+	/** size of the duration field. */
 	unsigned short duration_width;
+	/** size of the num played field. */
 	unsigned short num_played_width;
 };
 
+/** Data passed to the different compare functions (called by qsort()). */
 struct ls_data {
+	/** Usual audio format handler information. */
 	struct audio_format_info afhi;
+	/** Audio file selector information. */
 	struct afs_info afsi;
+	/** The full path of the audio file. */
 	char *path;
+	/** The score value (if -a was given). */
 	long score;
+	/** The sha1 hash of audio file. */
 	HASH_TYPE *hash;
 };
 
@@ -534,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,
@@ -689,6 +747,7 @@ static char *make_attribute_line(const char *att_bitmap, struct afs_info *afsi)
 static char *make_lyrics_line(struct afs_info *afsi)
 {
 	char *lyrics_name;
+
 	lyr_get_name_by_id(afsi->lyrics_id, &lyrics_name);
 	if (!lyrics_name)
 		return make_message("%u", afsi->lyrics_id);
@@ -958,7 +1017,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)
@@ -1583,60 +1642,99 @@ int com_add(int fd, int argc, char * const * const argv)
 
 }
 
+enum touch_flags {
+	TOUCH_FLAG_FNM_PATHNAME = 1,
+	TOUCH_FLAG_VERBOSE = 2
+};
+
 struct com_touch_options {
-	long num_played;
-	long last_played;
-	long lyrics_id;
-	long image_id;
+	int32_t num_played;
+	int64_t last_played;
+	int32_t lyrics_id;
+	int32_t image_id;
+	unsigned flags;
 };
 
-static int com_touch_callback(const struct osl_object *query,
-		__a_unused struct osl_object *result)
+struct touch_action_data {
+	struct com_touch_options *cto;
+	struct para_buffer pb;
+};
+
+static int touch_audio_file(__a_unused struct osl_table *table,
+		struct osl_row *row, const char *name, void *data)
 {
-	struct com_touch_options *cto = query->data;
-	char *p = (char *)query->data + sizeof(*cto);
-	size_t len;
-	int ret, no_options = cto->num_played < 0 && cto->last_played < 0 &&
-		cto->lyrics_id < 0 && cto->image_id < 0;
-
-	for (;p < (char *)query->data + query->size; p += len + 1) {
-		struct afs_info old_afsi, new_afsi;
-		struct osl_object obj;
-		struct osl_row *row;
+	struct touch_action_data *tad = data;
+	struct osl_object obj;
+	struct afs_info old_afsi, new_afsi;
+	int ret, no_options = tad->cto->num_played < 0 && tad->cto->last_played < 0 &&
+		tad->cto->lyrics_id < 0 && tad->cto->image_id < 0;
 
-		len = strlen(p);
-		ret = aft_get_row_of_path(p, &row);
-		if (ret < 0)
-			return ret;
-		ret = get_afsi_object_of_row(row, &obj);
-		if (ret < 0)
-			return ret;
-		ret = load_afsi(&old_afsi, &obj);
-		if (ret < 0)
-			return ret;
-		new_afsi = old_afsi;
-		if (no_options) {
-			new_afsi.num_played++;
-			new_afsi.last_played = time(NULL);
-		} else {
-			if (cto->lyrics_id >= 0)
-				new_afsi.lyrics_id = cto->lyrics_id;
-			if (cto->image_id >= 0)
-				new_afsi.image_id = cto->image_id;
-			if (cto->num_played >= 0)
-				new_afsi.num_played = cto->num_played;
-			if (cto->last_played >= 0)
-				new_afsi.last_played = cto->last_played;
-		}
-		save_afsi(&new_afsi, &obj); /* in-place update */
-		ret = mood_update_audio_file(row, &old_afsi);
-		if (ret < 0)
-			return ret;
+	ret = get_afsi_object_of_row(row, &obj);
+	if (ret < 0) {
+		para_printf(&tad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
 	}
+	ret = load_afsi(&old_afsi, &obj);
+	if (ret < 0) {
+		para_printf(&tad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+		return 1;
+	}
+	new_afsi = old_afsi;
+	if (no_options) {
+		new_afsi.num_played++;
+		new_afsi.last_played = time(NULL);
+		if (tad->cto->flags & TOUCH_FLAG_VERBOSE)
+			para_printf(&tad->pb, "%s: num_played = %u, "
+				"last_played = now()\n", name,
+				new_afsi.num_played);
+	} else {
+		if (tad->cto->flags & TOUCH_FLAG_VERBOSE)
+			para_printf(&tad->pb, "touching %s\n", name);
+		if (tad->cto->lyrics_id >= 0)
+			new_afsi.lyrics_id = tad->cto->lyrics_id;
+		if (tad->cto->image_id >= 0)
+			new_afsi.image_id = tad->cto->image_id;
+		if (tad->cto->num_played >= 0)
+			new_afsi.num_played = tad->cto->num_played;
+		if (tad->cto->last_played >= 0)
+			new_afsi.last_played = tad->cto->last_played;
+	}
+	save_afsi(&new_afsi, &obj); /* in-place update */
+	ret = mood_update_audio_file(row, &old_afsi);
+	if (ret < 0)
+		para_printf(&tad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
 	return 1;
 }
 
-int com_touch(__a_unused int fd, int argc, char * const * const argv)
+static int com_touch_callback(const struct osl_object *query,
+		struct osl_object *result)
+{
+	struct touch_action_data tad = {.cto = query->data};
+	int ret;
+	struct pattern_match_data pmd = {
+		.table = audio_file_table,
+		.loop_col_num = AFTCOL_HASH,
+		.match_col_num = AFTCOL_PATH,
+		.patterns = {.data = (char *)query->data + sizeof(*tad.cto),
+			.size = query->size - sizeof(*tad.cto)},
+		.data = &tad,
+		.action = touch_audio_file
+	};
+	if (tad.cto->flags & TOUCH_FLAG_FNM_PATHNAME)
+		pmd.fnmatch_flags |= FNM_PATHNAME;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&tad.pb, "%s\n", PARA_STRERROR(-ret));
+	if (tad.pb.buf) {
+		result->data = tad.pb.buf;
+		result->size = tad.pb.size;
+		return 1;
+	}
+	return ret < 0? ret : 0;
+}
+
+
+int com_touch(int fd, int argc, char * const * const argv)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -1644,7 +1742,8 @@ int com_touch(__a_unused int fd, int argc, char * const * const argv)
 		.lyrics_id = -1,
 		.image_id = -1
 	};
-	struct osl_object options = {.data = &cto, .size = sizeof(cto)};
+	struct osl_object query = {.data = &cto, .size = sizeof(cto)},
+		result;
 	int i, ret;
 
 
@@ -1657,78 +1756,121 @@ int com_touch(__a_unused int fd, int argc, char * const * const argv)
 			break;
 		}
 		if (!strncmp(arg, "-n", 2)) {
-			ret = para_atol(arg + 2, &cto.num_played);
+			ret = para_atoi32(arg + 2, &cto.num_played);
 			if (ret < 0)
-				goto err;
+				return ret;
 			continue;
 		}
 		if (!strncmp(arg, "-l", 2)) {
-			ret = para_atol(arg + 2, &cto.last_played);
+			ret = para_atoi64(arg + 2, &cto.last_played);
 			if (ret < 0)
-				goto err;
+				return ret;
 			continue;
 		}
 		if (!strncmp(arg, "-y", 2)) {
-			ret = para_atol(arg + 2, &cto.lyrics_id);
+			ret = para_atoi32(arg + 2, &cto.lyrics_id);
 			if (ret < 0)
-				goto err;
+				return ret;
 			continue;
 		}
 		if (!strncmp(arg, "-i", 2)) {
-			ret = para_atol(arg + 2, &cto.image_id);
+			ret = para_atoi32(arg + 2, &cto.image_id);
 			if (ret < 0)
-				goto err;
+				return ret;
+			continue;
+		}
+		if (!strcmp(arg, "-p")) {
+			cto.flags |= TOUCH_FLAG_FNM_PATHNAME;
+			continue;
+		}
+		if (!strcmp(arg, "-v")) {
+			cto.flags |= TOUCH_FLAG_VERBOSE;
 			continue;
 		}
+		break; /* non-option starting with dash */
 	}
-	ret = -E_AFT_SYNTAX;
 	if (i >= argc)
-		goto err;
-	return send_option_arg_callback_request(&options, argc - i,
-		argv + i, com_touch_callback, NULL);
-err:
+		return -E_AFT_SYNTAX;
+	ret = send_option_arg_callback_request(&query, argc - i,
+		argv + i, com_touch_callback, &result);
+	if (ret > 0) {
+		send_buffer(fd, (char *)result.data);
+		free(result.data);
+	} else
+		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
 	return ret;
 }
 
-struct com_rm_options {
+enum rm_flags {
+	RM_FLAG_VERBOSE = 1,
+	RM_FLAG_FORCE = 2,
+	RM_FLAG_FNM_PATHNAME = 4
+};
+
+struct com_rm_data {
 	uint32_t flags;
+	struct para_buffer pb;
+	unsigned num_removed;
 };
 
-static int com_rm_callback(const struct osl_object *query,
-		__a_unused struct osl_object *result)
+static int remove_audio_file(__a_unused struct osl_table *table,
+		struct osl_row *row, const char *name, void *data)
 {
-	struct com_rm_options *cro = query->data;
-	char *p = (char *)query->data + sizeof(*cro);
-	size_t len;
+	struct com_rm_data *crd = data;
 	int ret;
 
-	for (;p < (char *)query->data + query->size; p += len + 1) {
-		struct osl_row *row;
-
-		len = strlen(p);
-		ret = aft_get_row_of_path(p, &row);
-		if (ret < 0)
-			return ret;
-		ret = mood_delete_audio_file(row);
-		if (ret < 0)
-			return ret;
-		ret = osl_del_row(audio_file_table, row);
-		if (ret < 0)
-			return ret;
-	}
+	if (crd->flags & RM_FLAG_VERBOSE)
+		para_printf(&crd->pb, "removing %s\n", name);
+	ret = mood_delete_audio_file(row);
+	if (ret < 0)
+		para_printf(&crd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+	ret = osl_del_row(audio_file_table, row);
+	if (ret < 0)
+		para_printf(&crd->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
+	else
+		crd->num_removed++;
 	return 1;
 }
 
-/*
- * TODO options: -v verbose, -f dont stop if file not found
- * -h remove by hash, use fnmatch
- *
- * */
+static int com_rm_callback(const struct osl_object *query,
+		__a_unused struct osl_object *result)
+{
+	struct com_rm_data crd = {.flags = *(uint32_t *)query->data};
+	int ret;
+	struct pattern_match_data pmd = {
+		.table = audio_file_table,
+		.loop_col_num = AFTCOL_HASH,
+		.match_col_num = AFTCOL_PATH,
+		.patterns = {.data = (char *)query->data + sizeof(uint32_t),
+			.size = query->size - sizeof(uint32_t)},
+		.data = &crd,
+		.action = remove_audio_file
+	};
+	if (crd.flags & RM_FLAG_FNM_PATHNAME)
+		pmd.fnmatch_flags |= FNM_PATHNAME;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		para_printf(&crd.pb, "%s\n", PARA_STRERROR(-ret));
+	if (!crd.num_removed && !(crd.flags & RM_FLAG_FORCE))
+		para_printf(&crd.pb, "no matches -- nothing removed\n");
+	else {
+		if (crd.flags & RM_FLAG_VERBOSE)
+			para_printf(&crd.pb, "removed %u files\n", crd.num_removed);
+	}
+	if (crd.pb.buf) {
+		result->data = crd.pb.buf;
+		result->size = crd.pb.size;
+		return 1;
+	}
+	return ret < 0? ret : 0;
+}
 
-int com_afs_rm(__a_unused int fd, int argc,  char * const * const argv)
+/* TODO options: -r (recursive) */
+int com_afs_rm(int fd, int argc,  char * const * const argv)
 {
-	struct com_rm_options cro = {.flags = 0};
-	struct osl_object options = {.data = &cro, .size = sizeof(cro)};
+	uint32_t flags = 0;
+	struct osl_object query = {.data = &flags, .size = sizeof(flags)},
+		result;
 	int i, ret;
 
 	for (i = 1; i < argc; i++) {
@@ -1739,13 +1881,29 @@ int com_afs_rm(__a_unused int fd, int argc,  char * const * const argv)
 			i++;
 			break;
 		}
+		if (!strcmp(arg, "-f")) {
+			flags |= RM_FLAG_FORCE;
+			continue;
+		}
+		if (!strcmp(arg, "-p")) {
+			flags |= RM_FLAG_FNM_PATHNAME;
+			continue;
+		}
+		if (!strcmp(arg, "-v")) {
+			flags |= RM_FLAG_VERBOSE;
+			continue;
+		}
+		break;
 	}
-	ret = -E_AFT_SYNTAX;
 	if (i >= argc)
-		goto err;
-	return send_option_arg_callback_request(&options, argc - i,
-		argv + i, com_rm_callback, NULL);
-err:
+		return -E_AFT_SYNTAX;
+	ret = send_option_arg_callback_request(&query, argc - i, argv + i,
+		com_rm_callback, &result);
+	if (ret > 0) {
+		send_buffer(fd, (char *)result.data);
+		free(result.data);
+	} else
+		send_va_buffer(fd, "%s\n", PARA_STRERROR(-ret));
 	return ret;
 }
 
@@ -1826,10 +1984,9 @@ int aft_init(struct table_info *ti, const char *db)
 
 	audio_file_table_desc.dir = db;
 	ti->desc = &audio_file_table_desc;
-	ret = osl_open_table(ti->desc, &ti->table);
+	ret = osl_open_table(ti->desc, &audio_file_table);
 	if (ret >= 0) {
 		unsigned num;
-		audio_file_table = ti->table;
 		osl_get_num_rows(audio_file_table, &num);
 		PARA_INFO_LOG("audio file table contains %d files\n", num);
 		return ret;