comparison json/VampJson.h @ 52:e90fd30990eb

Error handling, and pass plugin handles through

         
         json11::Json::object jo;
         jo["type"] = "process";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features,
-                                       pmapper.pluginToOutputIdMapper(resp.plugin),
-                                       serialisation);
+        json11::Json::object po;
+        po["pluginHandle"] = pmapper.pluginToHandle(resp.plugin);
+        po["features"] = fromFeatureSet(resp.features,
+                                        pmapper.pluginToOutputIdMapper(resp.plugin),
+                                        serialisation);
+        jo["content"] = po;
         return json11::Json(jo);
     }
     
     static json11::Json
     fromVampRequest_Finish(Vamp::Plugin *p,

 
         json11::Json::object jo;
         jo["type"] = "finish";
         jo["success"] = true;
         jo["errorText"] = "";
-        jo["content"] = fromFeatureSet(resp.features,
-                                       pmapper.pluginToOutputIdMapper(resp.plugin),
-                                       serialisation);
-        return json11::Json(jo);
-    }
-
-    static json11::Json
-    fromException(const std::exception &e, RRType responseType) {
+        json11::Json::object po;
+        po["pluginHandle"] = pmapper.pluginToHandle(resp.plugin);
+        po["features"] = fromFeatureSet(resp.features,
+                                        pmapper.pluginToOutputIdMapper(resp.plugin),
+                                        serialisation);
+        jo["content"] = po;
+        return json11::Json(jo);
+    }
+
+    static json11::Json
+    fromError(std::string errorText, RRType responseType) {
 
         json11::Json::object jo;
         std::string type;
 
         if (responseType == RRType::List) type = "list";

         else if (responseType == RRType::Finish) type = "finish";
         else type = "invalid";
 
         jo["type"] = type;
         jo["success"] = false;
-        jo["errorText"] = std::string("exception caught: ") +
-            type + " request: " + e.what();
-        return json11::Json(jo);
+        jo["errorText"] = std::string("error in ") + type + " request: " + errorText;
+        return json11::Json(jo);
+    }
+
+    static json11::Json
+    fromException(const std::exception &e, RRType responseType) {
+
+        return fromError(e.what(), responseType);
     }
     
 private: // go private briefly for a couple of helper functions
     
     static void

                            BufferSerialisation &serialisation) {
         
         Vamp::HostExt::ProcessResponse resp;
         if (successful(j)) {
             auto jc = j["content"];
-            resp.features = toFeatureSet
-                (jc["features"],
-                 pmapper.handleToOutputIdMapper(jc["pluginHandle"].int_value()),
-                 serialisation);
+            auto h = jc["pluginHandle"].int_value();
+            resp.plugin = pmapper.handleToPlugin(h);
+            resp.features = toFeatureSet(jc["features"],
+                                         pmapper.handleToOutputIdMapper(h),
+                                         serialisation);
         }
         return resp;
     }
     
     static Vamp::Plugin *

                           BufferSerialisation &serialisation) {
         
         Vamp::HostExt::ProcessResponse resp;
         if (successful(j)) {
             auto jc = j["content"];
-            resp.features = toFeatureSet
-                (jc["features"],
-                 pmapper.handleToOutputIdMapper(jc["pluginHandle"].int_value()),
-                 serialisation);
+            auto h = jc["pluginHandle"].int_value();
+            resp.plugin = pmapper.handleToPlugin(h);
+            resp.features = toFeatureSet(jc["features"],
+                                         pmapper.handleToOutputIdMapper(h),
+                                         serialisation);
         }
         return resp;
     }
 };