imapc: Pass through SPECIAL-USE LIST flags if imapc is in INBOX namespace.

diff --git a/src/lib-storage/index/imapc/imapc-list.c b/src/lib-storage/index/imapc/imapc-list.c
index 4f316144d02bf1adc6bd5adc1c758b67cd3493ce..52fbd3a0777e2022db43186dfc3cb182c0165ad3 100644 (file)
--- a/src/lib-storage/index/imapc/imapc-list.c
+++ b/src/lib-storage/index/imapc/imapc-list.c
@@ -18,6 +18,26 @@ struct imapc_mailbox_list_iterate_context {
 
        struct mailbox_tree_iterate_context *iter;
        struct mailbox_info info;
+       string_t *special_use;
+};
+
+static struct {
+       const char *str;
+       enum mailbox_info_flags flag;
+} imap_list_flags[] = {
+       { "\\NoSelect", MAILBOX_NOSELECT },
+       { "\\NonExistent", MAILBOX_NONEXISTENT },
+       { "\\NoInferiors", MAILBOX_NOINFERIORS },
+       { "\\Subscribed", MAILBOX_SUBSCRIBED },
+       { "\\Subscribed", MAILBOX_SUBSCRIBED },
+       { "\\All", MAILBOX_SPECIALUSE_ALL },
+       { "\\Archive", MAILBOX_SPECIALUSE_ARCHIVE },
+       { "\\Drafts", MAILBOX_SPECIALUSE_DRAFTS },
+       { "\\Flagged", MAILBOX_SPECIALUSE_FLAGGED },
+       { "\\Junk", MAILBOX_SPECIALUSE_JUNK },
+       { "\\Sent", MAILBOX_SPECIALUSE_SENT },
+       { "\\Trash", MAILBOX_SPECIALUSE_TRASH },
+       { "\\Important", MAILBOX_SPECIALUSE_IMPORTANT }
 };
 
 extern struct mailbox_list imapc_mailbox_list;
@@ -63,6 +83,20 @@ static void imapc_list_simple_callback(const struct imapc_command_reply *reply,
        }
 }
 
+static bool
+imap_list_flag_parse(const char *str, enum mailbox_info_flags *flag_r)
+{
+       unsigned int i;
+
+       for (i = 0; i < N_ELEMENTS(imap_list_flags); i++) {
+               if (strcasecmp(str, imap_list_flags[i].str) == 0) {
+                       *flag_r = imap_list_flags[i].flag;
+                       return TRUE;
+               }
+       }
+       return FALSE;
+}
+
 static struct mailbox_node *
 imapc_list_update_tree(struct imapc_mailbox_list *list,
                       struct mailbox_tree_context *tree,
@@ -71,7 +105,7 @@ imapc_list_update_tree(struct imapc_mailbox_list *list,
        struct mailbox_node *node;
        const struct imap_arg *flags;
        const char *name, *flag;
-       enum mailbox_info_flags info_flags = 0;
+       enum mailbox_info_flags info_flag, info_flags = 0;
        bool created;
 
        if (!imap_arg_get_list(&args[0], &flags) ||
@@ -80,14 +114,8 @@ imapc_list_update_tree(struct imapc_mailbox_list *list,
                return NULL;
 
        while (imap_arg_get_atom(flags, &flag)) {
-               if (strcasecmp(flag, "\\NoSelect") == 0)
-                       info_flags |= MAILBOX_NOSELECT;
-               else if (strcasecmp(flag, "\\NonExistent") == 0)
-                       info_flags |= MAILBOX_NONEXISTENT;
-               else if (strcasecmp(flag, "\\NoInferiors") == 0)
-                       info_flags |= MAILBOX_NOINFERIORS;
-               else if (strcasecmp(flag, "\\Subscribed") == 0)
-                       info_flags |= MAILBOX_SUBSCRIBED;
+               if (imap_list_flag_parse(flag, &info_flag))
+                       info_flags |= info_flag;
                flags++;
        }
 
@@ -450,6 +478,31 @@ imapc_list_iter_init(struct mailbox_list *_list, const char *const *patterns,
        return &ctx->ctx;
 }
 
+static void
+imapc_list_write_special_use(struct imapc_mailbox_list_iterate_context *ctx,
+                            struct mailbox_node *node)
+{
+       unsigned int i;
+
+       if (ctx->special_use == NULL)
+               ctx->special_use = str_new(ctx->ctx.pool, 64);
+       str_truncate(ctx->special_use, 0);
+
+       for (i = 0; i < N_ELEMENTS(imap_list_flags); i++) {
+               if ((node->flags & imap_list_flags[i].flag) != 0) {
+                       str_append(ctx->special_use, imap_list_flags[i].str);
+                       str_append_c(ctx->special_use, ' ');
+               }
+       }
+
+       if (str_len(ctx->special_use) > 0) {
+               str_truncate(ctx->special_use, str_len(ctx->special_use) - 1);
+               ctx->info.special_use = str_c(ctx->special_use);
+       } else {
+               ctx->info.special_use = NULL;
+       }
+}
+
 static const struct mailbox_info *
 imapc_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 {
@@ -472,6 +525,13 @@ imapc_list_iter_next(struct mailbox_list_iterate_context *_ctx)
 
        ctx->info.vname = vname;
        ctx->info.flags = node->flags;
+       if ((_ctx->list->ns->flags & NAMESPACE_FLAG_INBOX_USER) != 0) {
+               /* we're iterating the INBOX namespace. pass through the
+                  SPECIAL-USE flags if they exist. */
+               imapc_list_write_special_use(ctx, node);
+       } else {
+               ctx->info.special_use = NULL;
+       }
        return &ctx->info;
 }
 

diff --git a/src/lib-storage/mailbox-list.h b/src/lib-storage/mailbox-list.h
index edd301c199a658f2c8e0fd10c66f0e2fae85b68d..fb4096fd37fc6b197c4f369413387a80e319043a 100644 (file)
--- a/src/lib-storage/mailbox-list.h
+++ b/src/lib-storage/mailbox-list.h
@@ -48,7 +48,18 @@ enum mailbox_info_flags {
        MAILBOX_CHILD_SUBSCRIBED        = 0x100,
        MAILBOX_CHILD_SPECIALUSE        = 0x200,
 
-       /* Internally used by lib-storage */
+       /* Internally used by lib-storage, use mailbox_info.special_use
+          to actually access these: */
+       MAILBOX_SPECIALUSE_ALL          = 0x00010000,
+       MAILBOX_SPECIALUSE_ARCHIVE      = 0x00020000,
+       MAILBOX_SPECIALUSE_DRAFTS       = 0x00040000,
+       MAILBOX_SPECIALUSE_FLAGGED      = 0x00080000,
+       MAILBOX_SPECIALUSE_JUNK         = 0x00100000,
+       MAILBOX_SPECIALUSE_SENT         = 0x00200000,
+       MAILBOX_SPECIALUSE_TRASH        = 0x00400000,
+       MAILBOX_SPECIALUSE_IMPORTANT    = 0x00800000,
+
+       /* Internally used by lib-storage: */
        MAILBOX_SELECT                  = 0x20000000,
        MAILBOX_MATCHED                 = 0x40000000
 };