X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=attribute.c;h=5f7188ee30b58ee84f5800d7059cbfb014e8c09a;hp=48f108c7fe8be8a96ac6b4d77b7d7737bb46db1c;hb=51dde9efab2d662cf5813d26d5c9aebce6e197e7;hpb=53d503ce75eb1d9439cfb75053d3cff4cbca6ff9

diff --git a/attribute.c b/attribute.c
index 48f108c7..5f7188ee 100644
--- a/attribute.c
+++ b/attribute.c
@@ -71,7 +71,7 @@ static void find_greatest_att_bitnum(void)
 			return;
 		}
 	} while (c--);
-	PARA_INFO_LOG("%s\n", "no attributes");
+	PARA_INFO_LOG("no attributes\n");
 	greatest_att_bitnum = -E_NO_ATTRIBUTES;
 }
 
@@ -250,13 +250,13 @@ static int com_setatt_callback(const struct osl_object *query,
 		(long long unsigned)del_mask);
 	for (; p < (char *)query->data + query->size; p += len + 1) { /* TODO: fnmatch */
 		struct afs_info old_afsi, new_afsi;
-		struct osl_row *aft_row;
+		struct afsi_change_event_data aced = {.old_afsi = &old_afsi};
 
 		len = strlen(p);
-		ret = aft_get_row_of_path(p, &aft_row);
+		ret = aft_get_row_of_path(p, &aced.aft_row);
 		if (ret < 0)
 			return ret;
-		ret = get_afsi_object_of_row(aft_row, &obj);
+		ret = get_afsi_object_of_row(aced.aft_row, &obj);
 		if (ret < 0)
 			return ret;
 		ret = load_afsi(&old_afsi, &obj);
@@ -266,37 +266,24 @@ static int com_setatt_callback(const struct osl_object *query,
 		new_afsi.attributes |= add_mask;
 		new_afsi.attributes &= ~del_mask;
 		save_afsi(&new_afsi, &obj); /* in-place update */
-//		ret = mood_update_audio_file(aft_row, &old_afsi);
-//		if (ret < 0)
-//			return ret;
+		afs_event(AFSI_CHANGE, NULL, &aced);
 	}
 	return 1;
 }
 
 int com_setatt(__a_unused int fd, int argc, char * const * const argv)
 {
-	if (argc < 2)
+	if (argc < 3)
 		return -E_ATTR_SYNTAX;
 	return send_standard_callback_request(argc - 1, argv + 1, com_setatt_callback,
 		NULL);
 }
 
-/* TODO: make it faster by only extracting the attribute member from afsi */
-static int logical_and_attribute(struct osl_row *aft_row, void *attribute_ptr)
-{
-	struct afs_info afsi;
-	uint64_t *att = attribute_ptr;
-	struct osl_object obj;
-	int ret = get_afsi_object_of_row(aft_row, &obj);
-	if (ret < 0)
-		return ret;
-	ret = load_afsi(&afsi, &obj);
-	if (ret < 0)
-		return ret;
-	afsi.attributes &= *att;
-	save_afsi(&afsi, &obj);
-	return 1;
-}
+struct addatt_event_data {
+	const char *name;
+	unsigned char bitnum;
+};
+
 
 static int com_addatt_callback(const struct osl_object *query,
 		struct osl_object *result)
@@ -311,23 +298,21 @@ static int com_addatt_callback(const struct osl_object *query,
 		struct osl_row *row;
 		unsigned char bitnum;
 		len = strlen(p);
+		struct addatt_event_data aed;
 
 		if (!len || p[len - 1] == '-' || p[len - 1] == '+') {
 			para_printf(&pb, "invalid attribute name: %s\n", p);
 			continue;
 		}
-		objs[ATTCOL_BITNUM].size = 1;
-		objs[ATTCOL_NAME].data = p;
-		objs[ATTCOL_NAME].size = len + 1;
-		ret = osl_get_row(attribute_table, ATTCOL_NAME,
-			&objs[ATTCOL_NAME], &row); /* expected to fail */
+		ret = get_attribute_bitnum_by_name(p, &bitnum);
 		if (ret >= 0) {
-			para_printf(&pb, "attribute %s already exists\n", p);
+			para_printf(&pb, "attribute \"%s\" already exists\n", p);
 			continue;
 		}
 		if (ret != -E_RB_KEY_NOT_FOUND) /* error */
 			goto out;
-		/* find smallest non-used attribute */
+		objs[ATTCOL_BITNUM].size = 1;
+		/* find smallest unused attribute */
 		for (bitnum = 0; bitnum < 64; bitnum++) {
 			objs[ATTCOL_BITNUM].data = &bitnum;
 			ret = osl_get_row(attribute_table, ATTCOL_BITNUM,
@@ -339,12 +324,17 @@ static int com_addatt_callback(const struct osl_object *query,
 			/* this bit is already in use, try next bit */
 		}
 		if (bitnum == 64) {
-			para_printf(&pb, "attribute table full\n");
+			ret = -E_ATT_TABLE_FULL;
 			goto out;
 		}
+		objs[ATTCOL_NAME].data = p;
+		objs[ATTCOL_NAME].size = len + 1;
 		ret = osl_add_row(attribute_table, objs);
 		if (ret < 0)
 			goto out;
+		aed.name = p;
+		aed.bitnum = bitnum;
+		afs_event(ATTRIBUTE_ADD, &pb, &aed);
 		greatest_att_bitnum = PARA_MAX(greatest_att_bitnum, bitnum);
 	}
 out:
@@ -375,9 +365,62 @@ int com_addatt(int fd, int argc, char * const * const argv)
 	return ret;
 }
 
+static int com_mvatt_callback(const struct osl_object *query,
+		struct osl_object *result)
+{
+	char *old = query->data;
+	size_t size = strlen(old) + 1;
+	char *new = old + size;
+	struct osl_object obj = {.data = old, .size = size};
+	struct osl_row *row;
+	struct para_buffer pb = {.size = 0};
+	int ret;
+
+	ret = osl_get_row(attribute_table, ATTCOL_NAME, &obj, &row);
+	if (ret < 0)
+		goto out;
+	obj.data = new;
+	obj.size = strlen(new) + 1;
+	ret = osl_update_object(attribute_table, row, ATTCOL_NAME, &obj);
+out:
+	if (ret < 0)
+		para_printf(&pb, "%s\n", PARA_STRERROR(-ret));
+	else
+		afs_event(ATTRIBUTE_RENAME, &pb, NULL);
+	if (!pb.buf)
+		return 0;
+	result->data = pb.buf;
+	result->size = pb.size;
+	return 1;
+}
+
+int com_mvatt(int fd, int argc, char * const * const argv)
+{
+	struct osl_object result;
+	int ret;
+
+	if (argc != 3)
+		return -E_ATTR_SYNTAX;
+	ret = send_standard_callback_request(argc - 1, argv + 1, com_mvatt_callback,
+		&result);
+	if (!ret)
+		return 1;
+	if (ret < 0)
+		return ret;
+	if (!result.data || !result.size)
+		return 1;
+	ret =  send_va_buffer(fd, "%s", (char *) result.data);
+	free(result.data);
+	return ret;
+}
+
+/** Data passed to the action handler of com_rmatt(). */
 struct remove_attribute_action_data {
+	/** Message buffer. */
 	struct para_buffer pb;
+	/** Numver of attributes removed. */
 	int num_removed;
+	/** Bitwise "or" of the removed attributes. */
 	uint64_t mask_of_removed_atts;
 };
 
@@ -385,10 +428,10 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 		const char *name, void *data)
 {
 	struct remove_attribute_action_data *raad = data;
-	unsigned char bitnum;
 	int ret;
+	struct rmatt_event_data red = {.name = name};
 
-	ret = get_attribute_bitnum_by_name(name, &bitnum);
+	ret = get_attribute_bitnum_by_name(name, &red.bitnum);
 	if (ret < 0) {
 		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
 		return 1;
@@ -398,9 +441,10 @@ static int remove_attribute(struct osl_table *table, struct osl_row *row,
 		para_printf(&raad->pb, "%s: %s\n", name, PARA_STRERROR(-ret));
 		return 1;
 	}
-	para_printf(&raad->pb, "removed %s\n", name);
+	para_printf(&raad->pb, "removed attribute %s\n", name);
 	raad->num_removed++;
-	raad->mask_of_removed_atts |= (1 << bitnum);
+	raad->mask_of_removed_atts |= (1 << red.bitnum);
+	afs_event(ATTRIBUTE_REMOVE, &raad->pb, &red);
 	return 1;
 }
 
@@ -420,17 +464,7 @@ static int com_rmatt_callback(const struct osl_object *query,
 	ret = for_each_matching_row(&pmd);
 	if (ret < 0)
 		para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
-	if (raad.num_removed) {
-		uint64_t and_mask = ~raad.mask_of_removed_atts;
-		ret = audio_file_loop(&and_mask, logical_and_attribute);
-		if (ret < 0)
-			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
-		find_greatest_att_bitnum();
-		ret = reload_current_mood();
-		if (ret < 0)
-			para_printf(&raad.pb, "%s\n", PARA_STRERROR(-ret));
-	}
-	if (!raad.pb.buf)
+	if (!raad.num_removed)
 		para_printf(&raad.pb, "no match -- nothing removed\n");
 	result->data = raad.pb.buf;
 	result->size = raad.pb.size;
@@ -455,7 +489,7 @@ int com_rmatt(int fd, int argc, char * const * const argv)
 }
 
 /**
- * Return a binary representation of the geiven attribute value.
+ * Return a binary representation of the given attribute value.
  *
  * \param atts Pointer to the attribute value.
  * \param buf Result.
@@ -495,8 +529,10 @@ int get_attribute_text(uint64_t *atts, const char *delim, char **text)
 	const uint64_t one = 1;
 
 	*text = NULL;
-	if (greatest_att_bitnum < 0) /* no attributes available */
+	if (greatest_att_bitnum < 0) { /* no attributes available */
+		*text = para_strdup("(no attributes available)");
 		return 1;
+	}
 	for (i = 0; i <= greatest_att_bitnum; i++) {
 		unsigned char bn = i;
 		struct osl_object obj = {.data = &bn, .size = 1};
@@ -528,8 +564,6 @@ err:
 /**
  * Close the attribute table.
  *
- * \param flags Ususal flags that are passed to osl_close_table().
- *
  * \sa osl_close_table().
  */
 void attribute_close(void)