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

Fixed bug whereby the reponse JSON would not be cleared for next command, resulting in extra JSON data being sent for the next commands.

This commit is contained in:
Tristan B. Kildaire 2020-06-19 17:07:13 +02:00
parent 452937dea5
commit 4c837b8484
2 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
source/client/client.d
View File

@ -77,6 +77,9 @@ public final class ButterflyClient : Thread
bool recvStatus = receiveMessage(clientSocket, receivedBytes);
writeln(recvStatus);
/* Reset the response JSON */
responseBlock = JSONValue();
if(recvStatus)
{
/* TODO: Add error handling catch for all JSON here */
@ -264,7 +267,8 @@ public final class ButterflyClient : Thread
/* Get the folder wanting to be listed */
Folder listFolder = new Folder(mailbox, commandBlock["request"]["folderName"].str());
responseBlock["mailIDs"] = to!(string)(listFolder.getMessages());
/* Write back an array of mailIDs */
responseBlock["mailIDs"] = parseJSON(to!(string)(listFolder.getMessages()));
}
else
{
@ -279,7 +283,8 @@ public final class ButterflyClient : Thread
/* Get the folder wanting to be listed */
Folder listFolder = new Folder(mailbox, commandBlock["request"]["folderName"].str());
//responseBlock["folders"] = to!(string)(listFolder.getMessages());
/* Write back an array of folder names */
responseBlock["folders"] = parseJSON(to!(string)(listFolder.getFolders()));
}
else
{

14
source/client/mail.d
View File

@ -3,6 +3,7 @@ module client.mail;
import std.json;
import std.file;
import std.stdio;
import std.string;
/* TODO: Ref counter garbage collector for mail */
@ -169,15 +170,18 @@ public final class Folder
Mail[] messages;
/* Get a list of all the files within this directory */
foreach(DirEntry dirEntry; dirEntries(folderPath, SpanMode.shallow))
foreach(DirEntry dirEntry; dirEntries("mailboxes/"~mailbox.username~"/"~folderPath, SpanMode.shallow))
{
/* Only append files */
if(dirEntry.isFile())
{
messages ~= new Mail(mailbox, this, dirEntry.name());
string[] paths = split(dirEntry.name(), "/");
string mailID = paths[paths.length-1];
messages ~= new Mail(mailbox, this, mailID);
}
}
writeln("fhjdf");
return messages;
}
@ -189,7 +193,7 @@ public final class Folder
Folder[] folders;
/* Get a list of all the directories within this directory */
foreach(DirEntry dirEntry; dirEntries(folderPath, SpanMode.shallow))
foreach(DirEntry dirEntry; dirEntries("mailboxes/"~mailbox.username~"/"~folderPath, SpanMode.shallow))
{
/* Only append folders */
if(dirEntry.isDir())
@ -231,7 +235,9 @@ public final class Folder
override public string toString()
{
return folderPath;
string[] paths = split(folderPath, "/");
string folderName = paths[paths.length-1];
return folderName;
}
}