Remove hash path from local project variables.

egorpugin · egorpugin · commit 3ec888c0ac9c · 2017-02-21T08:09:34.000+03:00
diff --git a/src/common/constants.h b/src/common/constants.h
@@ -36,8 +36,12 @@ constexpr auto operator "" _GB(unsigned long long int i)
     return i * 1024_MB;
 }
 
-constexpr auto operator "" _PB(unsigned long long int i)
+constexpr auto operator "" _TB(unsigned long long int i)
 {
     return i * 1024_GB;
 }
 
+constexpr auto operator "" _PB(unsigned long long int i)
+{
+    return i * 1024_TB;
+}
diff --git a/src/common/http.h b/src/common/http.h
@@ -16,12 +16,9 @@
 
 #pragma once
 
-#include <openssl/evp.h>
-
 #include "cppan_string.h"
 #include "constants.h"
 #include "filesystem.h"
-#include "property_tree.h"
 
 struct ProxySettings
 {
diff --git a/src/common/package.cpp b/src/common/package.cpp
@@ -97,10 +97,16 @@ void Package::createNames()
 
     target_name   = ppath.toString() + (v == "*" ? "" : ("-" + v));
 
-    variable_name = ppath.toString() + (v == "*" ? "" : ("_" + v));
+    // for local projects we use simplified variable name without
+    // the second dir hash argument
+    auto vname = ppath.toString();
+    if (ppath.is_loc())
+        vname = ppath[PathElementType::Namespace] / ppath[PathElementType::Tail];
+
+    variable_name = vname + (v == "*" ? "" : ("_" + v));
     std::replace(variable_name.begin(), variable_name.end(), '.', '_');
 
-    variable_no_version_name = ppath.toString();
+    variable_no_version_name = vname;
     std::replace(variable_no_version_name.begin(), variable_no_version_name.end(), '.', '_');
 
     target_name_hash = getHashShort();
diff --git a/src/common/project_path.cpp b/src/common/project_path.cpp
@@ -149,19 +149,17 @@ bool ProjectPath::is_relative(const String &username) const
 
 ProjectPath ProjectPath::operator[](PathElementType e) const
 {
+    if (path_elements.empty())
+        return *this;
     switch (e)
     {
     case PathElementType::Namespace:
-        if (path_elements.empty())
-            return *this;
-        return PathElements{ path_elements.begin(), path_elements.begin() + 1 };
+        return path_elements[0];
     case PathElementType::Owner:
-        if (path_elements.size() < 2)
-            return *this;
-        return PathElements{ path_elements.begin() + 1, path_elements.begin() + 2 };
+        return get_owner();
     case PathElementType::Tail:
-        if (path_elements.size() >= 2)
-            return *this;
+        if (path_elements.size() < 2)
+            return ProjectPath();
         return PathElements{ path_elements.begin() + 2, path_elements.end() };
     }
     return *this;
diff --git a/src/common/project_path.h b/src/common/project_path.h
@@ -127,6 +127,11 @@ class ProjectPath
 
     bool operator<(const ProjectPath &rhs) const;
 
+    operator String() const
+    {
+        return toString();
+    }
+
     ROOT_PROJECT_PATH(com);
     ROOT_PROJECT_PATH(loc);
     ROOT_PROJECT_PATH(org);

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,12 @@ constexpr auto operator "" _GB(unsigned long long int i)`
`36`	`36`	`return i * 1024_MB;`
`37`	`37`	`}`
`38`	`38`
`39`		`-constexpr auto operator "" _PB(unsigned long long int i)`
	`39`	`+constexpr auto operator "" _TB(unsigned long long int i)`
`40`	`40`	`{`
`41`	`41`	`return i * 1024_GB;`
`42`	`42`	`}`
`43`	`43`
	`44`	`+constexpr auto operator "" _PB(unsigned long long int i)`
	`45`	`+{`
	`46`	`+ return i * 1024_TB;`
	`47`	`+}`