X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=aft.c;h=ae2cbe2a1e8f756004f7fa69ef1f84d53e375c10;hp=c724670391bcbdde581d6cfc6c45342ef1f57650;hb=5a63e05ac5239109f7bd492a71575ad1644d0c41;hpb=d5a9e8c8eefe170b6fb62be563c079c818bd3bf8

diff --git a/aft.c b/aft.c
index c7246703..ae2cbe2a 100644
--- a/aft.c
+++ b/aft.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2007-2012 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2007-2013 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -280,7 +280,7 @@ static struct osl_table_description audio_file_table_desc = {
 	.column_descriptions = aft_cols
 };
 
-/* We don't want * dot or dot-dot anywhere. */
+/* We don't want dot or dot-dot anywhere. */
 static int verify_dotfile(const char *rest)
 {
 	/*
@@ -493,15 +493,16 @@ static int aft_get_row_of_hash(unsigned char *hash, struct osl_row **row)
 	return osl(osl_get_row(audio_file_table, AFTCOL_HASH, &obj, row));
 }
 
-/**
- * Get the osl object holding the audio file selector info of a row.
+/*
+ * Get the audio file selector info object of a row.
  *
  * \param row Pointer to a row in the audio file table.
  * \param obj Result pointer.
  *
  * \return Standard.
  */
-int get_afsi_object_of_row(const struct osl_row *row, struct osl_object *obj)
+static int get_afsi_object_of_row(const struct osl_row *row,
+		struct osl_object *obj)
 {
 	return osl(osl_get_object(audio_file_table, row, AFTCOL_AFSI, obj));
 }
@@ -1277,8 +1278,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;
@@ -1356,6 +1359,7 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 		.max_size_handler = afs_max_size_handler,
 		.private_data = &(struct afs_max_size_handler_data) {
 			.fd = fd,
+			.band = SBD_OUTPUT
 		}
 	};
 	int i = 0, ret;
@@ -1399,7 +1403,7 @@ static void com_ls_callback(int fd, const struct osl_object *query)
 		}
 out:
 	if (b.offset)
-		pass_buffer_as_shm(fd, b.buf, b.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, b.buf, b.offset);
 	free(b.buf);
 	free(opts->data);
 	free(opts->data_ptr);
@@ -1685,12 +1689,13 @@ static void com_add_callback(int fd, const struct osl_object *query)
 		.max_size_handler = afs_max_size_handler,
 		.private_data = &(struct afs_max_size_handler_data) {
 			.fd = fd,
+			.band = SBD_OUTPUT
 		}
 	};
 	uint16_t afhi_offset, chunks_offset;
 
 	hash = (unsigned char *)buf + CAB_HASH_OFFSET;
-	hash_to_asc(hash, asc);;
+	hash_to_asc(hash, asc);
 	objs[AFTCOL_HASH].data = buf + CAB_HASH_OFFSET;
 	objs[AFTCOL_HASH].size = HASH_SIZE;
 
@@ -1807,7 +1812,7 @@ out:
 	if (ret < 0)
 		para_printf(&msg, "%s\n", para_strerror(-ret));
 	if (msg.offset)
-		pass_buffer_as_shm(fd, msg.buf, msg.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, msg.buf, msg.offset);
 	free(msg.buf);
 }
 
@@ -1826,7 +1831,8 @@ static void path_brother_callback(int fd, const struct osl_object *query)
 	int ret = aft_get_row_of_path(path, &path_brother);
 	if (ret < 0)
 		return;
-	pass_buffer_as_shm(fd, (char *)&path_brother, sizeof(path_brother));
+	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&path_brother,
+		sizeof(path_brother));
 }
 
 static void hash_sister_callback(int fd, const struct osl_object *query)
@@ -1837,10 +1843,12 @@ static void hash_sister_callback(int fd, const struct osl_object *query)
 	hash_sister = find_hash_sister(hash);
 	if (!hash_sister)
 		return;
-	pass_buffer_as_shm(fd, (char *)&hash_sister, sizeof(hash_sister));
+	pass_buffer_as_shm(fd, SBD_OUTPUT, (char *)&hash_sister,
+		sizeof(hash_sister));
 }
 
-static int get_row_pointer_from_result(struct osl_object *result, void *private)
+static int get_row_pointer_from_result(struct osl_object *result,
+		__a_unused uint8_t band, void *private)
 {
 	struct osl_row **row = private;
 	*row = *(struct osl_row **)(result->data);
@@ -1869,7 +1877,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->cc->scc,
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
 				"lazy-ignore: %s\n", path);
 		goto out_free;
 	}
@@ -1890,7 +1898,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->cc->scc,
+			send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
 				"%s exists, not forcing update\n", path);
 		goto out_unmap;
 	}
@@ -1908,7 +1916,8 @@ 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->cc->scc, "adding %s\n", path);
+		send_ret = send_sb_va(&pad->cc->scc, SBD_OUTPUT,
+			"adding %s\n", path);
 		if (send_ret < 0)
 			goto out_free;
 	}
@@ -1923,7 +1932,7 @@ out_unmap:
 	munmap(map.data, map.size);
 out_free:
 	if (ret < 0 && send_ret >= 0)
-		send_ret = sc_send_va_buffer(&pad->cc->scc,
+		send_ret = send_sb_va(&pad->cc->scc, SBD_ERROR_LOG,
 			"failed to add %s (%s)\n", path, para_strerror(-ret));
 	free(obj.data);
 	clear_afhi(afhi_ptr);
@@ -1968,7 +1977,7 @@ int com_add(struct command_context *cc)
 		char *path;
 		ret = verify_path(cc->argv[i], &path);
 		if (ret < 0) {
-			ret = sc_send_va_buffer(&cc->scc, "%s: %s\n",
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG, "%s: %s\n",
 				cc->argv[i], para_strerror(-ret));
 			if (ret < 0)
 				return ret;
@@ -1976,7 +1985,7 @@ int com_add(struct command_context *cc)
 		}
 		ret = stat(path, &statbuf);
 		if (ret < 0) {
-			ret = sc_send_va_buffer(&cc->scc,
+			ret = send_sb_va(&cc->scc, SBD_ERROR_LOG,
 				"failed to stat %s (%s)\n", path,
 				strerror(errno));
 			free(path);
@@ -1990,7 +1999,7 @@ int com_add(struct command_context *cc)
 		else
 			ret = add_one_audio_file(path, &pad);
 		if (ret < 0) {
-			sc_send_va_buffer(&cc->scc, "%s: %s\n", path,
+			send_sb_va(&cc->scc, SBD_OUTPUT, "%s: %s\n", path,
 				para_strerror(-ret));
 			free(path);
 			return ret;
@@ -2115,7 +2124,7 @@ static void com_touch_callback(int fd, const struct osl_object *query)
 	else if (pmd.num_matches == 0)
 		ret2 = para_printf(&tad.pb, "no matches\n");
 	if (ret2 >= 0 && tad.pb.offset)
-		pass_buffer_as_shm(fd, tad.pb.buf, tad.pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, tad.pb.buf, tad.pb.offset);
 	free(tad.pb.buf);
 }
 
@@ -2189,7 +2198,7 @@ int com_touch(struct command_context *cc)
 	ret = send_option_arg_callback_request(&query, cc->argc - i,
 		cc->argv + i, com_touch_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2262,7 +2271,7 @@ static void com_rm_callback(int fd, const struct osl_object *query)
 			pmd.num_matches);
 	}
 	if (ret >= 0 && crd.pb.offset)
-		pass_buffer_as_shm(fd, crd.pb.buf, crd.pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, crd.pb.buf, crd.pb.offset);
 	free(crd.pb.buf);
 }
 
@@ -2300,7 +2309,7 @@ int com_rm(struct command_context *cc)
 	ret = send_option_arg_callback_request(&query, cc->argc - i,
 		cc->argv + i, com_rm_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
@@ -2408,7 +2417,7 @@ out:
 			para_printf(&cad.pb, "nothing copied\n");
 	}
 	if (cad.pb.offset)
-		pass_buffer_as_shm(fd, cad.pb.buf, cad.pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
 	free(cad.pb.buf);
 }
 
@@ -2459,10 +2468,112 @@ int com_cpsi(struct command_context *cc)
 	ret = send_option_arg_callback_request(&options, cc->argc - i,
 		cc->argv + i, com_cpsi_callback, afs_cb_result_handler, cc);
 	if (ret < 0)
-		sc_send_va_buffer(&cc->scc, "%s\n", para_strerror(-ret));
+		send_strerror(cc, -ret);
 	return ret;
 }
 
+struct change_atts_data {
+	uint64_t add_mask, del_mask;
+	struct para_buffer pb;
+};
+
+static int change_atts(__a_unused struct osl_table *table,
+		struct osl_row *row, __a_unused const char *name, void *data)
+{
+	int ret;
+	struct osl_object obj;
+	struct afs_info old_afsi, new_afsi;
+	struct afsi_change_event_data aced = {
+		.aft_row = row,
+		.old_afsi = &old_afsi
+	};
+	struct change_atts_data *cad = data;
+
+	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;
+	new_afsi.attributes |= cad->add_mask;
+	new_afsi.attributes &= ~cad->del_mask;
+	save_afsi(&new_afsi, &obj); /* in-place update */
+	afs_event(AFSI_CHANGE, &cad->pb, &aced);
+	return 1;
+}
+
+static void com_setatt_callback(int fd, const struct osl_object *query)
+{
+	char *p;
+	int ret;
+	size_t len;
+	struct change_atts_data cad = {
+		.pb = {
+			.max_size = shm_get_shmmax(),
+			.max_size_handler = afs_max_size_handler,
+			.private_data = &(struct afs_max_size_handler_data) {
+				.fd = fd,
+				.band = SBD_OUTPUT
+			}
+		}
+	};
+	struct pattern_match_data pmd = {
+		.table = audio_file_table,
+		.loop_col_num = AFTCOL_HASH,
+		.match_col_num = AFTCOL_PATH,
+		.pm_flags = PM_SKIP_EMPTY_NAME,
+		.data = &cad,
+		.action = change_atts
+	};
+
+	for (p = query->data; p < (char *)query->data + query->size; p += len + 1) {
+		char c;
+		unsigned char bitnum;
+
+		len = strlen(p);
+		ret = -E_ATTR_SYNTAX;
+		if (len == 0)
+			goto out;
+		c = p[len - 1];
+		if (c != '+' && c != '-')
+			break;
+		p[len - 1] = '\0';
+		ret = get_attribute_bitnum_by_name(p, &bitnum);
+		if (ret < 0)
+			goto out;
+		if (c == '+')
+			cad.add_mask |= (1UL << bitnum);
+		else
+			cad.del_mask |= (1UL << bitnum);
+	}
+	ret = -E_ATTR_SYNTAX;
+	if (!cad.add_mask && !cad.del_mask)
+		goto out;
+	pmd.patterns.data = p;
+	assert(p < (char *)query->data + query->size);
+	pmd.patterns.size = (char *)query->data + query->size - p;
+	ret = for_each_matching_row(&pmd);
+	if (ret < 0)
+		goto out;
+	if (pmd.num_matches == 0)
+		para_printf(&cad.pb, "no matches\n");
+out:
+	if (ret < 0)
+		para_printf(&cad.pb, "%s\n", para_strerror(-ret));
+	if (cad.pb.offset)
+		pass_buffer_as_shm(fd, SBD_OUTPUT, cad.pb.buf, cad.pb.offset);
+	free(cad.pb.buf);
+}
+
+int com_setatt(struct command_context *cc)
+{
+	if (cc->argc < 3)
+		return -E_ATTR_SYNTAX;
+	return send_standard_callback_request(cc->argc - 1, cc->argv + 1,
+		com_setatt_callback, afs_cb_result_handler, cc);
+}
+
 static void afs_stat_callback(int fd, const struct osl_object *query)
 {
 	int *parser_friendly = query->data;
@@ -2471,7 +2582,7 @@ static void afs_stat_callback(int fd, const struct osl_object *query)
 
 	if (!buf)
 		return;
-	pass_buffer_as_shm(fd, buf, strlen(buf));
+	pass_buffer_as_shm(fd, SBD_OUTPUT, buf, strlen(buf));
 }
 
 /**
@@ -2553,6 +2664,7 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 		.max_size = shm_get_shmmax(),
 		.private_data = &(struct afs_max_size_handler_data) {
 			.fd = fd,
+			.band = SBD_OUTPUT
 		},
 		.max_size_handler = afs_max_size_handler
 	};
@@ -2562,7 +2674,7 @@ void aft_check_callback(int fd, __a_unused const struct osl_object *query)
 		return;
 	audio_file_loop(&pb, check_audio_file);
 	if (pb.offset)
-		pass_buffer_as_shm(fd, pb.buf, pb.offset);
+		pass_buffer_as_shm(fd, SBD_OUTPUT, pb.buf, pb.offset);
 	free(pb.buf);
 }