further get and put work, todo correct off by one

cli/include/fileman.h

@@ -13,11 +13,11 @@ private:
 	std::ofstream getfile;
 	std::string getname, putname;
 	const unsigned int max_read_len = 8;
-	unsigned int putchunks;
-	unsigned int putsize;
-	unsigned int putchunksRemaining;
-	unsigned int getchunks;
-	unsigned int getchunksReceived;
+	int putchunks;
+	int putsize;
+	int putchunksRemaining;
+	int getchunks;
+	int getchunksRemaining;
 public:
 	FileMan();
 	~FileMan();
@@ -36,14 +36,15 @@ public:
 
 	void writeGet(std::vector<char> data);
 	void writeBase64(std::string data);
-	unsigned int getGetChunks();
-	unsigned int getGetReceivedChunks();
+	int getGetChunks();
+	int getGetRemainingChunks();
+	void setGetChunks(int chunks);
 
 	std::vector<char> readPut();
 	std::string readBase64();
-	unsigned int getPutChunks();
-	unsigned int getPutChunksRemaining();
-	unsigned int getPutSize();
+	int getPutChunks();
+	int getPutChunksRemaining();
+	int getPutSize();
 	
 };
 

cli/src/cmdman.cpp

@@ -150,7 +150,7 @@ CmdMan::CmdRet CmdMan::cmdGetdata(vector<string> args) {
 	
 	root["command"] = "getdata";
 	root["file"] = fileman.getGetName();
-	root["chunk"] = fileman.getGetReceivedChunks();
+	root["chunk"] = fileman.getGetRemainingChunks();
 	root["cancel"] = false;
 	retval.type = send;
 	retval.msg = Json::writeString(wbuilder, root);
@@ -259,7 +259,6 @@ CmdMan::CmdRet CmdMan::handlePut(Json::Value root) {
 	CmdRet retval;
 	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
 	
-	retval.type = send;
 	if(!root["accept"].asBool()) {
 		retval.type = error;
 		retval.msg = "File upload request failed: Server reports: " + root["error"].asString();
@@ -278,7 +277,7 @@ CmdMan::CmdRet CmdMan::handlePutdata(Json::Value root) {
 	CmdRet retval;
 	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
 	
-	if(root["received"].asUInt() != fileman.getPutChunksRemaining()) {
+	if(root["received"].asInt() != fileman.getPutChunksRemaining()) {
 		// the number of remaining chunks received from the daemon does not equal the number stored at the client side		
 		retval.type = error;
 		retval.msg = std::string("File upload failed: Server reports number of remaining chunks as ") + std::to_string(root["received"].asInt()) + " but actual number is " + std::to_string(fileman.getPutChunksRemaining());
@@ -290,7 +289,7 @@ CmdMan::CmdRet CmdMan::handlePutdata(Json::Value root) {
 		retval.msg = "File upload request failed: Server reports filename " + root["file"].asString() + " but actual filename is " + fileman.getPutName();
 	} else {
 		// sent successfully
-		if(!root["received"].asUInt()) {
+		if(root["received"].asInt() < 0) {
 			// everything sent
 			retval.type = notsend;
 			retval.msg = "succesfully uploaded file " + fileman.getPutName();
@@ -303,28 +302,47 @@ CmdMan::CmdRet CmdMan::handlePutdata(Json::Value root) {
 	return retval;
 }
 
+CmdMan::CmdRet CmdMan::handleGet(Json::Value root) {
+	CmdRet retval;
+	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
+	
+	if(!root["accept"].asBool()) {
+		retval.type = error;
+		retval.msg = "File download request failed: Server reports: " + root["error"].asString();
+	} else if(root["file"].asString() != fileman.getGetName()) {
+		retval.type = error;
+		retval.msg = "File download request failed: Server reports filename " + root["file"].asString() + " but actual filename is " + fileman.getGetName();
+	} else {
+		fileman.setGetChunks(root["chunks"].asUInt());
+		retval.type = send;
+		retval.msg = "getdata";
+	}
+	
+	return retval;
+}
+
 CmdMan::CmdRet CmdMan::handleGetdata(Json::Value root) {
 	CmdRet retval;
 	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
 	
 	// the passed number of recieved chunks should equal the number of sent chunks
-	if(root["received"].asUInt() != fileman.getGetReceivedChunks()) {
+	if(root["remaining"].asInt() != fileman.getGetRemainingChunks()) {
 		retval.type = error;
-		retval.msg = std::string("File upload failed: Server reports number of sent chunks as ") + std::to_string(root["received"].asInt()) + " but actual number is " + std::to_string(fileman.getGetReceivedChunks());
+		retval.msg = std::string("File download failed: Server reports number of remaining chunks as ") + std::to_string(root["remaining"].asInt()) + " but actual number is " + std::to_string(fileman.getGetRemainingChunks());
 	} else if(root["cancel"].asBool()) {
 		retval.type = error;
 		retval.msg = "File download cancelled: Server reports: " + root["error"].asString();
-	} else if(root["file"].asString() != fileman.getPutName()) {
+	} else if(root["file"].asString() != fileman.getGetName()) {
 		retval.type = error;
-		retval.msg = "File upload request failed: Server reports filename " + root["file"].asString() + " but actual filename is " + fileman.getPutName();
+		retval.msg = "File download failed: Server reports filename " + root["file"].asString() + " but actual filename is " + fileman.getGetName();
 	} else {
 		fileman.writeBase64(root["data"].asString());
 		// loaded successfully
-		if(fileman.getGetChunks() == fileman.getGetReceivedChunks()) {
+		if(fileman.getGetRemainingChunks() < 0) {
 			// everything sent
 			retval.type = notsend;
 			retval.msg = "succesfully downloaded file " + fileman.getGetName();
-			fileman.closePut();
+			fileman.closeGet();
 		} else {
 			retval.type = send;
 			retval.msg = "getdata";
@@ -333,16 +351,6 @@ CmdMan::CmdRet CmdMan::handleGetdata(Json::Value root) {
 	return retval;
 }
 
-CmdMan::CmdRet CmdMan::handleGet(Json::Value root) {
-	CmdRet retval;
-	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;
-	// TODO
-	retval.type = error;
-	retval.msg = "Get handler not implemented yet";
-	
-	return retval;
-}
-
 CmdMan::CmdRet CmdMan::handleList(Json::Value root) {
 	CmdRet retval;
 	std::cerr << __PRETTY_FUNCTION__ << " begin" << std::endl;

cli/src/fileman.cpp

@@ -35,6 +35,8 @@ bool FileMan::openPut(const std::string &name) {
 
 bool FileMan::openGet(const std::string &name) {
 	getname = name;
+	getchunks = 0;
+	getchunksRemaining = 0;
 	getfile.open(name, std::ios::app | std::ios::binary);
 	if(getfile.tellp() != std::ios::beg) {
 		closeGet();
@@ -61,19 +63,24 @@ void FileMan::cancelGet() {
 
 void FileMan::writeGet(const std::vector<char> data) {
 	getfile.write(data.data(), data.size());
-	getchunks++;
+	getchunksRemaining--;
 }
 
 void FileMan::writeBase64(std::string data) {
 	writeGet(base64::decodeVector(data));
 }
 
-unsigned int FileMan::getGetChunks() {
+int FileMan::getGetChunks() {
 	return getchunks;
 }
 
-unsigned int FileMan::getGetReceivedChunks() {
-	return getchunksReceived;
+int FileMan::getGetRemainingChunks() {
+	return getchunksRemaining;
+}
+
+void FileMan::setGetChunks(int chunks) {
+	getchunks = chunks;
+	getchunksRemaining = chunks;
 }
 
 std::vector<char> FileMan::readPut() {
@@ -97,14 +104,14 @@ std::string FileMan::getGetName() {
 	return getname;
 }
 
-unsigned int FileMan::getPutChunks() {
+int FileMan::getPutChunks() {
 	return putchunks;
 }
 
-unsigned int FileMan::getPutChunksRemaining() {
+int FileMan::getPutChunksRemaining() {
 	return putchunksRemaining;
 }
 
-unsigned int FileMan::getPutSize() {
+int FileMan::getPutSize() {
 	return putsize;
 }