Improve source restore and fix strip bug

applications/vision/src/main.cpp

@@ -294,6 +294,11 @@ int main(int argc, char **argv) {
 	std::cout << "FTL Vision Node " << FTL_VERSION_LONG << std::endl;
 	auto root = ftl::configure(argc, argv, "vision_default");
 
+	root->restore("root", {
+		"uri",
+		"fps"
+	});
+
 	// Use other GPU if available.
 	//ftl::cuda::setDevice(ftl::cuda::deviceCount()-1);
 	

components/common/cpp/src/configuration.cpp

@@ -657,14 +657,18 @@ Configurable *ftl::config::configure(ftl::config::json_t &cfg) {
 
 // Remove all $ keys from json
 static void stripJSON(nlohmann::json &j) {
-	for(auto &el : j.items()) {
+	auto items = j.items();
+	for(auto i=items.begin(); i != items.end(); ) {
+		auto &el = *i;
 		if (el.key()[0] == '$') {
+			++i;
 			j.erase(el.key());
 			continue;
 		}
         if (el.value().is_structured()) {
             stripJSON(el.value());
         }
+		++i;
     }
 }
 

components/common/cpp/src/uri.cpp

@@ -200,7 +200,7 @@ void URI::setAttribute(const string &key, int value) {
 }
 
 void URI::to_json(nlohmann::json &json) {
-	std::string uri = getBaseURI();
+	std::string uri = to_string();
 	if (m_frag.size() > 0) uri += std::string("#") + getFragment();
 
 	json["uri"] = uri;

components/rgbd-sources/src/source.cpp

@@ -149,7 +149,9 @@ void Source::reset() {
 	auto uristr = get<string>("uri");
 	if (!uristr) return;
 
-	restore(*uristr, {
+	ftl::URI uri(*uristr);
+
+	restore(uri.getBaseURI(), {
 		"min_depth",
 		"max_depth",
 		"name",
@@ -161,6 +163,9 @@ void Source::reset() {
 		"feed",
 		"pipeline"
 	});
+
+	uri.to_json(getConfig());
+
 	impl_ = createImplementation(*uristr, this);
 }