From 7be3f9ccda1b3baabf6b35de0dc87fadd7a6f2a3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 27 Nov 2023 16:21:40 +0300
Subject: [PATCH] v++

---
 .idea/workspace.xml                           | 11 +++++++++-
 .../Menus_2023/TestsMenuBar/TestsMenuBar.java |  3 ++-
 src/Common/Utils/Utils.java                   | 12 +++++++++++
 src/ProjectData/Project/db_project_info.java  |  2 +-
 src/Repository/Component/Visualiser.java      |  2 +-
 .../All/CreateTestFromCurrentProject.java     | 20 +++++++++++++++++++
 .../Passes/All/CreateTestFromDirectory.java   |  2 +-
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 +++
 8 files changed, 50 insertions(+), 5 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/CreateTestFromCurrentProject.java

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e72260d4..8271ffbc 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,16 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromCurrentProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Project/db_project_info.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PassCode_2021.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
index f3625e10..e2effe5d 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
@@ -4,10 +4,11 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class TestsMenuBar extends DataMenuBar {
     public TestsMenuBar() {
         super("тесты",
-                PassCode_2021.DownloadTest,
                 //PassCode_2021.PublishTest,
+                PassCode_2021.CreateTestFromCurrentProject,
                 PassCode_2021.CreateTestFromDirectory,
                 PassCode_2021.EditTest,
+                PassCode_2021.DownloadTest,
                 PassCode_2021.DeleteTest);
     }
 }
diff --git a/src/Common/Utils/Utils.java b/src/Common/Utils/Utils.java
index f0e4cef9..fdf7eebb 100644
--- a/src/Common/Utils/Utils.java
+++ b/src/Common/Utils/Utils.java
@@ -1134,5 +1134,17 @@ public class Utils {
         if (project_data.exists())
             FileUtils.forceDelete(project_data);
     }
+    //--
+    public static boolean isVersion(File directory) throws Exception {
+        File[] files = directory.listFiles(File::isDirectory);
+        if (files!=null){
+            for (File file: files){
+               File data = new File(file, Constants.data);
+               if (data.exists())
+                   return true;
+            }
+        }
+        return false;
+    }
 }
 
diff --git a/src/ProjectData/Project/db_project_info.java b/src/ProjectData/Project/db_project_info.java
index 8950bc41..4b25287b 100644
--- a/src/ProjectData/Project/db_project_info.java
+++ b/src/ProjectData/Project/db_project_info.java
@@ -1095,7 +1095,7 @@ public class db_project_info extends DBObject {
         //теперь копируем инфу по файлам.
         if (cloneData) {
             db_project_info res = new db_project_info(dst);
-            migrateFilesSettings(res,  true, false);
+            migrateFilesSettings(res, true, false);
         }
     }
     public void Clone(File dst) throws Exception {
diff --git a/src/Repository/Component/Visualiser.java b/src/Repository/Component/Visualiser.java
index 79c0f39d..7a4bc4fa 100644
--- a/src/Repository/Component/Visualiser.java
+++ b/src/Repository/Component/Visualiser.java
@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1036;
+        version = 1037;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromCurrentProject.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromCurrentProject.java
new file mode 100644
index 00000000..0bb3c3a1
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromCurrentProject.java
@@ -0,0 +1,20 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Visual_DVM_2021.Passes.PassCode_2021;
+public class CreateTestFromCurrentProject extends CreateTestFromDirectory {
+    @Override
+    public String getIconPath() {
+        return "/icons/RedAdd.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Current.Check(Log, Current.Group, Current.Project)) {
+            return super.canStart(Current.getProject().Home, Current.getGroup());
+        }
+        return false;
+    }
+    @Override
+    protected void performDone() throws Exception {
+        passes.get(PassCode_2021.PublishTest).Do(target);
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
index ee0d27fe..b42a4606 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromDirectory.java
@@ -81,7 +81,7 @@ public class CreateTestFromDirectory extends Pass_2021<Test> {
                 Log.Writeln_("Имя файла " + Utils.Brackets(file.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
                 bad++;
             }
-            if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.data)) {
+            if (file.isDirectory() && !file.getName().equalsIgnoreCase(Constants.data) && Utils.isVersion(file)) {
                 subdirs++;
             }
             if (file.isFile()) {
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 39274d98..80e852ab 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -299,12 +299,15 @@ public enum PassCode_2021 {
     //--
     CreateGroupFromDirectory,
     CreateTestFromDirectory,
+    CreateTestFromCurrentProject,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case CreateTestFromCurrentProject:
+                return "Создать тест из текущего проекта";
             case CreateTestFromDirectory:
                 return "Создать тест из папки";
             case SPF_RemoveOmpDirectives: