* check for a valid foldername

[modest] / src / modest-search.c

diff --git a/src/modest-search.c b/src/modest-search.c
index 31aa485..3ed4ed6 100644 (file)
--- a/src/modest-search.c
+++ b/src/modest-search.c
@@ -114,26 +114,30 @@ add_hit (GList *list, TnyHeader *header, TnyFolder *folder)
        return g_list_prepend (list, hit);
 }
 
        return g_list_prepend (list, hit);
 }
 

+/** Call this until it returns FALSE or nread is set to 0.
+ * 
+ * @result: FALSE is something failed. */

 static gboolean
 read_chunk (TnyStream *stream, char *buffer, gsize count, gsize *nread)
 {
 static gboolean
 read_chunk (TnyStream *stream, char *buffer, gsize count, gsize *nread)
 {

-       gsize _nread;
-       gssize res;
+       gsize _nread = 0;
+       gssize res = 0;

 
 

-       _nread = 0;

        while (_nread < count) {
                res = tny_stream_read (stream,
                                       buffer + _nread, 
                                       count - _nread);
        while (_nread < count) {
                res = tny_stream_read (stream,
                                       buffer + _nread, 
                                       count - _nread);

-               if (res == -1) {
+               if (res == -1) { /* error */

                        *nread = _nread;
                        return FALSE;
                }
 
                        *nread = _nread;
                        return FALSE;
                }
 

-               if (res == 0)
-                       break;
-

                _nread += res;
                _nread += res;

+               
+               if (res == 0) { /* no more bytes read. */
+                       *nread = _nread;
+                       return TRUE;
+               }

        }
 
        *nread = _nread;
        }
 
        *nread = _nread;

@@ -144,30 +148,47 @@ read_chunk (TnyStream *stream, char *buffer, gsize count, gsize *nread)
 static gboolean
 search_mime_part_ogs (TnyMimePart *part, ModestSearch *search)
 {
 static gboolean
 search_mime_part_ogs (TnyMimePart *part, ModestSearch *search)
 {

-       TnyStream *stream;
+       TnyStream *stream = NULL;

        char       buffer[4096];
        char       buffer[4096];

-       gsize      len;
-       gsize      nread;
-       gboolean   is_html = FALSE;
-       gboolean   found;
-       gboolean   res;
-
-
-       if (! tny_mime_part_content_type_is (part, "text/*") ||
-           ! (is_html = tny_mime_part_content_type_is (part, "text/html"))) {
-           g_debug ("%s: No text or html MIME part found.\n", __FUNCTION__);
-               return FALSE;
+       const gsize len = sizeof (buffer);
+       gsize      nread = 0;
+       gboolean   is_text_html = FALSE;
+       gboolean   found = FALSE;
+       gboolean   res = FALSE;
+
+       gboolean is_text = tny_mime_part_content_type_is (part, "text/*");
+       if (!is_text) {
+               g_debug ("%s: tny_mime_part_content_type_is() failed to find a "
+                       "text/* MIME part. Content type is %s", 
+               __FUNCTION__, "Unknown (calling tny_mime_part_get_content_type(part) causes a deadlock)");
+               
+           /* Retry with specific MIME types, because the wildcard seems to fail
+            * in tinymail.
+            * Actually I'm not sure anymore that it fails, so we could probalby 
+            * remove this later: murrayc */
+           is_text = (
+               tny_mime_part_content_type_is (part, "text/plain") ||
+               tny_mime_part_content_type_is (part, "text/html") );
+               
+               if (is_text) {
+                 g_debug ("%s: Retryting with text/plain or text/html succeeded", 
+                       __FUNCTION__);  
+               }
+       }
+       
+       if (!is_text) {
+           return FALSE;

        }
        }

+       
+       is_text_html = tny_mime_part_content_type_is (part, "text/html");

 
 

-       found = FALSE;
-       len = sizeof (buffer);

        stream = tny_mime_part_get_stream (part);
 
        stream = tny_mime_part_get_stream (part);
 

-       while ((res = read_chunk (stream, buffer, len, &nread))) {
-
+       res = read_chunk (stream, buffer, len, &nread);
+       while (res && (nread > 0)) {

                /* search->text_searcher was instantiated in modest_search_folder(). */
                
                /* search->text_searcher was instantiated in modest_search_folder(). */
                

-               if (is_html) {
+               if (is_text_html) {

 
                        found = ogs_text_searcher_search_html (search->text_searcher,
                                                               buffer,
 
                        found = ogs_text_searcher_search_html (search->text_searcher,
                                                               buffer,

@@ -182,7 +203,9 @@ search_mime_part_ogs (TnyMimePart *part, ModestSearch *search)
                if (found) {
                        break;
                }
                if (found) {
                        break;
                }

-
+               
+               nread = 0;
+               res = read_chunk (stream, buffer, len, &nread);

        }
 
        if (!found) {
        }
 
        if (!found) {

@@ -313,18 +336,59 @@ search_string (const char      *what,
 }
 
 
 }
 
 

+static gboolean search_mime_part_and_child_parts (TnyMimePart *part, ModestSearch *search)
+{
+       gboolean found = FALSE;
+       #ifdef MODEST_HAVE_OGS
+       found = search_mime_part_ogs (part, search);
+       #else
+       found = search_mime_part_strcmp (part, search);
+       #endif
+
+       if (found) {    
+               return found;           
+       }
+       
+       /* Check the child part too, recursively: */
+       TnyList *child_parts = tny_simple_list_new ();
+       tny_mime_part_get_parts (TNY_MIME_PART (part), child_parts);
+
+       TnyIterator *piter = tny_list_create_iterator (child_parts);
+       while (!found && !tny_iterator_is_done (piter)) {
+               TnyMimePart *pcur = (TnyMimePart *) tny_iterator_get_current (piter);
+               if (pcur) {
+                       found = search_mime_part_and_child_parts (pcur, search);
+
+                       g_object_unref (pcur);
+               }
+
+               tny_iterator_next (piter);
+       }
+
+       g_object_unref (piter);
+       g_object_unref (child_parts);
+       
+       return found;
+}

 
 /**
  * modest_search:
  * @folder: a #TnyFolder instance
  * @search: a #ModestSearch query
  *
 
 /**
  * modest_search:
  * @folder: a #TnyFolder instance
  * @search: a #ModestSearch query
  *

- * This operation will search @folder for headers that match the query @search.
+ * This operation will search @folder for headers that match the query @search,
+ * if the folder itself matches the query.

  * It will return a doubly linked list with URIs that point to the message.
  **/
 GList *
 modest_search_folder (TnyFolder *folder, ModestSearch *search)
 {
  * It will return a doubly linked list with URIs that point to the message.
  **/
 GList *
 modest_search_folder (TnyFolder *folder, ModestSearch *search)
 {

+       /* Check that we should be searching this folder. */
+       /* Note that we don't try to search sub-folders. 
+        * Maybe we should, but that should be specified. */
+       if (search->folder && strlen (search->folder) && (strcmp (tny_folder_get_id (folder), search->folder) != 0))
+               return NULL;
+       

        GList *retval = NULL;
        TnyIterator *iter = NULL;
        TnyList *list = NULL;
        GList *retval = NULL;
        TnyIterator *iter = NULL;
        TnyList *list = NULL;

@@ -356,9 +420,13 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
 
        while (!tny_iterator_is_done (iter)) {
                TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter);
 
        while (!tny_iterator_is_done (iter)) {
                TnyHeader *cur = (TnyHeader *) tny_iterator_get_current (iter);

-               time_t t = tny_header_get_date_sent (cur);
+               const time_t t = tny_header_get_date_sent (cur);

                gboolean found = FALSE;
                
                gboolean found = FALSE;
                

+               /* Ignore deleted (not yet expunged) emails: */
+               if (tny_header_get_flags(cur) & TNY_HEADER_FLAG_DELETED)
+                       goto go_next;
+                       

                if (search->flags & MODEST_SEARCH_BEFORE)
                        if (!(t <= search->before))
                                goto go_next;
                if (search->flags & MODEST_SEARCH_BEFORE)
                        if (!(t <= search->before))
                                goto go_next;

@@ -400,8 +468,6 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                        TnyHeaderFlags flags;
                        GError      *err = NULL;
                        TnyMsg      *msg = NULL;
                        TnyHeaderFlags flags;
                        GError      *err = NULL;
                        TnyMsg      *msg = NULL;

-                       TnyIterator *piter;
-                       TnyList     *parts;

 
                        flags = tny_header_get_flags (cur);
 
 
                        flags = tny_header_get_flags (cur);
 

@@ -418,40 +484,17 @@ modest_search_folder (TnyFolder *folder, ModestSearch *search)
                                if (msg) {
                                        g_object_unref (msg);
                                }
                                if (msg) {
                                        g_object_unref (msg);
                                }

-                       }       
-
-                       parts = tny_simple_list_new ();
-                       tny_mime_part_get_parts (TNY_MIME_PART (msg), parts);
+                       } else {        

                        
                        

-                       if (tny_list_get_length(parts) == 0) {
-                               gchar *url_string = tny_msg_get_url_string (msg);
-                               g_debug ("DEBUG: %s: tny_mime_part_get_parts(msg) returned an empty list for message url=%s", 
-                                       __FUNCTION__, url_string);
-                               g_free (url_string);    
-                       }
-
-                       piter = tny_list_create_iterator (parts);
-                       while (!found && !tny_iterator_is_done (piter)) {
-                               TnyMimePart *pcur = (TnyMimePart *) tny_iterator_get_current (piter);
-
-                               #ifdef MODEST_HAVE_OGS
-                               found = search_mime_part_ogs (pcur, search);
-                               #else
-                               found = search_mime_part_strcmp (pcur, search);
-                               #endif
-               
+                               found = search_mime_part_and_child_parts (TNY_MIME_PART (msg), 
+                                                                         search);

                                if (found) {
                                if (found) {

-                                       retval = add_hit (retval, cur, folder);                         
+                                       retval = add_hit (retval, cur, folder);

                                }
                                }

-
-                               g_object_unref (pcur);
-                               tny_iterator_next (piter);

                        }
                        }

-
-                       g_object_unref (piter);
-                       g_object_unref (parts);
-                       g_object_unref (msg);
-
+                       
+                       if (msg)
+                               g_object_unref (msg);

                }
 
 go_next:
                }
 
 go_next:

@@ -488,36 +531,41 @@ modest_search_account (TnyAccount *account, ModestSearch *search)
 
        iter = tny_list_create_iterator (folders);
        while (!tny_iterator_is_done (iter)) {
 
        iter = tny_list_create_iterator (folders);
        while (!tny_iterator_is_done (iter)) {

-               TnyFolder *folder;
-               GList     *res;
+               TnyFolder *folder = NULL;
+               GList     *res = NULL;

 
                folder = TNY_FOLDER (tny_iterator_get_current (iter));
 
                folder = TNY_FOLDER (tny_iterator_get_current (iter));

-               /* g_debug ("DEBUG: %s: searching folder %s.", 
-                       __FUNCTION__, tny_folder_get_name (folder)); */
+               if (folder) {
+                       /* g_debug ("DEBUG: %s: searching folder %s.", 
+                               __FUNCTION__, tny_folder_get_name (folder)); */

                
                

-               res = modest_search_folder (folder, search);
+                       res = modest_search_folder (folder, search);

 
 

-               if (res != NULL) {
-                       if (hits == NULL) {
-                               hits = res;
-                       } else {
-                               hits = g_list_concat (hits, res);
+                       if (res != NULL) {
+                               if (hits == NULL) {
+                                       hits = res;
+                               } else {
+                                       hits = g_list_concat (hits, res);
+                               }

                        }
                        }

+
+                       g_object_unref (folder);

                }
 
                }
 

-               g_object_unref (folder);

                tny_iterator_next (iter);
        }
 
        g_object_unref (iter);
        g_object_unref (folders);
 
                tny_iterator_next (iter);
        }
 
        g_object_unref (iter);
        g_object_unref (folders);
 

+       /* printf ("DEBUG: %s: hits length = %d\n", __FUNCTION__, g_list_length (hits)); */

        return hits;
 }
 
 GList *
 modest_search_all_accounts (ModestSearch *search)
 {
        return hits;
 }
 
 GList *
 modest_search_all_accounts (ModestSearch *search)
 {

+       /* printf ("DEBUG: %s: query=%s\n", __FUNCTION__, search->query); */

        ModestTnyAccountStore *astore;
        TnyList               *accounts;
        TnyIterator           *iter;
        ModestTnyAccountStore *astore;
        TnyList               *accounts;
        TnyIterator           *iter;

@@ -533,31 +581,33 @@ modest_search_all_accounts (ModestSearch *search)
 
        iter = tny_list_create_iterator (accounts);
        while (!tny_iterator_is_done (iter)) {
 
        iter = tny_list_create_iterator (accounts);
        while (!tny_iterator_is_done (iter)) {

-               TnyAccount *account;
-               GList      *res;
+               TnyAccount *account = NULL;
+               GList      *res = NULL;

 
                account = TNY_ACCOUNT (tny_iterator_get_current (iter));
 
                account = TNY_ACCOUNT (tny_iterator_get_current (iter));

-
-               /* g_debug ("DEBUG: %s: Searching account %s",
-                        __FUNCTION__, tny_account_get_name (account)); */
-               res = modest_search_account (account, search);
-               
-               if (res != NULL) {
-
-                       if (hits == NULL) {
-                               hits = res;
-                       } else {
-                               hits = g_list_concat (hits, res);
+               if (account) {
+                       /* g_debug ("DEBUG: %s: Searching account %s",
+                        __FUNCTION__, tny_account_get_name (account)); */
+                       res = modest_search_account (account, search);
+                       
+                       if (res != NULL) {      
+                               if (hits == NULL) {
+                                       hits = res;
+                               } else {
+                                       hits = g_list_concat (hits, res);
+                               }

                        }
                        }

+                       
+                       g_object_unref (account);

                }
 
                }
 

-               g_object_unref (account);

                tny_iterator_next (iter);
        }
 
        g_object_unref (accounts);
        g_object_unref (iter);
 
                tny_iterator_next (iter);
        }
 
        g_object_unref (accounts);
        g_object_unref (iter);
 

+       /* printf ("DEBUG: %s: end: hits length=%d\n", __FUNCTION__, g_list_length(hits)); */

        return hits;
 }
 
        return hits;
 }