From 1a534836ef35e31c9eacbab6dbe17dd55992a0f7 Mon Sep 17 00:00:00 2001
From: EndrII <EndrIIMail@gmail.com>
Date: Fri, 16 Apr 2021 23:45:57 +0300
Subject: [PATCH] fix docs pathses

---
 BuildBotLib/docs.py | 10 ++++++++++
 BuildBotLib/make.py | 44 +++++++++++++++++++++++++++-----------------
 2 files changed, 37 insertions(+), 17 deletions(-)

diff --git a/BuildBotLib/docs.py b/BuildBotLib/docs.py
index 3e51ea0..980b4c4 100644
--- a/BuildBotLib/docs.py
+++ b/BuildBotLib/docs.py
@@ -54,3 +54,13 @@ class Docs(CMake):
                 default="Distro"
             ),
         ]
+
+    def destDirPrivate(self, props):
+        repo = str(props.getProperty('repository'))
+        branch = str(props.getProperty('branch'))
+
+        name = branch
+        if branch == "main" or branch == "master":
+            name = "latest"
+
+        return "docs/" + self.getNameProjectFromGitUrl(repo) + "/" + name
diff --git a/BuildBotLib/make.py b/BuildBotLib/make.py
index 0b0a995..8542214 100644
--- a/BuildBotLib/make.py
+++ b/BuildBotLib/make.py
@@ -20,21 +20,13 @@ class Make(BaseModule):
         @util.renderer
         def cmdWraper(step):
             repository = step.getProperty('repository')
-
-            if not len(repository):
+            project = self.getNameProjectFromGitUrl(repository)
+            if not len(project):
                 return "build"
 
-            repository = repository.replace('.git', '')
-            begin = repository.rfind('/')
-            begin = max(repository.rfind('/', 0, begin),
-                        repository.rfind(':', 0, begin))
-
-            if begin < 0:
-                return "build"
-
-            project = repository[begin + 1:len(repository)]
             return project
 
+
         return cmdWraper
 
     def isSupport(self, step):
@@ -49,21 +41,39 @@ class Make(BaseModule):
     def isTest(self, step):
         return step.getProperty('test')
 
-    def getNameProjectFromGitUrl(self, url):
-        return url[url.rfind('/') + 1: len(url) - 4]
+    def getNameProjectFromGitUrl(self, repository):
+        if not len(repository):
+            return ""
+
+        repository = repository.replace('.git', '')
+        begin = repository.rfind('/')
+        begin = max(repository.rfind('/', 0, begin),
+                    repository.rfind(':', 0, begin))
+
+        if begin < 0:
+            return ""
+
+        project = repository[begin + 1:len(repository)]
+        return project
 
     def destDirPrivate(self, props):
         repo = str(props.getProperty('repository'))
-        now = datetime.datetime.now().strftime("(%H_%M)_%m-%d-%Y")
+        buildnumber = str(props.getProperty('buildnumber'))
+        got_revision = str(props.getProperty('got_revision'))
 
-        return self.getNameProjectFromGitUrl(repo) + "/" + now
+        name = buildnumber + "_" + got_revision
+
+        return self.getNameProjectFromGitUrl(repo) + "/" + name
 
     def tempDirPrivate(self, props):
         repo = str(props.getProperty('repository'))
-        now = datetime.datetime.now().strftime("(%H_%M_%S)_%m-%d-%Y")
+        buildnumber = str(props.getProperty('buildnumber'))
+        got_revision = str(props.getProperty('got_revision'))
+
+        name = buildnumber + "_" + got_revision
 
         m = hashlib.md5()
-        repoPath = self.getNameProjectFromGitUrl(repo) + "/" + now
+        repoPath = self.getNameProjectFromGitUrl(repo) + "/" + name
 
         m.update(repoPath.encode('utf-8'))