comparison vamp-server/convert.cpp @ 184:150cfa0c71e1

Merge pull request #1 from piper-audio/fix/regression-json-responses

Fix/regression json responses

     rr.id = readJsonId(j);
     
     VampJson::BufferSerialisation serialisation =
         VampJson::BufferSerialisation::Array;
 
-    rr.success = j["success"].bool_value();
-    rr.errorText = j["errorText"].string_value();
+    const bool isSuccess = j["result"].is_object();
+    const bool isError = j["error"].is_object();
+    rr.success = isSuccess;
+    rr.errorText = isError ? j["error"]["message"].string_value() : "";
 
     switch (rr.type) {
 
     case RRType::List:
         rr.listResponse = VampJson::toRpcResponse_List(j, err);

          VampJson::BufferSerialisation::Array);
 
     Json id = writeJsonId(rr.id);
 
     if (!rr.success) {
-
-        j = VampJson::fromError(rr.errorText, rr.type, id);
-
-    } else {
-    
+         // errorText here likely contains a full message produced by simple-server
+         // setting writeVerbatimError to true avoids doubling error descriptions 
+        j = VampJson::fromError(rr.errorText, rr.type, id, true);
+
+    } else {
         switch (rr.type) {
 
         case RRType::List:
             j = VampJson::fromRpcResponse_List(rr.listResponse, id);
             break;

             if (eof) break;
 
             writeOutput(outformat, rr);
 
         } catch (std::exception &e) {
-
             cerr << "Error: " << e.what() << endl;
             exit(1);
         }
     }