Allow topic and service to construct messages from description files

src/Factory.cc

@@ -25,6 +25,7 @@
 #include <google/protobuf/text_format.h>
 
 #include <cstdlib>
+#include <filesystem>
 #include <fstream>
 #include <functional>
 #include <iostream>
@@ -115,40 +116,54 @@ class DynamicFactory
     // Split all the directories containing .desc files.
     std::vector<std::string> descDirs = split(_paths, ':');
 
-    for (const std::string &descDir : descDirs)
+    auto loadDescFile = [this](const std::string &descFile)
     {
-      for (DirIter dirIter(descDir); dirIter != DirIter(); ++dirIter)
+      // Ignore files without the correct extensions.
+      if (descFile.rfind(".desc") == std::string::npos &&
+          descFile.rfind(".proto") == std::string::npos &&
+          descFile.rfind(".proto.bin") == std::string::npos)
+        return;
+
+      // Parse the .desc file.
+      std::ifstream ifs(descFile);
+      if (!ifs.is_open())
       {
-        // Ignore files without the .desc extension.
-        if ((*dirIter).rfind(".desc") == std::string::npos)
-          continue;
+        std::cerr << "DynamicFactory(): Unable to open [" << descFile << "]"
+                  << std::endl;
+        return;
+      }
 
-        // Parse the .desc file.
-        std::ifstream ifs(*dirIter);
-        if (!ifs.is_open())
-        {
-          std::cerr << "DynamicFactory(): Unable to open [" << *dirIter << "]"
-                    << std::endl;
-          continue;
-        }
+      google::protobuf::FileDescriptorSet fileDescriptorSet;
+      if (!fileDescriptorSet.ParseFromIstream(&ifs))
+      {
+        std::cerr << "DynamicFactory(): Unable to parse descriptor set from ["
+                  << descFile << "]" << std::endl;
+        return;
+      }
 
-        google::protobuf::FileDescriptorSet fileDescriptorSet;
-        if (!fileDescriptorSet.ParseFromIstream(&ifs))
+      // Place the real descriptors in the descriptor pool.
+      for (const google::protobuf::FileDescriptorProto &fileDescriptorProto :
+           fileDescriptorSet.file())
+      {
+        if (!this->pool.BuildFile(fileDescriptorProto))
         {
-          std::cerr << "DynamicFactory(): Unable to parse descriptor set from ["
-                    << *dirIter << "]" << std::endl;
-          continue;
+          std::cerr << "DynamicFactory(). Unable to place descriptors from ["
+                    << descFile << "] in the descriptor pool" << std::endl;
         }
+      }
+    };
 
-        // Place the real descriptors in the descriptor pool.
-        for (const google::protobuf::FileDescriptorProto &fileDescriptorProto :
-             fileDescriptorSet.file())
+    for (const std::string &descDir : descDirs)
+    {
+      if (!std::filesystem::is_directory(descDir))
+      {
+        loadDescFile(descDir);
+      }
+      else
+      {
+        for (DirIter dirIter(descDir); dirIter != DirIter(); ++dirIter)
         {
-          if (!pool.BuildFile(fileDescriptorProto))
-          {
-            std::cerr << "DynamicFactory(). Unable to place descriptors from ["
-                      << *dirIter << "] in the descriptor pool" << std::endl;
-          }
+          loadDescFile(*dirIter);
         }
       }
     }