4 files changed, 128 insertions, 24 deletions
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
index 4508a95..30f80ff 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.cpp
@@ -1,155 +1,206 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include <libetpan/mailpop3.h>
+#include <libetpan/mailmime.h>
+#include <qfile.h>
 POP3wrapper::POP3wrapper( POP3account *a )
 {
    account = a;
    m_pop3 = NULL;
+    msgTempName = a->getFileName()+"_msg_cache";
+    last_msg_id = 0;
 }
 POP3wrapper::~POP3wrapper()
 {
    logout();
+    QFile msg_cache(msgTempName);
+    if (msg_cache.exists()) {
+        msg_cache.remove();
+    }
 }
 void POP3wrapper::pop3_progress( size_t current, size_t maximum )
 {
    //qDebug( "POP3: %i of %i", current, maximum );
 }
 RecBody POP3wrapper::fetchBody( const RecMail &mail )
 {
    int err = MAILPOP3_NO_ERROR;
    char *message;
    size_t length = 0;
    login();
-    if ( !m_pop3 ) return RecBody();
+    if ( !m_pop3 ) {
-    
-    err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length );
-    if ( err != MAILPOP3_NO_ERROR ) {
-        qDebug( "POP3: error retrieving body with index %i", mail.getNumber() );
        return RecBody();
    }
+    RecBody body;
    
-    return parseBody( message );
+    QFile msg_cache(msgTempName);
+    if (mail.getNumber()!=last_msg_id) {
+        if (msg_cache.exists()) {
+            msg_cache.remove();
+        }
+        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        last_msg_id = mail.getNumber();
+        err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length );    
+        if ( err != MAILPOP3_NO_ERROR ) {
+            qDebug( "POP3: error retrieving body with index %i", mail.getNumber() );
+            last_msg_id = 0;
+            return RecBody();
+        }
+        msg_cache.writeBlock(message,length);
+    } else {    
+        QString msg="";
+        msg_cache.open(IO_ReadOnly);
+        message = new char[4096];
+        memset(message,0,4096);
+        while (msg_cache.readBlock(message,4095)>0) {
+            msg+=message;
+            memset(message,0,4096);
+        }
+        delete message;
+        message = (char*)malloc(msg.length()+1*sizeof(char));
+        memset(message,0,msg.length()+1);
+        memcpy(message,msg.latin1(),msg.length());
+    }
+    body = parseMail(message);
+    free(message);
+    return body;
 }
-RecBody POP3wrapper::parseBody( const char *message )
+RecBody POP3wrapper::parseMail( char *message )
 {
    int err = MAILIMF_NO_ERROR;
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t curTok = 0;
    mailimf_message *result = 0;
    RecBody body;
-    
    err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result );
    if ( err != MAILIMF_NO_ERROR ) {
        if (result) mailimf_message_free(result);
        return body;
    }
    
+    struct mailimf_body * b = 0;
+    struct mailimf_fields * f = 0;
+    
+    
    if ( result && result->msg_body && result->msg_body->bd_text ) {
        qDebug( "POP3: bodytext found" );
        // when curTok isn't set to 0 this line will fault! 'cause upper line faults!
        body.setBodytext( QString( result->msg_body->bd_text ) );
+#if 0
+        curTok = 0;
+        mailmime_content*mresult = 0;
+        size_t index = 0;
+        mailmime_content_parse(result->msg_body->bd_text,
+            strlen(result->msg_body->bd_text),&index,&mresult);
+        if (mresult) {
+            mailmime_content_free(mresult);
+        }
+#endif
+        mailimf_message_free(result);
    }
-    if (result) mailimf_message_free(result);
    return body;
 }
 void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
 {
    int err = MAILPOP3_NO_ERROR;
    char * header = 0;
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t length = 0;
    carray * messages = 0;
    login();
    if (!m_pop3) return;
    mailpop3_list( m_pop3, &messages );
    for (unsigned int i = 0; i < carray_count(messages);++i) {
        mailpop3_msg_info *info;
        err = mailpop3_get_msg_info(m_pop3,i+1,&info);
        if (info->msg_deleted)
            continue;
        err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
        if ( err != MAILPOP3_NO_ERROR ) {
            qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
            free(header);
            return;
        }
        RecMail *mail = parseHeader( header );
        mail->setNumber( info->msg_index );
        mail->setWrapper(this);
        mail->setMsgsize(info->msg_size);
        target.append( mail );
        free(header);
    }
 }
 RecMail *POP3wrapper::parseHeader( const char *header )
 {
    int err = MAILIMF_NO_ERROR;
    size_t curTok = 0;
    RecMail *mail = new RecMail();
    mailimf_fields *fields;
    mailimf_references * refs;
    mailimf_keywords*keys;
    QString status;
    QString value;
    QBitArray mFlags(7);
    err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields );
    for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) {
        mailimf_field *field = (mailimf_field *) current->data;
        switch ( field->fld_type ) {
            case MAILIMF_FIELD_FROM:
                mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) );
                break;
            case MAILIMF_FIELD_TO:
                mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) );
                break;
            case MAILIMF_FIELD_CC:
                mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) );
                break;
            case MAILIMF_FIELD_BCC:
                mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) );
                break;
            case MAILIMF_FIELD_SUBJECT:
                mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
                break;
            case MAILIMF_FIELD_ORIG_DATE:
                mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) );
                break;
            case MAILIMF_FIELD_MESSAGE_ID:
                mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value));
                break;
            case MAILIMF_FIELD_REFERENCES:
                refs = field->fld_data.fld_references;
                if (refs && refs->mid_list && clist_count(refs->mid_list)) {
                    char * text = (char*)refs->mid_list->first->data;
                    mail->setReplyto(QString(text));
                }
                break;
            case MAILIMF_FIELD_KEYWORDS:
                keys = field->fld_data.fld_keywords;
                for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) {
                    qDebug("Keyword: %s",(char*)cur->data);
                }
                break;
            case MAILIMF_FIELD_OPTIONAL_FIELD:
                status = field->fld_data.fld_optional_field->fld_name;
                value = field->fld_data.fld_optional_field->fld_value;
                if (status.lower()=="status") {
                    if (value.lower()=="ro") {
                        mFlags.setBit(FLAG_SEEN);
                    }
                } else if (status.lower()=="x-status") {
                    qDebug("X-Status: %s",value.latin1());
                    if (value.lower()=="a") {
                        
diff --git a/noncore/net/mail/libmailwrapper/pop3wrapper.h b/noncore/net/mail/libmailwrapper/pop3wrapper.h
index 8d3adda..a05021c 100644
--- a/noncore/net/mail/libmailwrapper/pop3wrapper.h
+++ b/noncore/net/mail/libmailwrapper/pop3wrapper.h
@@ -1,48 +1,49 @@
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 #include "mailwrapper.h"
 #include "abstractmail.h"
 class RecMail;
 class RecBody;
 class encodedString;
 struct mailpop3;
 class POP3wrapper : public AbstractMail
 {
    Q_OBJECT
 public:
    POP3wrapper( POP3account *a );
    virtual ~POP3wrapper();
    /* mailbox will be ignored */
    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    virtual QString fetchTextPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part);
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
    RecBody fetchBody( const RecMail &mail );
    static void pop3_progress( size_t current, size_t maximum );
 protected:
    void login();
    void logout();
+    
-private:
    RecMail *parseHeader( const char *header );
-    RecBody parseBody( const char *message );
+    RecBody parseMail( char *message );
    QString parseMailboxList( mailimf_mailbox_list *list );
    QString parseMailbox( mailimf_mailbox *box );
    QString parseGroup( mailimf_group *group );
    QString parseAddressList( mailimf_address_list *list );
    QString parseDateTime( mailimf_date_time *date );
    POP3account *account;
    mailpop3 *m_pop3;
+    QString msgTempName;
+    unsigned int last_msg_id;
 };
 #endif
diff --git a/noncore/net/mail/pop3wrapper.cpp b/noncore/net/mail/pop3wrapper.cpp
index 4508a95..30f80ff 100644
--- a/noncore/net/mail/pop3wrapper.cpp
+++ b/noncore/net/mail/pop3wrapper.cpp
@@ -1,155 +1,206 @@
 #include <stdlib.h>
 #include "pop3wrapper.h"
 #include "mailtypes.h"
 #include <libetpan/mailpop3.h>
+#include <libetpan/mailmime.h>
+#include <qfile.h>
 POP3wrapper::POP3wrapper( POP3account *a )
 {
    account = a;
    m_pop3 = NULL;
+    msgTempName = a->getFileName()+"_msg_cache";
+    last_msg_id = 0;
 }
 POP3wrapper::~POP3wrapper()
 {
    logout();
+    QFile msg_cache(msgTempName);
+    if (msg_cache.exists()) {
+        msg_cache.remove();
+    }
 }
 void POP3wrapper::pop3_progress( size_t current, size_t maximum )
 {
    //qDebug( "POP3: %i of %i", current, maximum );
 }
 RecBody POP3wrapper::fetchBody( const RecMail &mail )
 {
    int err = MAILPOP3_NO_ERROR;
    char *message;
    size_t length = 0;
    login();
-    if ( !m_pop3 ) return RecBody();
+    if ( !m_pop3 ) {
-    
-    err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length );
-    if ( err != MAILPOP3_NO_ERROR ) {
-        qDebug( "POP3: error retrieving body with index %i", mail.getNumber() );
        return RecBody();
    }
+    RecBody body;
    
-    return parseBody( message );
+    QFile msg_cache(msgTempName);
+    if (mail.getNumber()!=last_msg_id) {
+        if (msg_cache.exists()) {
+            msg_cache.remove();
+        }
+        msg_cache.open(IO_ReadWrite|IO_Truncate);
+        last_msg_id = mail.getNumber();
+        err = mailpop3_retr( m_pop3, mail.getNumber(), &message, &length );    
+        if ( err != MAILPOP3_NO_ERROR ) {
+            qDebug( "POP3: error retrieving body with index %i", mail.getNumber() );
+            last_msg_id = 0;
+            return RecBody();
+        }
+        msg_cache.writeBlock(message,length);
+    } else {    
+        QString msg="";
+        msg_cache.open(IO_ReadOnly);
+        message = new char[4096];
+        memset(message,0,4096);
+        while (msg_cache.readBlock(message,4095)>0) {
+            msg+=message;
+            memset(message,0,4096);
+        }
+        delete message;
+        message = (char*)malloc(msg.length()+1*sizeof(char));
+        memset(message,0,msg.length()+1);
+        memcpy(message,msg.latin1(),msg.length());
+    }
+    body = parseMail(message);
+    free(message);
+    return body;
 }
-RecBody POP3wrapper::parseBody( const char *message )
+RecBody POP3wrapper::parseMail( char *message )
 {
    int err = MAILIMF_NO_ERROR;
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t curTok = 0;
    mailimf_message *result = 0;
    RecBody body;
-    
    err = mailimf_message_parse( (char *) message, strlen( message ), &curTok, &result );
    if ( err != MAILIMF_NO_ERROR ) {
        if (result) mailimf_message_free(result);
        return body;
    }
    
+    struct mailimf_body * b = 0;
+    struct mailimf_fields * f = 0;
+    
+    
    if ( result && result->msg_body && result->msg_body->bd_text ) {
        qDebug( "POP3: bodytext found" );
        // when curTok isn't set to 0 this line will fault! 'cause upper line faults!
        body.setBodytext( QString( result->msg_body->bd_text ) );
+#if 0
+        curTok = 0;
+        mailmime_content*mresult = 0;
+        size_t index = 0;
+        mailmime_content_parse(result->msg_body->bd_text,
+            strlen(result->msg_body->bd_text),&index,&mresult);
+        if (mresult) {
+            mailmime_content_free(mresult);
+        }
+#endif
+        mailimf_message_free(result);
    }
-    if (result) mailimf_message_free(result);
    return body;
 }
 void POP3wrapper::listMessages(const QString &, QList<RecMail> &target )
 {
    int err = MAILPOP3_NO_ERROR;
    char * header = 0;
    /* these vars are used recurcive! set it to 0!!!!!!!!!!!!!!!!! */
    size_t length = 0;
    carray * messages = 0;
    login();
    if (!m_pop3) return;
    mailpop3_list( m_pop3, &messages );
    for (unsigned int i = 0; i < carray_count(messages);++i) {
        mailpop3_msg_info *info;
        err = mailpop3_get_msg_info(m_pop3,i+1,&info);
        if (info->msg_deleted)
            continue;
        err = mailpop3_header( m_pop3, info->msg_index, &header, &length );
        if ( err != MAILPOP3_NO_ERROR ) {
            qDebug( "POP3: error retrieving header msgid: %i", info->msg_index );
            free(header);
            return;
        }
        RecMail *mail = parseHeader( header );
        mail->setNumber( info->msg_index );
        mail->setWrapper(this);
        mail->setMsgsize(info->msg_size);
        target.append( mail );
        free(header);
    }
 }
 RecMail *POP3wrapper::parseHeader( const char *header )
 {
    int err = MAILIMF_NO_ERROR;
    size_t curTok = 0;
    RecMail *mail = new RecMail();
    mailimf_fields *fields;
    mailimf_references * refs;
    mailimf_keywords*keys;
    QString status;
    QString value;
    QBitArray mFlags(7);
    err = mailimf_fields_parse( (char *) header, strlen( header ), &curTok, &fields );
    for ( clistiter *current = clist_begin( fields->fld_list ); current != NULL; current = current->next ) {
        mailimf_field *field = (mailimf_field *) current->data;
        switch ( field->fld_type ) {
            case MAILIMF_FIELD_FROM:
                mail->setFrom( parseMailboxList( field->fld_data.fld_from->frm_mb_list ) );
                break;
            case MAILIMF_FIELD_TO:
                mail->setTo( parseAddressList( field->fld_data.fld_to->to_addr_list ) );
                break;
            case MAILIMF_FIELD_CC:
                mail->setCC( parseAddressList( field->fld_data.fld_cc->cc_addr_list ) );
                break;
            case MAILIMF_FIELD_BCC:
                mail->setBcc( parseAddressList( field->fld_data.fld_bcc->bcc_addr_list ) );
                break;
            case MAILIMF_FIELD_SUBJECT:
                mail->setSubject( QString( field->fld_data.fld_subject->sbj_value ) );
                break;
            case MAILIMF_FIELD_ORIG_DATE:
                mail->setDate( parseDateTime( field->fld_data.fld_orig_date->dt_date_time ) );
                break;
            case MAILIMF_FIELD_MESSAGE_ID:
                mail->setMsgid(QString(field->fld_data.fld_message_id->mid_value));
                break;
            case MAILIMF_FIELD_REFERENCES:
                refs = field->fld_data.fld_references;
                if (refs && refs->mid_list && clist_count(refs->mid_list)) {
                    char * text = (char*)refs->mid_list->first->data;
                    mail->setReplyto(QString(text));
                }
                break;
            case MAILIMF_FIELD_KEYWORDS:
                keys = field->fld_data.fld_keywords;
                for (clistcell*cur = clist_begin(keys->kw_list);cur!=0;cur=clist_next(cur)) {
                    qDebug("Keyword: %s",(char*)cur->data);
                }
                break;
            case MAILIMF_FIELD_OPTIONAL_FIELD:
                status = field->fld_data.fld_optional_field->fld_name;
                value = field->fld_data.fld_optional_field->fld_value;
                if (status.lower()=="status") {
                    if (value.lower()=="ro") {
                        mFlags.setBit(FLAG_SEEN);
                    }
                } else if (status.lower()=="x-status") {
                    qDebug("X-Status: %s",value.latin1());
                    if (value.lower()=="a") {
                        
diff --git a/noncore/net/mail/pop3wrapper.h b/noncore/net/mail/pop3wrapper.h
index 8d3adda..a05021c 100644
--- a/noncore/net/mail/pop3wrapper.h
+++ b/noncore/net/mail/pop3wrapper.h
@@ -1,48 +1,49 @@
 #ifndef __POP3WRAPPER
 #define __POP3WRAPPER
 #include "mailwrapper.h"
 #include "abstractmail.h"
 class RecMail;
 class RecBody;
 class encodedString;
 struct mailpop3;
 class POP3wrapper : public AbstractMail
 {
    Q_OBJECT
 public:
    POP3wrapper( POP3account *a );
    virtual ~POP3wrapper();
    /* mailbox will be ignored */
    virtual void listMessages(const QString & mailbox, QList<RecMail> &target );
    virtual QList<Folder>* listFolders();
    virtual QString fetchTextPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchDecodedPart(const RecMail&mail,const RecPart&part);
    virtual encodedString* fetchRawPart(const RecMail&mail,const RecPart&part);
    virtual void deleteMail(const RecMail&mail);
    virtual void answeredMail(const RecMail&mail);
    RecBody fetchBody( const RecMail &mail );
    static void pop3_progress( size_t current, size_t maximum );
 protected:
    void login();
    void logout();
+    
-private:
    RecMail *parseHeader( const char *header );
-    RecBody parseBody( const char *message );
+    RecBody parseMail( char *message );
    QString parseMailboxList( mailimf_mailbox_list *list );
    QString parseMailbox( mailimf_mailbox *box );
    QString parseGroup( mailimf_group *group );
    QString parseAddressList( mailimf_address_list *list );
    QString parseDateTime( mailimf_date_time *date );
    POP3account *account;
    mailpop3 *m_pop3;
+    QString msgTempName;
+    unsigned int last_msg_id;
 };
 #endif