X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=9e991da65d075c948ad704ed0ecdaead02c7ea45;hp=9d87c748b4456ad61b260446b56def0e5acbaf12;hb=869f0e06ec4e15abc9230c1b2d7615da5250802e;hpb=1cefe6a503c74d609db4e99e689d46575a5e40fd

diff --git a/aft.c b/aft.c
index 9d87c748..9e991da6 100644
--- a/aft.c
+++ b/aft.c
@@ -21,6 +21,7 @@
 #include "fd.h"
 #include "ipc.h"
 #include "portable_io.h"
+#include "command.h"
 
 static struct osl_table *audio_file_table;
 static char *status_items;
@@ -1275,8 +1276,10 @@ static int prepare_ls_row(struct osl_row *row, void *ls_opts)
 		ret = get_score_and_aft_row(row, &score, &aft_row);
 		if (ret < 0)
 			return ret;
-	} else
+	} else {
 		aft_row = row;
+		score = 0;
+	}
 	ret = get_audio_file_path_of_row(aft_row, &path);
 	if (ret < 0)
 		return ret;
@@ -1402,7 +1405,7 @@ out:
 /*
  * TODO: flags -h (sort by hash)
  */
-int com_ls(struct stream_cipher_context *scc, int argc, char * const * const argv)
+int com_ls(struct command_context *cc)
 {
 	int i, ret;
 	unsigned flags = 0;
@@ -1411,8 +1414,8 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg
 	struct ls_options opts = {.patterns = NULL};
 	struct osl_object query = {.data = &opts, .size = sizeof(opts)};
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -1512,9 +1515,9 @@ int com_ls(struct stream_cipher_context *scc, int argc, char * const * const arg
 	opts.flags = flags;
 	opts.sorting = sort;
 	opts.mode = mode;
-	opts.num_patterns = argc - i;
+	opts.num_patterns = cc->argc - i;
 	ret = send_option_arg_callback_request(&query, opts.num_patterns,
-		argv + i, com_ls_callback, sc_send_result, scc);
+		cc->argv + i, com_ls_callback, sc_send_result, cc);
 	return ret;
 }
 
@@ -1801,8 +1804,8 @@ out:
 
 /** Used by com_add(). */
 struct private_add_data {
-	/** The socket file descriptor, including stream cipher keys. */
-	struct stream_cipher_context *scc;
+	/** The pointer passed to the original command handler. */
+	struct command_context *cc;
 	/** The given add flags. */
 	uint32_t flags;
 };
@@ -1857,7 +1860,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && (pad->flags & ADD_FLAG_LAZY)) { /* lazy is really cheap */
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = sc_send_va_buffer(pad->scc,
+			send_ret = sc_send_va_buffer(&pad->cc->scc,
 				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
@@ -1878,7 +1881,7 @@ static int add_one_audio_file(const char *path, void *private_data)
 	ret = 1;
 	if (pb && hs && hs == pb && !(pad->flags & ADD_FLAG_FORCE)) {
 		if (pad->flags & ADD_FLAG_VERBOSE)
-			send_ret = sc_send_va_buffer(pad->scc,
+			send_ret = sc_send_va_buffer(&pad->cc->scc,
 				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
@@ -1896,13 +1899,13 @@ static int add_one_audio_file(const char *path, void *private_data)
 	munmap(map.data, map.size);
 	close(fd);
 	if (pad->flags & ADD_FLAG_VERBOSE) {
-		send_ret = sc_send_va_buffer(pad->scc, "adding %s\n", path);
+		send_ret = sc_send_va_buffer(&pad->cc->scc, "adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
 	save_add_callback_buffer(hash, path, afhi_ptr, pad->flags, format_num, &obj);
 	/* Ask afs to consider this entry for adding. */
-	ret = send_callback_request(com_add_callback, &obj, sc_send_result, pad->scc);
+	ret = send_callback_request(com_add_callback, &obj, sc_send_result, pad->cc);
 	goto out_free;
 
 out_unmap:
@@ -1910,30 +1913,22 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = sc_send_va_buffer(pad->scc,
+		send_ret = sc_send_va_buffer(&pad->cc->scc,
 			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
-	if (afhi_ptr) {
-		free(afhi_ptr->chunk_table);
-		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);
-	}
+	clear_afhi(afhi_ptr);
 	/* Stop adding files only on send errors. */
 	return send_ret;
 }
 
-int com_add(struct stream_cipher_context *scc, int argc, char * const * const argv)
+int com_add(struct command_context *cc)
 {
 	int i, ret;
-	struct private_add_data pad = {.scc = scc, .flags = 0};
+	struct private_add_data pad = {.cc = cc, .flags = 0};
 	struct stat statbuf;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -1957,21 +1952,22 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar
 			continue;
 		}
 	}
-	if (argc <= i)
+	if (cc->argc <= i)
 		return -E_AFT_SYNTAX;
-	for (; i < argc; i++) {
+	for (; i < cc->argc; i++) {
 		char *path;
-		ret = verify_path(argv[i], &path);
+		ret = verify_path(cc->argv[i], &path);
 		if (ret < 0) {
-			ret = sc_send_va_buffer(scc, "%s: %s\n", argv[i],
-				para_strerror(-ret));
+			ret = sc_send_va_buffer(&cc->scc, "%s: %s\n",
+				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
 			continue;
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = sc_send_va_buffer(scc, "failed to stat %s (%s)\n", path,
+			ret = sc_send_va_buffer(&cc->scc,
+				"failed to stat %s (%s)\n", path,
 				strerror(errno));
 			free(path);
 			if (ret < 0)
@@ -1984,7 +1980,8 @@ int com_add(struct stream_cipher_context *scc, int argc, char * const * const ar
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			sc_send_va_buffer(scc, "%s: %s\n", path, para_strerror(-ret));
+			sc_send_va_buffer(&cc->scc, "%s: %s\n", path,
+				para_strerror(-ret));
 			free(path);
 			return ret;
 		}
@@ -2112,7 +2109,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	free(tad.pb.buf);
 }
 
-int com_touch(struct stream_cipher_context *scc, int argc, char * const * const argv)
+int com_touch(struct command_context *cc)
 {
 	struct com_touch_options cto = {
 		.num_played = -1,
@@ -2125,8 +2122,8 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const
 	int i, ret;
 
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -2177,12 +2174,12 @@ int com_touch(struct stream_cipher_context *scc, int argc, char * const * const
 		}
 		break; /* non-option starting with dash */
 	}
-	if (i >= argc)
+	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i,
-		argv + i, com_touch_callback, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_touch_callback, sc_send_result, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2260,14 +2257,14 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 }
 
 /* TODO options: -r (recursive) */
-int com_rm(struct stream_cipher_context *scc, int argc,  char * const * const argv)
+int com_rm(struct command_context *cc)
 {
 	uint32_t flags = 0;
 	struct osl_object query = {.data = &flags, .size = sizeof(flags)};
 	int i, ret;
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -2288,12 +2285,12 @@ int com_rm(struct stream_cipher_context *scc, int argc,  char * const * const ar
 		}
 		break;
 	}
-	if (i >= argc)
+	if (i >= cc->argc)
 		return -E_AFT_SYNTAX;
-	ret = send_option_arg_callback_request(&query, argc - i, argv + i,
-		com_rm_callback, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&query, cc->argc - i,
+		cc->argv + i, com_rm_callback, sc_send_result, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2405,14 +2402,14 @@ out:
 	free(cad.pb.buf);
 }
 
-int com_cpsi(struct stream_cipher_context *scc, int argc,  char * const * const argv)
+int com_cpsi(struct command_context *cc)
 {
 	unsigned flags = 0;
 	int i, ret;
 	struct osl_object options = {.data = &flags, .size = sizeof(flags)};
 
-	for (i = 1; i < argc; i++) {
-		const char *arg = argv[i];
+	for (i = 1; i < cc->argc; i++) {
+		const char *arg = cc->argv[i];
 		if (arg[0] != '-')
 			break;
 		if (!strcmp(arg, "--")) {
@@ -2445,14 +2442,14 @@ int com_cpsi(struct stream_cipher_context *scc, int argc,  char * const * const
 		}
 		break;
 	}
-	if (i + 1 >= argc) /* need at least source file and pattern */
+	if (i + 1 >= cc->argc) /* need at least source file and pattern */
 		return -E_AFT_SYNTAX;
 	if (!(flags & ~CPSI_FLAG_VERBOSE)) /* no copy flags given */
 		flags = ~(unsigned)CPSI_FLAG_VERBOSE | flags;
-	ret = send_option_arg_callback_request(&options, argc - i, argv + i,
-		com_cpsi_callback, sc_send_result, scc);
+	ret = send_option_arg_callback_request(&options, cc->argc - i,
+		cc->argv + i, com_cpsi_callback, sc_send_result, cc);
 	if (ret < 0)
-		sc_send_va_buffer(scc, "%s\n", para_strerror(-ret));
+		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
 	return ret;
 }
 
@@ -2470,7 +2467,7 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
 /**
  * Get the current afs status items from the afs process and send it.
  *
- * \param scc The stream cipher context for data encryption.
+ * \param cc The command context, used e.g. for data encryption.
  * \param parser_friendly Whether parser-friendly output format should be used.
  *
  * As the contents of the afs status items change in time and the command
@@ -2481,12 +2478,12 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
  *
  * \return The return value of the underyling call to \ref send_callback_request().
  */
-int send_afs_status(struct stream_cipher_context *scc, int parser_friendly)
+int send_afs_status(struct command_context *cc, int parser_friendly)
 {
 	struct osl_object query = {.data = &parser_friendly,
 		.size = sizeof(parser_friendly)};
 
-	return send_callback_request(afs_stat_callback, &query, sc_send_result, scc);
+	return send_callback_request(afs_stat_callback, &query, sc_send_result, cc);
 }
 
 /* TODO: optionally fix problems by removing offending rows */