recursive deps

jwinarske · jwinarske · commit b61e00ca38e5 · 2020-03-23T21:00:54.000-07:00
diff --git a/module.cpp b/module.cpp
@@ -55,6 +55,8 @@ module::module(std::string basePath, std::string module)
     if(!module_header.empty())
     {
         getMetaData( utilities::normalize_path(module_header) );
+        std::cout << module << " : metaData " << metaData.size() << std::endl;
+        std::cout << "dependencies length: " << metaData["dependencies"].length() << std::endl;
     }
 }
 
@@ -67,10 +69,41 @@ void module::print()
     std::cout << "Description : " << metaData["description"] << std::endl;
     std::cout << "Website : " << metaData["website"] << std::endl;
     std::cout << "License : " << metaData["license"] << std::endl;
-    auto deps = getDependencies();
+
+    auto list = utilities::getValueList( metaData["dependencies"] );
+    for(auto const& item : list)
+    {
+        std::cout << "<< dep >> " << item << std::endl;
+    }
+
+    list = utilities::getValueList( metaData["OSXFrameworks"] );
+    for(auto const& item : list)
+    {
+        std::cout << "<< OSXFramework >> " << item << std::endl;
+    }
+
+    list = utilities::getValueList( metaData["iOSFrameworks"] );
+    for(auto const& item : list)
+    {
+        std::cout << "<< iOSFrameworks >> " << item << std::endl;
+    }
+
+    list = utilities::getValueList( metaData["linuxLibs"] );
+    for(auto const& item : list)
+    {
+        std::cout << "<< linuxLibs >> " << item << std::endl;
+    }
+
+    list = utilities::getValueList( metaData["linuxPackages"] );
+    for(auto const& item : list)
+    {
+        std::cout << "<< linuxPackages >> " << item << std::endl;
+    }
+
+    auto deps = utilities::getValueList( metaData["mingwLibs"] );
     for(auto const& dep : deps)
     {
-        std::cout << "<< dep >> " << dep << std::endl;
+        std::cout << "<< mingwLibs >> " << dep << std::endl;
     }
 }
 
@@ -109,16 +142,34 @@ std::string module::getLicense()
     return metaData["license"];
 }
 
-std::vector<std::string> module::getDependencies()
+std::string module::getDependencies()
 {
-    std::string d = utilities::trim( metaData["dependencies"] );
-    auto list = utilities::split(d,' ');
-    for(auto &item : list)
-    {
-        std::string val = utilities::trim(item);
-        item = utilities::remove(val, ",");
-    }
-    return list;
+    return metaData["dependencies"];
+}
+
+std::string module::getOSXFrameworks()
+{
+    return metaData["OSXFrameworks"];
+}
+
+std::string module::getiOSFrameworks()
+{
+    return metaData["iOSFrameworks"];
+}
+
+std::string module::getLinuxLibs()
+{
+    return metaData["linuxLibs"];
+}
+
+std::string module::getLinuxPackages()
+{
+    return metaData["linuxPackages"];
+}
+
+std::string module::getMingwLibs()
+{
+    return metaData["mingwLibs"];
 }
 
 void module::getMetaData(std::string inpfile)
@@ -138,8 +189,6 @@ void module::getMetaData(std::string inpfile)
     if (!is)
         throw std::runtime_error("Error opening file: " + inpfile);
 
-    metaData.clear();
-
     std::string line;
     while (std::getline(is, line)) {
 
@@ -159,31 +208,37 @@ void module::getMetaData(std::string inpfile)
             }
             else
             {
-                ss << line << "\n";
+                ss << line << " \n";
             }
         }
     }
 
+    metaData.clear();
+
     std::string key;
     auto lines = utilities::split(ss.str(),'\n');
     for(auto &l : lines)
     {
-        l = utilities::trim(l);
         if(l.find(':') != std::string::npos)
         {
             auto kv = utilities::split(l, ':');
-            if(!kv.empty())
-            {
-                key = kv[0];
-                metaData[key] = utilities::trim(kv[1]);
-            }
+            
+            std::string key = utilities::trim(kv[0]);
+            std::string value = utilities::trim(kv[1]);
+
+            metaData[key] = value;
         }
         else
         {
-            std::string value = metaData[key];
-            metaData[key] += l;
+            if(l.length() > 2)
+            {
+                std::replace( l.begin(), l.end(), ',', ' ');
+                metaData[key] += " " + l;
+            }
         }
     }
+
+    std::cout << "[dependencies] = [" << metaData["dependencies"] << "]" << std::endl;
 }
 
 } //namespace pip2cmake
diff --git a/module.h b/module.h
@@ -20,14 +20,18 @@ namespace pip2cmake
         std::string getDescription();
         std::string getWebsite();
         std::string getLicense();
-        std::vector<std::string> getDependencies();
+        std::string getDependencies();
+        std::string getOSXFrameworks();
+        std::string getiOSFrameworks();
+        std::string getLinuxLibs();
+        std::string getLinuxPackages();
+        std::string getMingwLibs();
 
     private:
         std::map<std::string, std::string> metaData;
         void getMetaData(std::string inpfile);
         void listFilesRecursively(std::string basePath, std::string filename);
-
-        std::string normalizePath(std::string &path);
+        std::vector<std::string> getDependencies(std::string key);
 
         std::string base_path;
         std::string sepd;
diff --git a/pip.cpp b/pip.cpp
@@ -32,8 +32,6 @@ void pip::getMetaData(std::string inpfile)
     if (!is)
         throw std::runtime_error("Error opening file: " + inpfile);
 
-    metaData.clear();
-
     std::string line;
     while (std::getline(is, line)) {
 
@@ -58,27 +56,43 @@ void pip::getMetaData(std::string inpfile)
         }
     }
 
+    metaData.clear();
+
     std::string key;
+    std::string value;
     auto lines = utilities::split(ss.str(),'\n');
     for(auto &l : lines)
     {
-        l = utilities::trim(l);
         if(l.find(':') != std::string::npos)
         {
             auto kv = utilities::split(l, ':');
-            if(!kv.empty())
+            
+            key = utilities::trim(kv[0]);
+            value = utilities::trim(kv[1]);
+
+            if(value.find_last_of(",") == (value.length()-1))
             {
-                key = kv[0];
-                metaData[key] = utilities::trim(kv[1]);
+                value.append(" ");
             }
+
+            metaData[key] = value;
         }
         else
         {
-            std::string value = metaData[key];
-            metaData[key] += l;
+            if(l.length() > 2)
+            {
+                value = utilities::trim(l);
+                if(value.find_last_of(",") == (value.length()-1))
+                {
+                    value.append(" ");
+                }
+                metaData[key].append(value);    
+            }
         }
     }
 
+    std::cout << "[dependencies] = [" << metaData["dependencies"] << "]" << std::endl;
+
     dependencies = utilities::split(metaData["dependencies"],',');
     for(auto &d : dependencies)
     {
@@ -98,24 +112,6 @@ void pip::getMetaData(std::string inpfile)
     }
 }
 
-std::list<std::string> pip::getDependencies()
-{
-    std::list<std::string> list; 
-    for(auto &item : modules)
-    {
-        list.push_back(item.second->getID());
-        auto deps = item.second->getDependencies();
-        for(auto &d : deps)
-        {
-            list.push_back(d);
-        }
-    }
-    list.sort();
-    list.unique();
-
-    return list;
-}
-
 std::vector<std::string> pip::getExporters()
 {
     return exporters;
@@ -181,12 +177,6 @@ pip::pip(std::string infile, std::string outpath)
     getMetaData(infile);
 
     getModules();
-
-    auto deps = getDependencies();
-    for(auto &dep : deps)
-    {
-        std::cout << "dep: " << dep << std::endl;
-    }
 }
 
 void pip::print()
@@ -220,6 +210,7 @@ void pip::print()
     std::cout << "[Dependencies]\n";
     for(auto &mod : modules)
     {
+//        std::cout << mod.second->getID() << std::endl;
         mod.second->print();
     }
 }
@@ -278,9 +269,23 @@ void pip::getModulesBasePath()
     }
 }
 
-std::unique_ptr<module> pip::getModule(std::string name)
+void pip::addModulesRecursively(std::string dependencies)
 {
-    return std::make_unique<module>(module_base_path, name);
+    if(dependencies.empty())
+    {
+        return;
+    }
+
+    auto list = utilities::getValueList(dependencies);
+
+    for(auto const& item : list)
+    {
+        if ( modules.find(item) == modules.end() )
+        {
+            modules[item] = std::make_unique<module>(module_base_path, item);
+            addModulesRecursively( modules[item]->getDependencies() );
+        }
+    }
 }
 
 void pip::getModules()
@@ -293,15 +298,8 @@ void pip::getModules()
     std::cout << "Module Base: " << module_base_path << std::endl;
 
     modules.clear();
-    for(auto const& item : dependencies)
-    {
-        modules[item] = getModule(item);
-    }
-}
 
-std::list<std::unique_ptr<module>> pip::getModuleList()
-{
-    return std::list<std::unique_ptr<module>>();
+    addModulesRecursively( metaData["dependencies"] );
 }
 
 void pip::gen_cmake()
diff --git a/pip.h b/pip.h
@@ -22,7 +22,6 @@ namespace pip2cmake
 
         void gen_cmake();
         std::string get_cmake_file();
-        std::list<std::string> getDependencies();
         std::vector<std::string> getExporters();
         std::vector<std::string> getModuleFlags();
         std::string getDescription();
@@ -33,13 +32,11 @@ namespace pip2cmake
         std::string getVersion();
         std::string getWebsite();
 
-        std::unique_ptr<module> getModule(std::string name);
-        std::list<std::unique_ptr<module>> getModuleList();
-
     private:
         void getMetaData(std::string inpfile);
         void getModules();
         void getModulesBasePath();
+        void addModulesRecursively(std::string module);
         std::vector<std::string> dirSearch(const char* dir_path);
         std::string scandir_filter_value;
         static int scandir_filter_modules(const struct dirent* dir_ent);
diff --git a/utilities.cpp b/utilities.cpp
@@ -5,6 +5,7 @@
 #include <iostream>
 #include <algorithm>
 #include <stack>
+#include <map>
 
 namespace pip2cmake
 {
@@ -38,6 +39,15 @@ namespace pip2cmake
             return s;
         }
 
+        bool replace(std::string& str, const std::string& from, const std::string& to)
+        {
+            size_t start_pos = str.find(from);
+            if(start_pos == std::string::npos)
+                return false;
+            str.replace(start_pos, from.length(), to);
+            return true;
+        }
+
         std::vector<std::string> split(const std::string& s, char delimiter)
         {
             std::vector<std::string> tokens;
@@ -50,6 +60,26 @@ namespace pip2cmake
             return tokens;
         }
 
+        std::vector<std::string> getValueList(std::string value)
+        {
+            if(value.empty())
+            {
+                return std::vector<std::string>();
+            }
+
+            value = utilities::trim(value);
+            while(replace(value, "  ", " "));
+            auto list = utilities::split(value,' ');
+//std::cout << "KeyValue List: [" << value << "]" << std::endl;
+            for(auto &item : list)
+            {
+                std::replace( item.begin(), item.end(), ',', ' ');
+                item = utilities::trim(item);
+            }
+            return list;
+        }
+
+
         std::string normalize_path(std::string &path)
         {
             std::string sep = (path.find("\\") != std::string::npos) ? "\\" : "/";
diff --git a/utilities.h b/utilities.h
