butterfly
/
butterflyd
mirror of https://github.com/thebutterflyprotocol/butterflyd
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Implemented mail moving

This commit is contained in:
Tristan B. Kildaire 2020-07-28 09:11:48 +02:00
parent 5d12378cd3
commit d091800ce7
2 changed files with 63 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
source/client/client.d
View File

@ -245,7 +245,7 @@ public final class ButterflyClient : Thread
/* Make sure the connection is from a client */
if(connectionType == ClientType.CLIENT)
{
/* TODO: Implement me */
/* Create the new folder */
createFolder(commandBlock["request"]["folderName"].str());
}
else
@ -269,7 +269,25 @@ public final class ButterflyClient : Thread
/* TODO: Add error handling */
}
}
else if(cmp(command, "addToFolder") == 0)
else if(cmp(command, "deleteMail") == 0)
{
/* Make sure the connection is from a client */
if(connectionType == ClientType.CLIENT)
{
/* The folder the mail wanting to be deleted resides in */
Folder mailDirectory = new Folder(mailbox, commandBlock["request"]["folder"].str());
/* The mail message to be deleted */
Mail mailToDelete = new Mail(mailbox, mailDirectory, commandBlock["request"]["mailID"].str());
mailToDelete.deleteMessage();
}
else
{
/* TODO: Add error handling */
}
}
else if(cmp(command, "moveFolder") == 0)
{
/* Make sure the connection is from a client */
if(connectionType == ClientType.CLIENT)
@ -281,12 +299,22 @@ public final class ButterflyClient : Thread
/* TODO: Add error handling */
}
}
else if(cmp(command, "removeFromFolder") == 0)
else if(cmp(command, "moveMail") == 0)
{
/* Make sure the connection is from a client */
if(connectionType == ClientType.CLIENT)
{
/* TODO: Implement me */
/* The folder of the original mail message */
Folder originalMessageFolder = new Folder(mailbox, commandBlock["request"]["originalFolder"].str());
/* The original mail message */
Mail originalMailMessage = new Mail(mailbox, originalMessageFolder, commandBlock["request"]["mailID"].str());
/* The folder to move the mail message to */
Folder newMailFolder = new Folder(mailbox, commandBlock["request"]["newFolder"].str());
/* Move mail message */
moveMail(originalMessageFolder, originalMailMessage, newMailFolder);
}
else
{
@ -347,7 +375,6 @@ public final class ButterflyClient : Thread
status = -1;
message = e.msg;
}
catch(ErrnoException e)
{
/* Status=-1 :: I/O error */
@ -397,6 +424,20 @@ public final class ButterflyClient : Thread
clientSocket.close();
}
/**
* Moves message from one folder, `srcFolder`, to another folder,
* `dstFolder`.
*/
private void moveMail(Folder srcFolder, Mail ogMessage, Folder dstFolder)
{
/* Store a copy of the message in the destination folder `dstFolder` */
storeMail(dstFolder, ogMessage.getMessage());
/* Delete the original message */
ogMessage.deleteMessage();
}
/**
* Stores a mail message in the users Mailbox
* at in the given Folder, `folder`.
@ -418,7 +459,7 @@ public final class ButterflyClient : Thread
Mail updatedMail;
/* Delete the old message */
mailbox.deleteMessage(storeFolder, messageOriginal.getMailID());
messageOriginal.deleteMessage();
/* Store the new message in the same folder */
updatedMail = Mail.createMail(mailbox, storeFolder, mailBlock);

18
source/client/mail.d
View File

@ -94,8 +94,10 @@ public final class Mailbox
/**
* Deletes the given message in the given folder path
*
* TODO: remove me
*/
public void deleteMessage(Folder folder, string mailID)
public void deletejjjMessage(Folder folder, string mailID)
{
/* Generate the filename to store the message under */
string filename = "mailboxes/"~username~"/"~folder.folderPath~"/"~mailID;
@ -325,22 +327,34 @@ public final class Mail
this.mailID = mailID;
}
private void deleteMessage()
/**
* Removes the mail message from the folder
*/
public void deleteMessage()
{
/* Get the file system path to this message */
string messageFilePath = mailbox.username~"/"~folder.folderPath~"/"~mailID;
/* Remove the message from the filesystem */
remove(messageFilePath);
}
private void sanityCheck()
{
/* TODO: Throw error if the message is somehow malformed */
/**
* Check for `from` field
* Check for `to` field
*/
}
/**
* Returns the mail message JSON
*/
public JSONValue getMessage()
{
JSONValue messageBlock;