Diffstat (limited to 'noncore/net/mail/libmailwrapper') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.cpp | 170 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/imapwrapper.h | 6 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.cpp | 33 | ||||
-rw-r--r-- | noncore/net/mail/libmailwrapper/mailtypes.h | 10 |
4 files changed, 114 insertions, 105 deletions
diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.cpp b/noncore/net/mail/libmailwrapper/imapwrapper.cpp index 725dcc9..5ce140e 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.cpp +++ b/noncore/net/mail/libmailwrapper/imapwrapper.cpp @@ -218,4 +218,5 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) mailimap_flag_fetch*cflag; QBitArray mFlags(7); + QStringList addresslist; if (!m_att) { @@ -223,8 +224,4 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } -#if 0 - MAILIMAP_FLAG_KEYWORD, /* keyword flag */ - MAILIMAP_FLAG_EXTENSION, /* \extension flag */ -#endif c = clist_begin(m_att->list); while ( c ) { @@ -277,37 +274,30 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) date = head->date; subject = head->subject; - if (head->from!=NULL) - current_from = head->from->list->first; - while (current_from != NULL) { - from = ""; - named_from = false; - current_address=(mailimap_address*)current_from->data; - current_from = current_from->next; - if (current_address->personal_name){ - from+=QString(current_address->personal_name); - from+=" "; - named_from = true; - } - if (named_from && (current_address->mailbox_name || current_address->host_name)) { - from+="<"; - } - if (current_address->mailbox_name) { - from+=QString(current_address->mailbox_name); - from+="@"; - } - if (current_address->host_name) { - from+=QString(current_address->host_name); - } - if (named_from && (current_address->mailbox_name || current_address->host_name)) { - from+=">"; + m = new RecMail(); + if (head->from!=NULL) { + addresslist = address_list_to_stringlist(head->from->list); + if (addresslist.count()) { + from = addresslist.first(); } } - qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s", - from.latin1(), - subject.latin1(),date.latin1()); - m = new RecMail(); + if (head->to!=NULL) { + addresslist = address_list_to_stringlist(head->to->list); + m->setTo(addresslist); + } + if (head->cc!=NULL) { + addresslist = address_list_to_stringlist(head->cc->list); + m->setCC(addresslist); + } + if (head->bcc!=NULL) { + addresslist = address_list_to_stringlist(head->bcc->list); + m->setBcc(addresslist); + } m->setSubject(subject); m->setFrom(from); m->setDate(date); + m->setMsgid(QString(head->message_id)); + qDebug("header: \nFrom: %s\nSubject: %s\nDate: %s\nMsgid: %s", + from.latin1(), + subject.latin1(),date.latin1(),m->Msgid().latin1()); } else if (item->msg_att_static->type==MAILIMAP_MSG_ATT_INTERNALDATE) { mailimap_date_time*d = item->msg_att_static->internal_date; @@ -330,62 +320,7 @@ RecMail*IMAPwrapper::parse_list_result(mailimap_msg_att* m_att) } -#if 1 RecBody IMAPwrapper::fetchBody(const RecMail&mail) { RecBody body; - QString body_text; - - const char *mb; - int err = MAILIMAP_NO_ERROR; - clist *result; - clistcell *current; - mailimap_fetch_att *fetchAtt; - mailimap_fetch_type *fetchType; - mailimap_set *set; - - mb = mail.getMbox().latin1(); - - login(); - if (!m_imap) { - return body; - } - /* select mailbox READONLY for operations */ - err = mailimap_examine( m_imap, (char*)mb); - if ( err != MAILIMAP_NO_ERROR ) { - qDebug("error selecting mailbox: %s",m_imap->response); - logout(); - return body; - } - result = clist_new(); - /* the range has to start at 1!!! not with 0!!!! */ - set = mailimap_set_new_interval( mail.getNumber(),mail.getNumber() ); - fetchAtt = mailimap_fetch_att_new_rfc822_text(); - fetchType = mailimap_fetch_type_new_fetch_att(fetchAtt); - err = mailimap_fetch( m_imap, set, fetchType, &result ); - mailimap_set_free( set ); - mailimap_fetch_type_free( fetchType ); - - if (err == MAILIMAP_NO_ERROR && (current=clist_begin(result)) ) { - mailimap_msg_att * msg_att; - msg_att = (mailimap_msg_att*)current->data; - mailimap_msg_att_item*item = (mailimap_msg_att_item*)msg_att->list->first->data; - - if (item->msg_att_static && item->msg_att_static->rfc822_text) { - body_text = item->msg_att_static->rfc822_text; - body.setBodytext(body_text); - } - } else { - qDebug("error fetching text: %s",m_imap->response); - } - - clist_free(result); - logout(); - return body; -} - -#else -QString IMAPwrapper::fetchBody(const RecMail&mail) -{ - QString body = ""; const char *mb; int err = MAILIMAP_NO_ERROR; @@ -425,5 +360,5 @@ QString IMAPwrapper::fetchBody(const RecMail&mail) body_desc = item->msg_att_static->body; if (body_desc->type==MAILIMAP_BODY_1PART) { - body = searchBodyText(mail,body_desc->body_1part); + searchBodyText(mail,body_desc->body_1part,body); } else { } @@ -437,26 +372,24 @@ QString IMAPwrapper::fetchBody(const RecMail&mail) return body; } -#endif -QString IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription) +void IMAPwrapper::searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body) { - QString Body=""; if (!mailDescription) { - return Body; + return; } switch (mailDescription->type) { case MAILIMAP_BODY_TYPE_1PART_TEXT: - return getPlainBody(mail); + fillPlainBody(mail,target_body,mailDescription->body_type_text); break; default: break; } - return Body; + return; } -QString IMAPwrapper::getPlainBody(const RecMail&mail) +void IMAPwrapper::fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body) { - QString body = ""; const char *mb; + QString body=""; int err = MAILIMAP_NO_ERROR; clist *result; @@ -469,6 +402,7 @@ QString IMAPwrapper::getPlainBody(const RecMail&mail) if (!m_imap) { - return body; + return; } + result = clist_new(); /* the range has to start at 1!!! not with 0!!!! */ @@ -491,4 +425,44 @@ QString IMAPwrapper::getPlainBody(const RecMail&mail) } clist_free(result); - return body; + target_body.setBodytext(body); + return; +} + +QStringList IMAPwrapper::address_list_to_stringlist(clist*list) +{ + QStringList l; + QString from; + bool named_from; + clistcell *current = NULL; + mailimap_address * current_address=NULL; + if (!list) { + return l; + } + current = clist_begin(list); + while (current!= NULL) { + from = ""; + named_from = false; + current_address=(mailimap_address*)current->data; + current = current->next; + if (current_address->personal_name){ + from+=QString(current_address->personal_name); + from+=" "; + named_from = true; + } + if (named_from && (current_address->mailbox_name || current_address->host_name)) { + from+="<"; + } + if (current_address->mailbox_name) { + from+=QString(current_address->mailbox_name); + from+="@"; + } + if (current_address->host_name) { + from+=QString(current_address->host_name); + } + if (named_from && (current_address->mailbox_name || current_address->host_name)) { + from+=">"; + } + l.append(QString(from)); + } + return l; } diff --git a/noncore/net/mail/libmailwrapper/imapwrapper.h b/noncore/net/mail/libmailwrapper/imapwrapper.h index 1423faf..6565896 100644 --- a/noncore/net/mail/libmailwrapper/imapwrapper.h +++ b/noncore/net/mail/libmailwrapper/imapwrapper.h @@ -7,4 +7,5 @@ struct mailimap; struct mailimap_body_type_1part; +struct mailimap_body_type_text; class RecMail; class RecBody; @@ -26,6 +27,7 @@ protected: void login(); void logout(); - QString searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription); - QString getPlainBody(const RecMail&mail); + void searchBodyText(const RecMail&mail,mailimap_body_type_1part*mailDescription,RecBody&target_body); + void fillPlainBody(const RecMail&mail,RecBody&target_body, mailimap_body_type_text * text_body); + QStringList address_list_to_stringlist(clist*list); private: diff --git a/noncore/net/mail/libmailwrapper/mailtypes.cpp b/noncore/net/mail/libmailwrapper/mailtypes.cpp index 9f2c9e3..f9e5794 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.cpp +++ b/noncore/net/mail/libmailwrapper/mailtypes.cpp @@ -3,6 +3,36 @@ RecMail::RecMail() - :subject(""),date(""),mbox(""),msg_number(0),msg_flags(7) + :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) { + init(); +} + +RecMail::RecMail(const RecMail&old) + :subject(""),date(""),from(""),mbox(""),msg_id(""),msg_number(0),msg_flags(7) +{ + init(); + copy_old(old); + qDebug("Copy constructor RecMail"); +} + +void RecMail::copy_old(const RecMail&old) +{ + subject = old.subject; + date = old.date; + mbox = old.mbox; + msg_id = old.msg_id; + msg_number = old.msg_number; + from = old.from; + msg_flags = old.msg_flags; + to = old.to; + cc = old.cc; + bcc = old.bcc; +} + +void RecMail::init() +{ + to.clear(); + cc.clear(); + bcc.clear(); } @@ -37,5 +67,4 @@ const QStringList& RecMail::Bcc()const } - RecPart::RecPart() : m_type(""),m_subtype(""),m_identifier(""),m_encoding("") diff --git a/noncore/net/mail/libmailwrapper/mailtypes.h b/noncore/net/mail/libmailwrapper/mailtypes.h index bb6a483..c8d533a 100644 --- a/noncore/net/mail/libmailwrapper/mailtypes.h +++ b/noncore/net/mail/libmailwrapper/mailtypes.h @@ -30,4 +30,5 @@ class RecMail public: RecMail(); + RecMail(const RecMail&old); virtual ~RecMail(){} @@ -42,5 +43,7 @@ public: const QString&getMbox()const{return mbox;} void setMbox(const QString&box){mbox = box;} - + void setMsgid(const QString&id){msg_id=id;} + const QString&Msgid()const{return msg_id;} + void setTo(const QStringList&list); const QStringList&To()const; @@ -49,13 +52,14 @@ public: void setBcc(const QStringList&list); const QStringList&Bcc()const; - const QBitArray&getFlags()const{return msg_flags;} void setFlags(const QBitArray&flags){msg_flags = flags;} protected: - QString subject,date,from,mbox; + QString subject,date,from,mbox,msg_id; int msg_number; QBitArray msg_flags; QStringList to,cc,bcc; + void init(); + void copy_old(const RecMail&old); }; |