فهرست منبع

enable listdata in method maps, fix copypaste error in fileman, fix logic error for handleListdata

Missingmew 5 سال پیش
والد
کامیت
03d178e662
2فایلهای تغییر یافته به همراه4 افزوده شده و 2 حذف شده
  1. 3 1
      cli/src/cmdman.cpp
  2. 1 1
      cli/src/fileman.cpp

+ 3 - 1
cli/src/cmdman.cpp

@@ -31,6 +31,7 @@ CmdMan::CmdMan(FileMan &fm, void (*dpf)(string)) : fileman(fm) {
   execmap["signup"] = &CmdMan::cmdSignup;
   execmap["putdata"] = &CmdMan::cmdPutdata;
   execmap["getdata"] = &CmdMan::cmdGetdata;
+  execmap["listdata"] = &CmdMan::cmdListdata;
 
   /* initialize description map */
   helpmap["help"] = descHelp;
@@ -51,6 +52,7 @@ CmdMan::CmdMan(FileMan &fm, void (*dpf)(string)) : fileman(fm) {
   handlemap["version"] = &CmdMan::handleVersion;
   handlemap["login"] = &CmdMan::handleLogin;
   handlemap["signup"] = &CmdMan::handleSignup;
+  handlemap["listdata"] = &CmdMan::handleListdata;
 
   debugprintfunc = dpf;
 }
@@ -561,7 +563,7 @@ CmdMan::CmdRet CmdMan::handleListdata(Json::Value root) {
       toadd.push_back(i.asString());
     fileman.putListData(toadd);
     // loaded successfully
-    if (!fileman.getListRemainingChunks()) {
+    if (fileman.getListRemainingChunks() < 0) {
       // everything sent
       retval.type = print;
       for (string s : fileman.getListData())

+ 1 - 1
cli/src/fileman.cpp

@@ -104,7 +104,7 @@ void FileMan::setGetChunks(int chunks) {
 
 void FileMan::setListChunks(int chunks) {
   listchunks = chunks;
-  getchunksRemaining = chunks - 1;
+  listchunksRemaining = chunks - 1;
 }
 
 std::vector<char> FileMan::readPut() {