Rewrite local package dependencies.

egorpugin · egorpugin · commit 98b52852e82c · 2018-07-26T14:00:01.000+03:00
diff --git a/src/common/config.cpp b/src/common/config.cpp
@@ -143,11 +143,15 @@ void Config::load(const yaml &root)
     {
         for (auto &d : get_sequence<path>(sd))
         {
+            if (!fs::exists(d))
+                continue;
             subdir = d.filename().string();
             reload(d);
         }
         subdir.clear();
         subdir_projects = std::move(projects);
+        for (auto &[s,p] : subdir_projects)
+            rd.known_local_packages.insert(p.pkg);
     }
 
     load_settings(root);
diff --git a/src/common/package_store.cpp b/src/common/package_store.cpp
@@ -427,6 +427,9 @@ PackageStore::read_packages_from_file(path p, const String &config_name, bool di
         // allow relative project names
         c.allow_relative_project_names = true;
 
+        // allow loading local deps from subdirs
+        c.allow_local_dependencies = true;
+
         c.reload(p);
         return c;
     };
diff --git a/src/common/package_store.h b/src/common/package_store.h
@@ -66,6 +66,9 @@ class PackageStore
     bool empty() const { return packages.empty(); }
     size_t size() const { return packages.size(); }
 
+public:
+    std::unordered_set<Package> known_local_packages;
+
 private:
     PackageConfigs packages;
     std::set<std::unique_ptr<Config>> config_store;
diff --git a/src/common/project.cpp b/src/common/project.cpp
@@ -812,6 +812,7 @@ void Project::load(const yaml &root)
 
         auto read_single_dep = [this, &read_version](const auto &d, Package dependency = Package())
         {
+            bool local_ok = false;
             if (d.IsScalar())
             {
                 auto p = extractFromStringAny(d.template as<String>());
@@ -834,39 +835,13 @@ void Project::load(const yaml &root)
                 }
                 if (d["local"].IsDefined() && allow_local_dependencies)
                 {
-                    // WARNING!
-                    // probably this could be dangerous, maybe remove?
-                    // if set local dep for a secure file on the system
-                    // it will be read (or not?); how this affects system?
-                    // will not lead to exec shell code somehow or whatever?
-                    // ???
-                    auto lp = d["local"].template as<String>();
-                    auto ld = this->load_local_dependency(lp);
-                    if (!ld)
-                    {
-                        if (!dependency.ppath.empty() && !dependency.ppath.is_loc())
-                        {
-                            try
-                            {
-                                Packages p;
-                                p[dependency.ppath.toString()] = dependency;
-                                resolve_dependencies(p);
-                            }
-                            catch (const std::exception &)
-                            {
-                                // if not resolved, fail finally
-                                throw;
-                            }
-                        }
-
-                        if (dependency.ppath.empty())
-                            throw std::runtime_error("Could not load local project: " + lp);
-                    }
-
-                    if (dependency.ppath.is_relative() && rd.has_local_package(ld.value() / dependency.ppath))
-                        dependency.ppath = ld.value() / dependency.ppath;
-                    else // is this really needed?
-                        dependency.ppath = ld.value();
+                    auto p = d["local"].template as<String>();
+                    Package pkg;
+                    pkg.ppath = p;
+                    if (rd.known_local_packages.find(pkg) != rd.known_local_packages.end())
+                        local_ok = true;
+                    if (local_ok)
+                        dependency.ppath = p;
                 }
             }
 
@@ -886,7 +861,11 @@ void Project::load(const yaml &root)
             {
                 // read other map fields
                 if (d["version"].IsDefined())
+                {
                     read_version(dependency, d["version"].template as<String>());
+                    if (local_ok)
+                        dependency.version = Version(LOCAL_VERSION_NAME);
+                }
                 if (d["ref"].IsDefined())
                     dependency.reference = d["ref"].template as<String>();
                 if (d["reference"].IsDefined())
diff --git a/src/common/settings.cpp b/src/common/settings.cpp
@@ -549,7 +549,7 @@ Settings &Settings::get(SettingsType type)
         {
             auto fn = CONFIG_ROOT "default";
             if (!fs::exists(fn))
-                return;
+                break;
             s.load(fn, SettingsType::System);
         };
     }
diff --git a/src/common/source.cpp b/src/common/source.cpp
@@ -21,7 +21,7 @@
 
 #include <fmt/format.h>
 #include <primitives/command.h>
-#include <primitives/overloads.h>
+#include <primitives/overload.h>
 #include <primitives/pack.h>
 
 #include <regex>

Original file line number	Diff line number	Diff line change
`@@ -143,11 +143,15 @@ void Config::load(const yaml &root)`
`143`	`143`	`{`
`144`	`144`	`for (auto &d : get_sequence<path>(sd))`
`145`	`145`	`{`
	`146`	`+ if (!fs::exists(d))`
	`147`	`+ continue;`
`146`	`148`	`subdir = d.filename().string();`
`147`	`149`	`reload(d);`
`148`	`150`	`}`
`149`	`151`	`subdir.clear();`
`150`	`152`	`subdir_projects = std::move(projects);`
	`153`	`+ for (auto &[s,p] : subdir_projects)`
	`154`	`+ rd.known_local_packages.insert(p.pkg);`
`151`	`155`	`}`
`152`	`156`
`153`	`157`	`load_settings(root);`
Original file line number	Diff line number	Diff line change
`@@ -549,7 +549,7 @@ Settings &Settings::get(SettingsType type)`
`549`	`549`	`{`
`550`	`550`	`auto fn = CONFIG_ROOT "default";`
`551`	`551`	`if (!fs::exists(fn))`
`552`		`- return;`
	`552`	`+ break;`
`553`	`553`	`s.load(fn, SettingsType::System);`
`554`	`554`	`};`
`555`	`555`	`}`