GSList * global_processing = NULL;
+static gboolean filtering_is_final_action(FilteringAction *filtering_action);
+
#define STRLEN_WITH_CHECK(expr) \
strlen_with_check(#expr, __LINE__, expr)
FilteringAction * filteringaction_new(int type, int account_id,
gchar * destination,
- gint labelcolor)
+ gint labelcolor, gint score)
{
FilteringAction * action;
action = g_new0(FilteringAction, 1);
- /* NOTE:
- * if type is MATCHACTION_CHANGE_SCORE, account_id = (-1, 0, 1) and
- * labelcolor = the score value change
- */
-
action->type = type;
action->account_id = account_id;
if (destination) {
action->unesc_destination = NULL;
}
action->labelcolor = labelcolor;
+ action->score = score;
return action;
}
}
FilteringProp * filteringprop_new(MatcherList * matchers,
- FilteringAction * action)
+ GSList * action_list)
{
FilteringProp * filtering;
filtering = g_new0(FilteringProp, 1);
filtering->matchers = matchers;
- filtering->action = action;
+ filtering->action_list = action_list;
return filtering;
}
+static FilteringAction * filteringaction_copy(FilteringAction * src)
+{
+ FilteringAction * new;
+
+ new = g_new0(FilteringAction, 1);
+
+ new->type = src->type;
+ new->account_id = src->account_id;
+ if (src->destination)
+ new->destination = g_strdup(src->destination);
+ else
+ new->destination = NULL;
+ if (src->unesc_destination)
+ new->unesc_destination = g_strdup(src->unesc_destination);
+ else
+ new->unesc_destination = NULL;
+ new->labelcolor = src->labelcolor;
+
+ return new;
+}
+
FilteringProp * filteringprop_copy(FilteringProp *src)
{
FilteringProp * new;
new = g_new0(FilteringProp, 1);
new->matchers = g_new0(MatcherList, 1);
+
+#if 0
new->action = g_new0(FilteringAction, 1);
+#endif
+
for (tmp = src->matchers->matchers; tmp != NULL && tmp->data != NULL;) {
MatcherProp *matcher = (MatcherProp *)tmp->data;
matcherprop_copy(matcher));
tmp = tmp->next;
}
+
new->matchers->bool_and = src->matchers->bool_and;
+
+#if 0
new->action->type = src->action->type;
new->action->account_id = src->action->account_id;
if (src->action->destination)
else
new->action->unesc_destination = NULL;
new->action->labelcolor = src->action->labelcolor;
+#endif
+ new->action_list = NULL;
+
+ for (tmp = src->action_list ; tmp != NULL ; tmp = tmp->next) {
+ FilteringAction *filtering_action;
+
+ filtering_action = tmp->data;
+
+ new->action_list = g_slist_append(new->action_list,
+ filteringaction_copy(filtering_action));
+ }
+
return new;
}
void filteringprop_free(FilteringProp * prop)
{
+ GSList * tmp;
+
g_return_if_fail(prop);
matcherlist_free(prop->matchers);
- filteringaction_free(prop->action);
+
+ for (tmp = prop->action_list ; tmp != NULL ; tmp = tmp->next) {
+ filteringaction_free(tmp->data);
+ }
g_free(prop);
}
return TRUE;
case MATCHACTION_FORWARD:
- account = account_find_from_id(action->account_id);
- compose = compose_forward(account, info, FALSE, NULL);
- if (compose->account->protocol == A_NNTP)
- compose_entry_append(compose, action->destination,
- COMPOSE_NEWSGROUPS);
- else
- compose_entry_append(compose, action->destination,
- COMPOSE_TO);
-
- val = compose_send(compose);
- if (val == 0) {
- gtk_widget_destroy(compose->window);
- return TRUE;
- }
-
- gtk_widget_destroy(compose->window);
- return FALSE;
-
case MATCHACTION_FORWARD_AS_ATTACHMENT:
-
account = account_find_from_id(action->account_id);
- compose = compose_forward(account, info, TRUE, NULL);
- if (compose->account->protocol == A_NNTP)
- compose_entry_append(compose, action->destination,
- COMPOSE_NEWSGROUPS);
- else
- compose_entry_append(compose, action->destination,
- COMPOSE_TO);
+ compose = compose_forward(account, info,
+ action->type == MATCHACTION_FORWARD ? FALSE : TRUE,
+ NULL, TRUE);
+ compose_entry_append(compose, action->destination,
+ compose->account->protocol == A_NNTP
+ ? COMPOSE_NEWSGROUPS
+ : COMPOSE_TO);
val = compose_send(compose);
- if (val == 0) {
- gtk_widget_destroy(compose->window);
- return TRUE;
- }
gtk_widget_destroy(compose->window);
- return FALSE;
+
+ return val == 0 ? TRUE : FALSE;
case MATCHACTION_REDIRECT:
account = account_find_from_id(action->account_id);
COMPOSE_TO);
val = compose_send(compose);
- if (val == 0) {
- gtk_widget_destroy(compose->window);
- return TRUE;
- }
-
gtk_widget_destroy(compose->window);
- return FALSE;
+
+ return val == 0 ? TRUE : FALSE;
case MATCHACTION_EXECUTE:
cmd = matching_build_command(action->unesc_destination, info);
}
return TRUE;
- case MATCHACTION_CHANGE_SCORE:
- /* NOTE:
- * action->account_id is 0 if just assignment, -1 if decrement
- * and 1 if increment by action->labelcolor
- * action->labelcolor has the score value change
- */
- info->score = action->account_id == 1 ? info->score + action->labelcolor
- : action->account_id == -1 ? info->score - action->labelcolor
- : action->labelcolor;
+ case MATCHACTION_SET_SCORE:
+ info->score = action->score;
+ return TRUE;
+
+ case MATCHACTION_ADD_SCORE:
+ info->score += action->score;
return TRUE;
+ case MATCHACTION_STOP:
+ break;
+
default:
break;
}
return FALSE;
}
+gboolean filteringaction_apply_action_list(GSList *action_list, MsgInfo *info)
+{
+ GSList *p;
+ g_return_val_if_fail(action_list, FALSE);
+ g_return_val_if_fail(info, FALSE);
+ for (p = action_list; p && p->data; p = g_slist_next(p)) {
+ FilteringAction *a = (FilteringAction *) p->data;
+ if (filteringaction_apply(a, info)) {
+ if (filtering_is_final_action(a))
+ break;
+ } else
+ return FALSE;
+
+ }
+ return TRUE;
+}
+
static gboolean filtering_match_condition(FilteringProp *filtering, MsgInfo *info)
{
return matcherlist_match(filtering->matchers, info);
}
-static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info)
+static gboolean filtering_apply_rule(FilteringProp *filtering, MsgInfo *info,
+ gboolean * final)
{
gboolean result;
gchar buf[50];
-
- if (FALSE == (result = filteringaction_apply(filtering->action, info))) {
- g_warning("action %s could not be applied",
- filteringaction_to_string(buf, sizeof buf, filtering->action));
- }
+ GSList * tmp;
+
+ * final = FALSE;
+ for (tmp = filtering->action_list ; tmp != NULL ; tmp = tmp->next) {
+ FilteringAction * action;
+
+ action = tmp->data;
+
+ if (FALSE == (result = filteringaction_apply(action, info))) {
+ g_warning("action %s could not be applied",
+ filteringaction_to_string(buf, sizeof buf, action));
+ }
+
+ if (filtering_is_final_action(action)) {
+ * final = TRUE;
+ break;
+ }
+ }
return result;
}
-static gboolean filtering_is_final_action(FilteringProp *filtering)
+static gboolean filtering_is_final_action(FilteringAction *filtering_action)
{
- switch(filtering->action->type) {
+ switch(filtering_action->type) {
case MATCHACTION_MOVE:
case MATCHACTION_DELETE:
+ case MATCHACTION_STOP:
return TRUE; /* MsgInfo invalid for message */
- case MATCHACTION_EXECUTE:
- case MATCHACTION_COPY:
- case MATCHACTION_MARK:
- case MATCHACTION_UNMARK:
- case MATCHACTION_LOCK:
- case MATCHACTION_UNLOCK:
- case MATCHACTION_MARK_AS_READ:
- case MATCHACTION_MARK_AS_UNREAD:
- case MATCHACTION_FORWARD:
- case MATCHACTION_FORWARD_AS_ATTACHMENT:
- case MATCHACTION_REDIRECT:
- return FALSE; /* MsgInfo still valid for message */
default:
return FALSE;
}
FilteringProp * filtering = (FilteringProp *) l->data;
if (filtering_match_condition(filtering, info)) {
- applied = filtering_apply_rule(filtering, info);
+ applied = filtering_apply_rule(filtering, info, &final);
+#if 0
if (TRUE == (final = filtering_is_final_action(filtering)))
break;
+#endif
+ if (final)
+ break;
}
}
case MATCHACTION_UNLOCK:
case MATCHACTION_MARK_AS_READ:
case MATCHACTION_MARK_AS_UNREAD:
+ case MATCHACTION_STOP:
g_snprintf(dest, destlen, "%s", command_str);
return dest;
case MATCHACTION_COLOR:
g_snprintf(dest, destlen, "%s %d", command_str, action->labelcolor);
return dest;
+
+ case MATCHACTION_ADD_SCORE:
+ case MATCHACTION_SET_SCORE:
+ g_snprintf(dest, destlen, "%s %d", command_str, action->score);
+ return dest;
+
default:
return NULL;
}
}
+gchar * filteringaction_list_to_string(GSList * action_list)
+{
+ gchar *action_list_str;
+ gchar buf[256];
+ GSList * tmp;
+ gchar *list_str;
+
+ action_list_str = NULL;
+ for (tmp = action_list ; tmp != NULL ; tmp = tmp->next) {
+ gchar *action_str;
+ FilteringAction * action;
+
+ action = tmp->data;
+
+ action_str = filteringaction_to_string(buf,
+ sizeof buf, action);
+
+ if (action_list_str != NULL) {
+ list_str = g_strconcat(action_list_str, " ", action_str, NULL);
+ g_free(action_list_str);
+ }
+ else {
+ list_str = g_strdup(action_str);
+ }
+ action_list_str = list_str;
+ }
+
+ return action_list_str;
+}
+
gchar * filteringprop_to_string(FilteringProp * prop)
{
gchar *list_str;
- gchar *action_str;
+ gchar *action_list_str;
gchar *filtering_str;
- gchar buf[256];
+ GSList * tmp;
- action_str = filteringaction_to_string(buf, sizeof buf, prop->action);
+ action_list_str = filteringaction_list_to_string(prop->action_list);
- if (action_str == NULL)
+ if (action_list_str == NULL)
return NULL;
list_str = matcherlist_to_string(prop->matchers);
- if (list_str == NULL)
+ if (list_str == NULL) {
+ g_free(action_list_str);
return NULL;
+ }
- filtering_str = g_strconcat(list_str, " ", action_str, NULL);
+ filtering_str = g_strconcat(list_str, " ", action_list_str, NULL);
+ g_free(action_list_str);
g_free(list_str);
return filtering_str;
projects / claws.git / blobdiff