moparisthebest/davmail
1
0
Fork 0
mirror of https://github.com/moparisthebest/davmail synced 2024-12-13 19:22:22 -05:00
Code Issues Releases Wiki Activity

IMAP: implement search by id

Browse Source 
git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@795 3d1905a2-6b24-0410-a738-b14d5a86fcbd
This commit is contained in:
mguessan 2009-10-27 23:34:13 +00:00
parent 8b3d246f45
commit 14d22a8ef4
1 changed files with 66 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

109
src/java/davmail/imap/ImapConnection.java
View File

@ -215,7 +215,7 @@ public class ImapConnection extends AbstractConnection {
} else if ("create".equalsIgnoreCase(command)) { } else if ("create".equalsIgnoreCase(command)) {
if (tokens.hasMoreTokens()) { if (tokens.hasMoreTokens()) {
String folderName = BASE64MailboxDecoder.decode(tokens.nextToken()); String folderName = BASE64MailboxDecoder.decode(tokens.nextToken());
session.createFolder(folderName); session.createMessageFolder(folderName);
sendClient(commandId + " OK folder created"); sendClient(commandId + " OK folder created");
} else { } else {
sendClient(commandId + " BAD missing create argument"); sendClient(commandId + " BAD missing create argument");
@ -268,46 +268,9 @@ public class ImapConnection extends AbstractConnection {
} }
} else if ("search".equalsIgnoreCase(subcommand)) { } else if ("search".equalsIgnoreCase(subcommand)) {
SearchConditions conditions = new SearchConditions(); List<Long> uidList = handleSearch(tokens);
conditions.append("AND ("); for (long uid : uidList) {
boolean or = false; sendClient("* SEARCH " + uid);
while (tokens.hasMoreTokens()) {
String token = tokens.nextToken().toUpperCase();
if ("OR".equals(token)) {
or = true;
} else if (token.startsWith("OR ")) {
or = true;
appendOrSearchParams(token, conditions);
} else {
String operator;
if (conditions.query.length() == 5) {
operator = "";
} else if (or) {
operator = " OR ";
} else {
operator = " AND ";
}
appendSearchParam(operator, tokens, token, conditions);
}
}
conditions.append(")");
String query = conditions.query.toString();
DavGatewayTray.debug(new BundleMessage("LOG_SEARCH_QUERY", conditions.query));
if ("AND ()".equals(query)) {
query = null;
}
ExchangeSession.MessageList localMessages = session.searchMessages(currentFolder.folderName, query);
int index = 1;
for (ExchangeSession.Message message : localMessages) {
if ((conditions.deleted == null || message.deleted == conditions.deleted)
&& (conditions.flagged == null || message.flagged == conditions.flagged)
&& (conditions.answered == null || message.answered == conditions.answered)
&& (conditions.startUid == 0 || message.getImapUid() >= conditions.startUid)
&& (conditions.startIndex == 0 || (index++ >= conditions.startIndex))
) {
sendClient("* SEARCH " + message.getImapUid());
}
} }
sendClient(commandId + " OK SEARCH completed"); sendClient(commandId + " OK SEARCH completed");
@ -339,6 +302,20 @@ public class ImapConnection extends AbstractConnection {
} else { } else {
sendClient(commandId + " BAD command unrecognized"); sendClient(commandId + " BAD command unrecognized");
} }
} else if ("search".equalsIgnoreCase(command)) {
if (currentFolder == null) {
sendClient(commandId + " NO no folder selected");
} else {
List<Long> uidList = handleSearch(tokens);
int currentIndex = 0;
for (ExchangeSession.Message message : currentFolder.messages) {
currentIndex++;
if (uidList.contains(message.getImapUid())) {
sendClient("* SEARCH " + currentIndex);
}
}
sendClient(commandId + " OK SEARCH completed");
}
} else if ("fetch".equalsIgnoreCase(command)) { } else if ("fetch".equalsIgnoreCase(command)) {
if (currentFolder == null) { if (currentFolder == null) {
sendClient(commandId + " NO no folder selected"); sendClient(commandId + " NO no folder selected");
@ -619,6 +596,52 @@ public class ImapConnection extends AbstractConnection {
sendClient(buffer.toString()); sendClient(buffer.toString());
} }
protected List<Long> handleSearch(IMAPTokenizer tokens) throws IOException {
List<Long> uidList = new ArrayList<Long>();
SearchConditions conditions = new SearchConditions();
conditions.append("AND (");
boolean or = false;
while (tokens.hasMoreTokens()) {
String token = tokens.nextToken().toUpperCase();
if ("OR".equals(token)) {
or = true;
} else if (token.startsWith("OR ")) {
or = true;
appendOrSearchParams(token, conditions);
} else {
String operator;
if (conditions.query.length() == 5) {
operator = "";
} else if (or) {
operator = " OR ";
} else {
operator = " AND ";
}
appendSearchParam(operator, tokens, token, conditions);
}
}
conditions.append(")");
String query = conditions.query.toString();
DavGatewayTray.debug(new BundleMessage("LOG_SEARCH_QUERY", conditions.query));
if ("AND ()".equals(query)) {
query = null;
}
ExchangeSession.MessageList localMessages = session.searchMessages(currentFolder.folderName, query);
int index = 1;
for (ExchangeSession.Message message : localMessages) {
if ((conditions.deleted == null || message.deleted == conditions.deleted)
&& (conditions.flagged == null || message.flagged == conditions.flagged)
&& (conditions.answered == null || message.answered == conditions.answered)
&& (conditions.startUid == 0 || message.getImapUid() >= conditions.startUid)
&& (conditions.startIndex == 0 || (index++ >= conditions.startIndex))
) {
uidList.add(message.getImapUid());
}
}
return uidList;
}
protected void appendBodyStructure(StringBuilder buffer, ExchangeSession.Message message) throws IOException { protected void appendBodyStructure(StringBuilder buffer, ExchangeSession.Message message) throws IOException {
ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream baos = new ByteArrayOutputStream();
message.write(baos); message.write(baos);
@ -680,12 +703,12 @@ public class ImapConnection extends AbstractConnection {
int charsetindex = contentType.indexOf("charset="); int charsetindex = contentType.indexOf("charset=");
if (charsetindex >= 0) { if (charsetindex >= 0) {
buffer.append(" (\"CHARSET\" "); buffer.append(" (\"CHARSET\" ");
int charsetSemiColonIndex = contentType.indexOf(';', charsetindex); int charsetSemiColonIndex = contentType.indexOf(';', charsetindex);
int charsetEndIndex; int charsetEndIndex;
if (charsetSemiColonIndex > 0) { if (charsetSemiColonIndex > 0) {
charsetEndIndex = charsetSemiColonIndex; charsetEndIndex = charsetSemiColonIndex;
} else { } else {
charsetEndIndex = contentType.length(); charsetEndIndex = contentType.length();
} }
String charSet = contentType.substring(charsetindex + "charset=".length(), charsetEndIndex); String charSet = contentType.substring(charsetindex + "charset=".length(), charsetEndIndex);
if (!charSet.startsWith("\"")) { if (!charSet.startsWith("\"")) {