Improve Config::getProject() functions.

egorpugin · egorpugin · commit 08de1adee192 · 2016-12-28T17:37:30.000+03:00
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -155,34 +155,36 @@ void Config::clear_vars_cache() const
     }
 }
 
-Project &Config::getProject(const String &pname) const
+Project &Config::getProject1(const ProjectPath &ppath)
 {
-    const Project *p = nullptr;
+    if (projects.empty())
+        throw std::runtime_error("Projects are empty");
     if (projects.size() == 1)
-        p = &projects.begin()->second;
-    else if (!projects.empty())
-    {
-        auto it = projects.find(pname);
-        if (it != projects.end())
-            p = &it->second;
-    }
-    if (!p)
-        throw std::runtime_error("No such project '" + pname + "' in dependencies list");
-    return (Project &)*p;
+        return projects.begin()->second;
+    auto i = projects.find(ppath.toString());
+    if (i == projects.end())
+        throw std::runtime_error("No such project '" + ppath.toString() + "' in config");
+    return i->second;
 }
 
-Project &Config::getDefaultProject()
+Project &Config::getProject(const ProjectPath &ppath)
 {
-    if (projects.empty())
-        throw std::runtime_error("Projects are empty");
-    return projects.begin()->second;
+    return getProject1(ppath);
 }
 
-const Project &Config::getDefaultProject() const
+const Project &Config::getProject(const ProjectPath &ppath) const
 {
-    if (projects.empty())
-        throw std::runtime_error("Projects are empty");
-    return projects.begin()->second;
+    return (const Project &)((Config *)this)->getProject1(ppath);
+}
+
+Project &Config::getDefaultProject(const ProjectPath &ppath)
+{
+    return getProject(ppath);
+}
+
+const Project &Config::getDefaultProject(const ProjectPath &ppath) const
+{
+    return getProject(ppath);
 }
 
 void Config::process(const path &p) const
diff --git a/src/common/config.h b/src/common/config.h
@@ -62,9 +62,10 @@ struct Config
 
     auto &getProjects() { return projects; }
     auto &getProjects() const { return projects; }
-    Project &getDefaultProject();
-    const Project &getDefaultProject() const;
-    Project &getProject(const String &p) const;
+    Project &getDefaultProject(const ProjectPath &ppath = ProjectPath());
+    const Project &getDefaultProject(const ProjectPath &ppath = ProjectPath()) const;
+    Project &getProject(const ProjectPath &ppath);
+    const Project &getProject(const ProjectPath &ppath) const;
 
     void setPackage(const Package &pkg);
 
@@ -78,6 +79,7 @@ struct Config
     path dir; // cwd
 
     void addDefaultProject();
+    Project &getProject1(const ProjectPath &ppath);
 
 public:
     bool defaults_allowed = true;
diff --git a/src/common/resolver.cpp b/src/common/resolver.cpp
@@ -265,7 +265,7 @@ void Resolver::download_and_unpack()
         auto c = rd.add_config(d);
 
         // move all files under unpack dir
-        auto ud = c->getDefaultProject().unpack_directory;
+        auto ud = c->getDefaultProject(d.ppath).unpack_directory;
         if (!ud.empty())
         {
             ud = version_dir / ud;
@@ -371,7 +371,7 @@ void Resolver::prepare_config(PackageStore::PackageConfigs::value_type &cc)
     auto &c = cc.second.config;
     auto &dependencies = cc.second.dependencies;
     c->setPackage(p);
-    auto &project = c->getDefaultProject();
+    auto &project = c->getDefaultProject(p.ppath);
 
     if (p.flags[pfLocalProject])
         return;
