aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--examples/example6.cpp91
-rw-r--r--src/vmime/net/folder.hpp25
-rw-r--r--src/vmime/net/imap/IMAPFolder.cpp34
-rw-r--r--src/vmime/net/imap/IMAPFolder.hpp18
-rw-r--r--src/vmime/net/imap/IMAPParser.hpp164
-rw-r--r--src/vmime/net/imap/IMAPUtils.cpp24
-rw-r--r--src/vmime/net/imap/IMAPUtils.hpp7
-rw-r--r--src/vmime/net/maildir/maildirFolder.cpp18
-rw-r--r--src/vmime/net/maildir/maildirFolder.hpp6
-rw-r--r--src/vmime/net/messageSet.cpp19
-rw-r--r--src/vmime/net/messageSet.hpp19
-rw-r--r--src/vmime/net/pop3/POP3Folder.cpp7
-rw-r--r--src/vmime/net/pop3/POP3Folder.hpp6
13 files changed, 399 insertions, 39 deletions
diff --git a/examples/example6.cpp b/examples/example6.cpp
index d2206e7a..30767c3e 100644
--- a/examples/example6.cpp
+++ b/examples/example6.cpp
@@ -563,6 +563,8 @@ static void connectStore()
choices.push_back("Status");
choices.push_back("List folders");
choices.push_back("Change folder");
+ choices.push_back("Add message (to the current folder)");
+ choices.push_back("Copy message (into the current folder)");
choices.push_back("Return to main menu");
const int choice = printMenu(choices);
@@ -570,7 +572,7 @@ static void connectStore()
// Request message number
vmime::shared_ptr <vmime::net::message> msg;
- if (choice != 6 && choice != 7 && choice != 8)
+ if (choice == 1 || choice == 2 || choice == 3 || choice == 4 || choice == 5 || choice == 10)
{
std::cout << "Enter message number: ";
std::cout.flush();
@@ -583,7 +585,7 @@ static void connectStore()
int num = 0;
iss >> num;
- if (num < 1 || num > count)
+ if (num < 1 || num > f->getMessageCount())
{
std::cerr << "Invalid message number." << std::endl;
continue;
@@ -722,8 +724,91 @@ static void connectStore()
break;
}
- // Main menu
+ // Add message
case 9:
+ {
+ vmime::messageBuilder mb;
+
+ mb.setExpeditor(vmime::mailbox("[email protected]"));
+
+ vmime::addressList to;
+ to.appendAddress(vmime::make_shared <vmime::mailbox>("[email protected]"));
+ mb.setRecipients(to);
+
+ mb.setSubject(vmime::text("Test message from VMime example6"));
+ mb.getTextPart()->setText(vmime::make_shared <vmime::stringContentHandler>(
+ "Body of test message from VMime example6."));
+
+ vmime::shared_ptr <vmime::message> msg = mb.construct();
+
+ vmime::net::messageSet set = f->addMessage(msg);
+
+ if (set.isEmpty())
+ {
+ std::cout << "Message has successfully been added, "
+ << "but its UID/number is not known." << std::endl;
+ }
+ else
+ {
+ const vmime::net::messageRange& range = set.getRangeAt(0);
+
+ if (set.isUIDSet())
+ {
+ const vmime::net::message::uid uid =
+ dynamic_cast <const vmime::net::UIDMessageRange&>(range).getFirst();
+
+ std::cout << "Message has successfully been added, "
+ << "its UID is '" << uid << "'." << std::endl;
+ }
+ else
+ {
+ const int number =
+ dynamic_cast <const vmime::net::numberMessageRange&>(range).getFirst();
+
+ std::cout << "Message has successfully been added, "
+ << "its number is '" << number << "'." << std::endl;
+ }
+ }
+
+ break;
+ }
+ // Copy message
+ case 10:
+ {
+ vmime::net::messageSet set = f->copyMessages(f->getFullPath(),
+ vmime::net::messageSet::byNumber(msg->getNumber()));
+
+ if (set.isEmpty())
+ {
+ std::cout << "Message has successfully been copied, "
+ << "but its UID/number is not known." << std::endl;
+ }
+ else
+ {
+ const vmime::net::messageRange& range = set.getRangeAt(0);
+
+ if (set.isUIDSet())
+ {
+ const vmime::net::message::uid uid =
+ dynamic_cast <const vmime::net::UIDMessageRange&>(range).getFirst();
+
+ std::cout << "Message has successfully been copied, "
+ << "its UID is '" << uid << "'." << std::endl;
+ }
+ else
+ {
+ const int number =
+ dynamic_cast <const vmime::net::numberMessageRange&>(range).getFirst();
+
+ std::cout << "Message has successfully been copied, "
+ << "its number is '" << number << "'." << std::endl;
+ }
+ }
+
+ break;
+ }
+ // Main menu
+ case 11:
f->close(true); // 'true' to expunge deleted messages
cont = false;
diff --git a/src/vmime/net/folder.hpp b/src/vmime/net/folder.hpp
index 38ba4597..98c88169 100644
--- a/src/vmime/net/folder.hpp
+++ b/src/vmime/net/folder.hpp
@@ -269,9 +269,16 @@ public:
* @param flags flags for the new message
* @param date date/time for the new message (if NULL, the current time is used)
* @param progress progress listener, or NULL if not used
+ * @return a message set containing the number or UID of the new message, or
+ * an empty set if the information could not be obtained (ie. the server does not
+ * support returning the number or UID of an added message)
* @throw exceptions::net_exception if an error occurs
*/
- virtual void addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL) = 0;
+ virtual messageSet addMessage
+ (shared_ptr <vmime::message> msg,
+ const int flags = message::FLAG_UNDEFINED,
+ vmime::datetime* date = NULL,
+ utility::progressListener* progress = NULL) = 0;
/** Add a message to this folder.
*
@@ -280,17 +287,29 @@ public:
* @param flags flags for the new message
* @param date date/time for the new message (if NULL, the current time is used)
* @param progress progress listener, or NULL if not used
+ * @return a message set containing the number or UID of the new message, or
+ * an empty set if the information could not be obtained (ie. the server does not
+ * support returning the number or UID of an added message)
* @throw exceptions::net_exception if an error occurs
*/
- virtual void addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL) = 0;
+ virtual messageSet addMessage
+ (utility::inputStream& is,
+ const size_t size,
+ const int flags = message::FLAG_UNDEFINED,
+ vmime::datetime* date = NULL,
+ utility::progressListener* progress = NULL) = 0;
/** Copy messages from this folder to another folder.
*
* @param dest destination folder path
* @param msgs index set of messages to copy
+ * @return a message set containing the number(s) or UID(s) of the copied message(s),
+ * or an empty set if the information could not be obtained (ie. the server does not
+ * support returning the number or UID of a copied message)
* @throw exceptions::net_exception if an error occurs
*/
- virtual void copyMessages(const folder::path& dest, const messageSet& msgs) = 0;
+ virtual messageSet copyMessages
+ (const folder::path& dest, const messageSet& msgs) = 0;
/** Request folder status without opening it.
*
diff --git a/src/vmime/net/imap/IMAPFolder.cpp b/src/vmime/net/imap/IMAPFolder.cpp
index fb98887c..f7de6bfe 100644
--- a/src/vmime/net/imap/IMAPFolder.cpp
+++ b/src/vmime/net/imap/IMAPFolder.cpp
@@ -990,8 +990,9 @@ void IMAPFolder::setMessageFlags(const messageSet& msgs, const int flags, const
}
-void IMAPFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
- vmime::datetime* date, utility::progressListener* progress)
+messageSet IMAPFolder::addMessage
+ (shared_ptr <vmime::message> msg, const int flags,
+ vmime::datetime* date, utility::progressListener* progress)
{
std::ostringstream oss;
utility::outputStreamAdapter ossAdapter(oss);
@@ -1001,12 +1002,13 @@ void IMAPFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
const string& str = oss.str();
utility::inputStreamStringAdapter strAdapter(str);
- addMessage(strAdapter, str.length(), flags, date, progress);
+ return addMessage(strAdapter, str.length(), flags, date, progress);
}
-void IMAPFolder::addMessage(utility::inputStream& is, const size_t size, const int flags,
- vmime::datetime* date, utility::progressListener* progress)
+messageSet IMAPFolder::addMessage
+ (utility::inputStream& is, const size_t size, const int flags,
+ vmime::datetime* date, utility::progressListener* progress)
{
shared_ptr <IMAPStore> store = m_store.lock();
@@ -1063,6 +1065,8 @@ void IMAPFolder::addMessage(utility::inputStream& is, const size_t size, const i
resp->getErrorLog(), "bad response");
}
+ processStatusUpdate(resp.get());
+
// Send message data
const size_t total = size;
size_t current = 0;
@@ -1105,7 +1109,15 @@ void IMAPFolder::addMessage(utility::inputStream& is, const size_t size, const i
resp->getErrorLog(), "bad response");
}
- processStatusUpdate(resp.get());
+ processStatusUpdate(finalResp.get());
+
+ const IMAPParser::resp_text_code* respTextCode =
+ finalResp->response_done()->response_tagged()->resp_cond_state()->resp_text()->resp_text_code();
+
+ if (respTextCode->type() == IMAPParser::resp_text_code::APPENDUID)
+ return IMAPUtils::buildMessageSet(respTextCode->uid_set());
+
+ return messageSet::empty();
}
@@ -1209,7 +1221,7 @@ void IMAPFolder::rename(const folder::path& newPath)
}
-void IMAPFolder::copyMessages(const folder::path& dest, const messageSet& set)
+messageSet IMAPFolder::copyMessages(const folder::path& dest, const messageSet& set)
{
shared_ptr <IMAPStore> store = m_store.lock();
@@ -1240,6 +1252,14 @@ void IMAPFolder::copyMessages(const folder::path& dest, const messageSet& set)
}
processStatusUpdate(resp.get());
+
+ const IMAPParser::resp_text_code* respTextCode =
+ resp->response_done()->response_tagged()->resp_cond_state()->resp_text()->resp_text_code();
+
+ if (respTextCode->type() == IMAPParser::resp_text_code::COPYUID)
+ return IMAPUtils::buildMessageSet(respTextCode->uid_set2());
+
+ return messageSet::empty();
}
diff --git a/src/vmime/net/imap/IMAPFolder.hpp b/src/vmime/net/imap/IMAPFolder.hpp
index cc7334ff..8b31f10f 100644
--- a/src/vmime/net/imap/IMAPFolder.hpp
+++ b/src/vmime/net/imap/IMAPFolder.hpp
@@ -105,10 +105,20 @@ public:
void setMessageFlags(const messageSet& msgs, const int flags, const int mode = message::FLAG_MODE_SET);
- void addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
- void addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
-
- void copyMessages(const folder::path& dest, const messageSet& msgs);
+ messageSet addMessage
+ (shared_ptr <vmime::message> msg,
+ const int flags = message::FLAG_UNDEFINED,
+ vmime::datetime* date = NULL,
+ utility::progressListener* progress = NULL);
+
+ messageSet addMessage
+ (utility::inputStream& is,
+ const size_t size,
+ const int flags = message::FLAG_UNDEFINED,
+ vmime::datetime* date = NULL,
+ utility::progressListener* progress = NULL);
+
+ messageSet copyMessages(const folder::path& dest, const messageSet& msgs);
void status(int& count, int& unseen);
shared_ptr <folderStatus> getStatus();
diff --git a/src/vmime/net/imap/IMAPParser.hpp b/src/vmime/net/imap/IMAPParser.hpp
index 8c7fcb60..ad5d57a2 100644
--- a/src/vmime/net/imap/IMAPParser.hpp
+++ b/src/vmime/net/imap/IMAPParser.hpp
@@ -552,6 +552,119 @@ public:
//
+ // uniqueid ::= nz_number
+ // ;; Strictly ascending
+ //
+
+ class uniqueid : public nz_number
+ {
+ public:
+
+ uniqueid() : nz_number()
+ {
+ }
+ };
+
+
+ // uid-range = (uniqueid ":" uniqueid)
+ // ; two uniqueid values and all values
+ // ; between these two regards of order.
+ // ; Example: 2:4 and 4:2 are equivalent.
+
+ class uid_range : public component
+ {
+ public:
+
+ uid_range()
+ : m_uniqueid1(NULL), m_uniqueid2(NULL)
+ {
+ }
+
+ ~uid_range()
+ {
+ delete m_uniqueid1;
+ delete m_uniqueid2;
+ }
+
+ void go(IMAPParser& parser, string& line, size_t* currentPos)
+ {
+ DEBUG_ENTER_COMPONENT("uid_range");
+
+ size_t pos = *currentPos;
+
+ m_uniqueid1 = parser.get <uniqueid>(line, &pos);
+ parser.check <one_char <','> >(line, &pos);
+ m_uniqueid2 = parser.get <uniqueid>(line, &pos);
+
+ *currentPos = pos;
+ }
+
+ private:
+
+ uniqueid* m_uniqueid1;
+ uniqueid* m_uniqueid2;
+
+ public:
+
+ uniqueid* uniqueid1() const { return m_uniqueid1; }
+ uniqueid* uniqueid2() const { return m_uniqueid2; }
+ };
+
+
+ //
+ // uid-set = (uniqueid / uid-range) *("," uid-set)
+ //
+
+ class uid_set : public component
+ {
+ public:
+
+ uid_set()
+ : m_uniqueid(NULL), m_uid_range(NULL), m_next_uid_set(NULL)
+ {
+ }
+
+ ~uid_set()
+ {
+ delete m_uniqueid;
+ delete m_uid_range;
+ delete m_next_uid_set;
+ }
+
+ void go(IMAPParser& parser, string& line, size_t* currentPos)
+ {
+ DEBUG_ENTER_COMPONENT("uid_set");
+
+ size_t pos = *currentPos;
+
+ // We have either a 'uid_range' or a 'uniqueid'
+ if (!(m_uid_range = parser.get <IMAPParser::uid_range>(line, &pos, true)))
+ m_uniqueid = parser.get <IMAPParser::uniqueid>(line, &pos);
+
+ // And maybe another 'uid-set' following
+ if (parser.check <one_char <','> >(line, &pos, true))
+ m_next_uid_set = parser.get <IMAPParser::uid_set>(line, &pos);
+
+ *currentPos = pos;
+ }
+
+ private:
+
+ IMAPParser::uniqueid* m_uniqueid;
+ IMAPParser::uid_range* m_uid_range;
+
+ IMAPParser::uid_set* m_next_uid_set;
+
+ public:
+
+ IMAPParser::uniqueid* uniqueid() const { return m_uniqueid; }
+ IMAPParser::uid_range* uid_range() const { return m_uid_range; }
+
+ IMAPParser::uid_set* next_uid_set() const { return m_next_uid_set; }
+ };
+
+
+ //
// text ::= 1*TEXT_CHAR
//
// CHAR ::= <any 7-bit US-ASCII character except NUL, 0x01 - 0x7f>
@@ -3850,10 +3963,6 @@ public:
};
- //
- // uniqueid ::= nz_number
- // ;; Strictly ascending
- //
// msg_att_item ::= "ENVELOPE" SPACE envelope /
// "FLAGS" SPACE "(" #(flag / "\Recent") ")" /
// "INTERNALDATE" SPACE date_time /
@@ -4020,7 +4129,7 @@ public:
parser.checkWithArg <special_atom>(line, &pos, "uid");
parser.check <SPACE>(line, &pos);
- m_uniqueid = parser.get <nz_number>(line, &pos);
+ m_uniqueid = parser.get <uniqueid>(line, &pos);
}
*currentPos = pos;
@@ -4050,7 +4159,7 @@ public:
IMAPParser::date_time* m_date_time;
IMAPParser::number* m_number;
IMAPParser::envelope* m_envelope;
- IMAPParser::nz_number* m_uniqueid;
+ IMAPParser::uniqueid* m_uniqueid;
IMAPParser::nstring* m_nstring;
IMAPParser::xbody* m_body;
IMAPParser::flag_list* m_flag_list;
@@ -4064,7 +4173,7 @@ public:
const IMAPParser::date_time* date_time() const { return (m_date_time); }
const IMAPParser::number* number() const { return (m_number); }
const IMAPParser::envelope* envelope() const { return (m_envelope); }
- const IMAPParser::nz_number* unique_id() const { return (m_uniqueid); }
+ const IMAPParser::uniqueid* unique_id() const { return (m_uniqueid); }
const IMAPParser::nstring* nstring() const { return (m_nstring); }
const IMAPParser::xbody* body() const { return (m_body); }
const IMAPParser::flag_list* flag_list() const { return (m_flag_list); }
@@ -4195,6 +4304,7 @@ public:
// "READ-ONLY" / "READ-WRITE" / "TRYCREATE" /
// "UIDVALIDITY" SPACE nz_number /
// "UNSEEN" SPACE nz_number /
+ // "UIDNEXT" SPACE nz-number /
// atom [SPACE 1*<any TEXT_CHAR except "]">]
//
// IMAP Extension for Conditional STORE (RFC-4551):
@@ -4202,6 +4312,12 @@ public:
// resp-text-code =/ "HIGHESTMODSEQ" SP mod-sequence-value /
// "NOMODSEQ" /
// "MODIFIED" SP set
+ //
+ // IMAP UIDPLUS Extension (RFC-4315):
+ //
+ // resp-text-code =/ "APPENDUID" SP nz-number SP append-uid /
+ // "COPYUID" SP nz-number SP uid-set SP uid-set /
+ // "UIDNOTSTICKY"
class resp_text_code : public component
{
@@ -4313,6 +4429,33 @@ public:
m_sequence_set = parser.get <IMAPParser::sequence_set>(line, &pos);
}
+ // "APPENDUID" SP nz-number SP append-uid
+ else if (parser.checkWithArg <special_atom>(line, &pos, "appenduid", true))
+ {
+ m_type = APPENDUID;
+
+ parser.check <SPACE>(line, &pos);
+ m_nz_number = parser.get <IMAPParser::nz_number>(line, &pos);
+ parser.check <SPACE>(line, &pos);
+ m_uid_set = parser.get <IMAPParser::uid_set>(line, &pos);
+ }
+ // "COPYUID" SP nz-number SP uid-set SP uid-set
+ else if (parser.checkWithArg <special_atom>(line, &pos, "copyuid", true))
+ {
+ m_type = COPYUID;
+
+ parser.check <SPACE>(line, &pos);
+ m_nz_number = parser.get <IMAPParser::nz_number>(line, &pos);
+ parser.check <SPACE>(line, &pos);
+ m_uid_set = parser.get <IMAPParser::uid_set>(line, &pos);
+ parser.check <SPACE>(line, &pos);
+ m_uid_set2 = parser.get <IMAPParser::uid_set>(line, &pos);
+ }
+ // "UIDNOTSTICKY"
+ else if (parser.checkWithArg <special_atom>(line, &pos, "uidnotsticky", true))
+ {
+ m_type = UIDNOTSTICKY;
+ }
// atom [SPACE 1*<any TEXT_CHAR except "]">]
else
{
@@ -4334,6 +4477,9 @@ public:
HIGHESTMODSEQ,
NOMODSEQ,
MODIFIED,
+ APPENDUID,
+ COPYUID,
+ UIDNOTSTICKY,
// Standard IMAP
ALERT,
@@ -4360,6 +4506,8 @@ public:
IMAPParser::mod_sequence_value* m_mod_sequence_value;
IMAPParser::sequence_set* m_sequence_set;
IMAPParser::capability_data* m_capability_data;
+ IMAPParser::uid_set* m_uid_set;
+ IMAPParser::uid_set* m_uid_set2;
public:
@@ -4372,6 +4520,8 @@ public:
const IMAPParser::mod_sequence_value* mod_sequence_value() const { return m_mod_sequence_value; }
const IMAPParser::sequence_set* sequence_set() const { return m_sequence_set; }
const IMAPParser::capability_data* capability_data() const { return m_capability_data; }
+ const IMAPParser::uid_set* uid_set() const { return (m_uid_set); }
+ const IMAPParser::uid_set* uid_set2() const { return (m_uid_set2); }
};
diff --git a/src/vmime/net/imap/IMAPUtils.cpp b/src/vmime/net/imap/IMAPUtils.cpp
index ff81ce71..00f84d44 100644
--- a/src/vmime/net/imap/IMAPUtils.cpp
+++ b/src/vmime/net/imap/IMAPUtils.cpp
@@ -749,6 +749,30 @@ const std::vector <int> IMAPUtils::messageSetToNumberList(const messageSet& msgs
}
+// static
+messageSet IMAPUtils::buildMessageSet(const IMAPParser::uid_set* uidSet)
+{
+ messageSet set = messageSet::empty();
+
+ for ( ; uidSet ; uidSet = uidSet->next_uid_set())
+ {
+ if (uidSet->uid_range())
+ {
+ set.addRange(UIDMessageRange
+ (message::uid(uidSet->uid_range()->uniqueid1()->value()),
+ message::uid(uidSet->uid_range()->uniqueid2()->value())));
+ }
+ else
+ {
+ set.addRange(UIDMessageRange
+ (message::uid(uidSet->uniqueid()->value())));
+ }
+ }
+
+ return set;
+}
+
+
} // imap
} // net
} // vmime
diff --git a/src/vmime/net/imap/IMAPUtils.hpp b/src/vmime/net/imap/IMAPUtils.hpp
index 988b6a2c..afca98d6 100644
--- a/src/vmime/net/imap/IMAPUtils.hpp
+++ b/src/vmime/net/imap/IMAPUtils.hpp
@@ -112,6 +112,13 @@ public:
*/
static const std::vector <int> messageSetToNumberList(const messageSet& msgs);
+ /** Constructs a message set from a parser 'uid_set' structure.
+ *
+ * @param uidSet UID set, as returned by the parser
+ * @return message set
+ */
+ static messageSet buildMessageSet(const IMAPParser::uid_set* uidSet);
+
private:
static const string buildFetchRequestImpl
diff --git a/src/vmime/net/maildir/maildirFolder.cpp b/src/vmime/net/maildir/maildirFolder.cpp
index 660178ff..7280f639 100644
--- a/src/vmime/net/maildir/maildirFolder.cpp
+++ b/src/vmime/net/maildir/maildirFolder.cpp
@@ -704,8 +704,9 @@ void maildirFolder::setMessageFlags
}
-void maildirFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
- vmime::datetime* date, utility::progressListener* progress)
+messageSet maildirFolder::addMessage
+ (shared_ptr <vmime::message> msg, const int flags,
+ vmime::datetime* date, utility::progressListener* progress)
{
std::ostringstream oss;
utility::outputStreamAdapter ossAdapter(oss);
@@ -715,12 +716,13 @@ void maildirFolder::addMessage(shared_ptr <vmime::message> msg, const int flags,
const string& str = oss.str();
utility::inputStreamStringAdapter strAdapter(str);
- addMessage(strAdapter, str.length(), flags, date, progress);
+ return addMessage(strAdapter, str.length(), flags, date, progress);
}
-void maildirFolder::addMessage(utility::inputStream& is, const size_t size,
- const int flags, vmime::datetime* /* date */, utility::progressListener* progress)
+messageSet maildirFolder::addMessage
+ (utility::inputStream& is, const size_t size,
+ const int flags, vmime::datetime* /* date */, utility::progressListener* progress)
{
shared_ptr <maildirStore> store = m_store.lock();
@@ -810,6 +812,8 @@ void maildirFolder::addMessage(utility::inputStream& is, const size_t size,
(*it)->notifyMessageCount(event);
}
}
+
+ return messageSet::empty();
}
@@ -902,7 +906,7 @@ void maildirFolder::copyMessageImpl(const utility::file::path& tmpDirPath,
}
-void maildirFolder::copyMessages(const folder::path& dest, const messageSet& msgs)
+messageSet maildirFolder::copyMessages(const folder::path& dest, const messageSet& msgs)
{
shared_ptr <maildirStore> store = m_store.lock();
@@ -972,6 +976,8 @@ void maildirFolder::copyMessages(const folder::path& dest, const messageSet& msg
}
notifyMessagesCopied(dest);
+
+ return messageSet::empty();
}
diff --git a/src/vmime/net/maildir/maildirFolder.hpp b/src/vmime/net/maildir/maildirFolder.hpp
index 5cff53fc..8b2548ed 100644
--- a/src/vmime/net/maildir/maildirFolder.hpp
+++ b/src/vmime/net/maildir/maildirFolder.hpp
@@ -102,10 +102,10 @@ public:
void setMessageFlags(const messageSet& msgs, const int flags, const int mode = message::FLAG_MODE_SET);
- void addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
- void addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
+ messageSet addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
+ messageSet addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
- void copyMessages(const folder::path& dest, const messageSet& msgs);
+ messageSet copyMessages(const folder::path& dest, const messageSet& msgs);
void status(int& count, int& unseen);
shared_ptr <folderStatus> getStatus();
diff --git a/src/vmime/net/messageSet.cpp b/src/vmime/net/messageSet.cpp
index 2939042e..64b4aa3a 100644
--- a/src/vmime/net/messageSet.cpp
+++ b/src/vmime/net/messageSet.cpp
@@ -164,6 +164,13 @@ messageSet::~messageSet()
// static
+messageSet messageSet::empty()
+{
+ return messageSet();
+}
+
+
+// static
messageSet messageSet::byNumber(const int number)
{
messageSet set;
@@ -365,5 +372,17 @@ bool messageSet::isUIDSet() const
}
+size_t messageSet::getRangeCount() const
+{
+ return m_ranges.size();
+}
+
+
+const messageRange& messageSet::getRangeAt(const size_t i) const
+{
+ return *m_ranges[i];
+}
+
+
} // net
} // vmime
diff --git a/src/vmime/net/messageSet.hpp b/src/vmime/net/messageSet.hpp
index 6c7d7f44..a096b1c7 100644
--- a/src/vmime/net/messageSet.hpp
+++ b/src/vmime/net/messageSet.hpp
@@ -214,6 +214,12 @@ public:
messageSet(const messageSet& other);
+ /** Constructs an empty set.
+ *
+ * @return new empty message set
+ */
+ static messageSet empty();
+
/** Constructs a new message set and initializes it with a single
* message represented by its sequence number.
*
@@ -320,6 +326,19 @@ public:
*/
bool isUIDSet() const;
+ /** Returns the number of ranges contained in this set.
+ *
+ * @return range count
+ */
+ size_t getRangeCount() const;
+
+ /** Returns the message range at the specified index.
+ *
+ * @param i range index (from 0 to getRangeCount())
+ * @return a reference to the message range at the specified index
+ */
+ const messageRange& getRangeAt(const size_t i) const;
+
private:
messageSet();
diff --git a/src/vmime/net/pop3/POP3Folder.cpp b/src/vmime/net/pop3/POP3Folder.cpp
index 096de8af..abee8b28 100644
--- a/src/vmime/net/pop3/POP3Folder.cpp
+++ b/src/vmime/net/pop3/POP3Folder.cpp
@@ -601,7 +601,7 @@ void POP3Folder::rename(const folder::path& /* newPath */)
}
-void POP3Folder::addMessage
+messageSet POP3Folder::addMessage
(shared_ptr <vmime::message> /* msg */, const int /* flags */,
vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
@@ -609,7 +609,7 @@ void POP3Folder::addMessage
}
-void POP3Folder::addMessage
+messageSet POP3Folder::addMessage
(utility::inputStream& /* is */, const size_t /* size */, const int /* flags */,
vmime::datetime* /* date */, utility::progressListener* /* progress */)
{
@@ -617,7 +617,8 @@ void POP3Folder::addMessage
}
-void POP3Folder::copyMessages(const folder::path& /* dest */, const messageSet& /* msgs */)
+messageSet POP3Folder::copyMessages
+ (const folder::path& /* dest */, const messageSet& /* msgs */)
{
throw exceptions::operation_not_supported();
}
diff --git a/src/vmime/net/pop3/POP3Folder.hpp b/src/vmime/net/pop3/POP3Folder.hpp
index 27ea6e5f..7349e966 100644
--- a/src/vmime/net/pop3/POP3Folder.hpp
+++ b/src/vmime/net/pop3/POP3Folder.hpp
@@ -99,10 +99,10 @@ public:
void setMessageFlags(const messageSet& msgs, const int flags, const int mode = message::FLAG_MODE_SET);
- void addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
- void addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
+ messageSet addMessage(shared_ptr <vmime::message> msg, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
+ messageSet addMessage(utility::inputStream& is, const size_t size, const int flags = message::FLAG_UNDEFINED, vmime::datetime* date = NULL, utility::progressListener* progress = NULL);
- void copyMessages(const folder::path& dest, const messageSet& msgs);
+ messageSet copyMessages(const folder::path& dest, const messageSet& msgs);
void status(int& count, int& unseen);
shared_ptr <folderStatus> getStatus();
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-07 17:32:33 +0000