Changeset 1384

Timestamp:

01/10/07 03:15:04

Author:

pvanhoof

Message:

Unfinished POP summary support

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c (modified) (7 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c (modified) (2 diffs)
• trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.h (modified) (1 diff)
• trunk/libtinymail-camel/tny-camel-pop-folder.c (modified) (4 diffs)
• trunk/libtinymail-camel/tny-camel-pop-store-account.c (modified) (7 diffs)
• trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c (modified) (1 diff)

trunk/ChangeLog

@@ -3 +3 @@
-        * Added some extra TnyFolderType's for use in tinymail clients
-
-
-2007-01-09   Philip Van Hoof <pvanhoof@gnome.org>
+
+        * Temporary POP implementation (CamelFolderSummary support)
+
+2007-01-09  Philip Van Hoof <pvanhoof@gnome.org>
-
-        * Implemented a very memory efficient message fetching mechanism in

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-folder.c

@@ -124 +124 @@
-{
-        CamelFolder *folder;
+        CamelPOP3Store *p3store = (CamelPOP3Store*) parent;
+        gchar *summary_file;
-
-        d(printf("opening pop3 INBOX folder\n"));
@@ -130 +132 @@
-        camel_folder_construct (folder, parent, "inbox", "inbox");
-        
+        summary_file = g_strdup_printf ("%s/summary.mmap", p3store->root);
+        folder->summary = camel_folder_summary_new (folder);
+        camel_folder_summary_set_build_content (folder->summary, TRUE);
+        camel_folder_summary_set_filename (folder->summary, summary_file);
+
+        if (camel_folder_summary_load (folder->summary) == -1) {
+                camel_folder_summary_clear (folder->summary);
+                camel_folder_summary_touch (folder->summary);
+                camel_folder_summary_save (folder->summary);
+                camel_folder_summary_load (folder->summary);
+        }
+        g_free (summary_file);
+
+
-        /* mt-ok, since we dont have the folder-lock for new() */
-        camel_folder_refresh_info (folder, ex);/* mt-ok */
@@ -136 +152 @@
-                folder = NULL;
-        }
-
+
+
+
+
+
+
+
+
+
+
-        return folder;
-}
@@ -272 +297 @@
-        camel_pop3_engine_command_free(pop3_store->engine, pcl);
-        
+        for (i=0;i<pop3_folder->uids->len;i++) 
+        {
+                CamelPOP3FolderInfo *fi = pop3_folder->uids->pdata[i];
+
+                /* TNY TODO: only get the HEAD if the service is capable of that */
+                pop3_get_message (folder, fi->uid, FALSE, NULL);
+        }
+
-        if (pop3_store->engine->capa & CAMEL_POP3_CAP_UIDL) {
-                camel_pop3_engine_command_free(pop3_store->engine, pcu);
@@ -277 +310 @@
-                for (i=0;i<pop3_folder->uids->len;i++) {
-                        CamelPOP3FolderInfo *fi = pop3_folder->uids->pdata[i];
+
-                        if (fi->cmd) {
-                                camel_pop3_engine_command_free(pop3_store->engine, fi->cmd);
@@ -466 +500 @@
-        int i, last;
-        CamelStream *stream = NULL;
+        CamelFolderSummary *summary = folder->summary;
+        CamelMessageInfoBase *mi;
-
-        /* TNY TODO: Implement partial message retrieval if full==TRUE */
@@ -585 +621 @@
-                message = NULL;
-        }
+
+        mi = (CamelMessageInfoBase *) camel_folder_summary_info_new_from_message (summary, message);
+
+        mi->flags |= CAMEL_MESSAGE_INFO_UID_NEEDS_FREE;
+        mi->uid = g_strdup (fi->uid);
+
+        camel_folder_summary_add (summary, (CamelMessageInfo *)mi);
+
-done:
-        camel_object_unref((CamelObject *)stream);

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.c

@@ -133 +133 @@
-        if (pop3_store->cache)
-                camel_object_unref((CamelObject *)pop3_store->cache);
+        if (pop3_store->root)
+                g_free (pop3_store->root);
-}
-
@@ -568 +570 @@
-
-                root = camel_session_get_storage_path (session, service, ex);
+                store->root = root;
-                if (root) {
-                        store->cache = camel_data_cache_new(root, 0, ex);
-g_free(root);
+/*g_free(root);*/
-                        if (store->cache) {
-                                /* Default cache expiry - 1 week or not visited in a day */

trunk/libtinymail-camel/camel-lite/camel/providers/pop3/camel-pop3-store.h

@@ -52 +52 @@
-        
-        guint delete_after;
+        gchar *root;
+
-} CamelPOP3Store;
-

trunk/libtinymail-camel/tny-camel-pop-folder.c

@@ -50 +50 @@
-static GObjectClass *parent_class = NULL;
-
-
+
-static void 
-tny_camel_pop_folder_refresh_impl (TnyFolder *self, GError **err, CamelOperationStatusFunc status_func)
@@ -188 +188 @@
-}
-
+
-static void 
-tny_camel_pop_folder_refresh (TnyFolder *self, GError **err)
@@ -433 +434 @@
-        return;
-}
+#endif
-
-/**
@@ -465 +467 @@
-        object_class = (GObjectClass*) class;
-
+        /*
-        TNY_CAMEL_FOLDER_CLASS (class)->refresh_async_func = tny_camel_pop_folder_refresh_async;
-
+
+
-
-        object_class->finalize = tny_camel_pop_folder_finalize;

trunk/libtinymail-camel/tny-camel-pop-store-account.c

@@ -59 +59 @@
-static GObjectClass *parent_class = NULL;
-
+#if 0
-static TnyFolder*
-create_maildir (TnyCamelAccount *self, TnyCamelAccountPriv *apriv, const gchar *name, const gchar *url_string)
@@ -123 +124 @@
-        return NULL;
-}
-
-
-static void
@@ -150 +150 @@
-}
-
+#endif
+
-static const gchar* 
-tny_camel_pop_store_account_get_url_string (TnyAccount *self)
@@ -172 +174 @@
-tny_camel_pop_store_account_get_folders (TnyFolderStore *self, TnyList *list, TnyFolderStoreQuery *query, GError **err)
-{
-
-
-
+
+
+
+
+
+
+
-        g_assert (TNY_IS_LIST (list));
-
+        store = camel_session_get_store ((CamelSession*) apriv->session, 
+                        apriv->url_string, &ex);
+
+        if (camel_exception_is_set (&ex))
+        {
+                g_set_error (err, TNY_FOLDER_STORE_ERROR, 
+                        TNY_FOLDER_STORE_ERROR_GET_FOLDERS,
+                        camel_exception_get_description (&ex));
+                camel_exception_clear (&ex);
+
+                if (store && CAMEL_IS_OBJECT (store))
+                        camel_object_unref (CAMEL_OBJECT (store));
+
+                return;
+        }
+
+        g_assert (CAMEL_IS_STORE (store));
+
+        folder = TNY_CAMEL_FOLDER (tny_camel_pop_folder_new ());
+
+        _tny_camel_folder_set_id (folder, "INBOX");
+        /* _tny_camel_folder_set_unread_count (folder, iter->unread);
+        _tny_camel_folder_set_all_count (folder, iter->total); */
+        _tny_camel_folder_set_name (folder, "Inbox");
+        priv->managed_folders = g_list_prepend (priv->managed_folders, folder);
+        _tny_camel_folder_set_account (folder, TNY_ACCOUNT (self));
+        tny_list_prepend (list, G_OBJECT (folder));
+
+        g_object_unref (G_OBJECT (folder));
+
+        return;
+
+
+#if 0
-        if (!priv->inbox)
-                tny_camel_pop_store_account_reconnect (TNY_CAMEL_ACCOUNT (self));
@@ -206 +246 @@
-
-        return;
-
-
+
+
+
+
+
+
+
-static void
-tny_camel_pop_store_account_get_folders_async (TnyFolderStore *self, TnyList *list, TnyGetFoldersCallback callback, TnyFolderStoreQuery *query, gpointer user_data)
@@ -235 +280 @@
-}
-
+#endif
-
-
@@ -290 +336 @@
-        object_class = (GObjectClass*) class;
-
+#if 0
-        TNY_CAMEL_ACCOUNT_CLASS (class)->reconnect_func = tny_camel_pop_store_account_reconnect;
+#endif
+
-        TNY_CAMEL_ACCOUNT_CLASS (class)->get_url_string_func = tny_camel_pop_store_account_get_url_string;
-        TNY_CAMEL_ACCOUNT_CLASS (class)->set_url_string_func = tny_camel_pop_store_account_set_url_string;
-        TNY_CAMEL_ACCOUNT_CLASS (class)->add_option_func = tny_camel_pop_store_account_add_option;
-
+
-        TNY_CAMEL_STORE_ACCOUNT_CLASS (class)->get_folders_async_func = tny_camel_pop_store_account_get_folders_async;
+#endif
+
-        TNY_CAMEL_STORE_ACCOUNT_CLASS (class)->get_folders_func = tny_camel_pop_store_account_get_folders;
-        TNY_CAMEL_STORE_ACCOUNT_CLASS (class)->remove_folder_func = tny_camel_pop_store_account_remove_folder;

trunk/libtinymail-gnome-desktop/tny-gnome-account-store.c

@@ -400 +400 @@
-                                account = TNY_ACCOUNT (tny_camel_pop_store_account_new ());
-                        else    /* Unknown, create a generic one? */
-    
+
-                }
-