From 7304832b6117dc82a7893e759cdc3f8a69c7747a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 2 Dec 2023 15:19:05 +0300
Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3.=20=D1=80=D0=B5=D0=B0=D0=BB=D0=B8?=
 =?UTF-8?q?=D0=B7=D0=BE=D0=B2=D0=B0=D0=BB=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=B2=D1=8B=D0=B4=D0=B5=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=BD=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=B2=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D1=83=D1=8E=20?=
 =?UTF-8?q?=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=83,=20=D0=B2=20=D0=BA=D0=B0?=
 =?UTF-8?q?=D1=87=D0=B5=D1=81=D1=82=D0=B2=D0=B5=20=D1=82=D0=B5=D1=81=D1=82?=
 =?UTF-8?q?=D0=BE=D0=B2.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 10 ++-
 .../Menus_2023/TestsMenuBar/TestsMenuBar.java |  3 +-
 .../VersionsMenuBar/VersionsMenuBar.java      |  3 +-
 .../Passes/All/CreateGroupFromDirectory.java  | 21 +++---
 .../Passes/All/CreateTestFromFile.java        | 70 ++++++-------------
 .../CreateTestsGroupFromSelectedVersions.java |  4 +-
 .../Passes/All/PublishTests.java              | 68 ++++++++++++++++++
 .../Passes/All/PublishTestsFromFiles.java     | 39 +++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 +
 ...ublishTests.java => PublishTests_OLD.java} |  6 +-
 10 files changed, 158 insertions(+), 69 deletions(-)
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishTests.java
 create mode 100644 src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
 rename src/Visual_DVM_2021/Passes/{PublishTests.java => PublishTests_OLD.java} (95%)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 3bf97e6c..956b19f0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,8 +7,16 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTests.java" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.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/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PublishTests.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/PublishTests_OLD.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
index ee06ed6c..a7bf656f 100644
--- a/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
+++ b/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java
@@ -4,10 +4,9 @@ import Visual_DVM_2021.Passes.PassCode_2021;
 public class TestsMenuBar extends DataMenuBar {
     public TestsMenuBar() {
         super("тесты",
-                //PassCode_2021.PublishTest,
                 PassCode_2021.CreateTestFromProject,
                 PassCode_2021.CreateTestFromDirectory,
-                PassCode_2021.CreateTestFromFile,
+                PassCode_2021.PublishTestsFromFiles, ///----------------------------
                 PassCode_2021.EditTest,
                 PassCode_2021.DownloadTest,
                 PassCode_2021.DeleteTest);
diff --git a/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java b/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
index f436acd1..2e8e1c0d 100644
--- a/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
+++ b/src/Common/UI/Menus_2023/VersionsMenuBar/VersionsMenuBar.java
@@ -1,8 +1,7 @@
 package Common.UI.Menus_2023.VersionsMenuBar;
 import Common.UI.Menus_2023.VisualiserMenuBar;
-import Visual_DVM_2021.Passes.PassCode_2021;
 public class VersionsMenuBar extends VisualiserMenuBar {
     public VersionsMenuBar(){
-        addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
+     //   addPasses(PassCode_2021.CreateTestsGroupFromSelectedVersions);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
index fa08910a..8d585e7a 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateGroupFromDirectory.java
@@ -1,16 +1,16 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Constants;
-import Common.Current;
-import Common.Utils.Files.VDirectoryChooser;
-import Common.Utils.Utils;
-import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.Passes.PublishTests;
-
-import java.io.File;
-import java.util.Arrays;
 public class CreateGroupFromDirectory extends PublishTests {
+
+    @Override
+    protected PassCode_2021 getCreateTestCode() {
+        return null;
+    }
+    @Override
+    protected String getNoFilesMessage() {
+        return "ни одного файла";
+    }
+    /*
     File dir = null;
     VDirectoryChooser directoryChooser = new VDirectoryChooser("Выбор домашней папки группы");
     @Override
@@ -66,4 +66,5 @@ public class CreateGroupFromDirectory extends PublishTests {
         }
         return true;
     }
+     */
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
index 33e3d822..61c7c059 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestFromFile.java
@@ -1,29 +1,27 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Constants;
 import Common.Current;
-import Common.Utils.Files.VFileChooser;
 import Common.Utils.Utils;
-import GlobalData.Settings.SettingName;
 import ProjectData.Files.FileType;
 import ProjectData.Files.ProjectFile;
 import ProjectData.LanguageName;
 import Repository.Component.Sapfor.Sapfor;
 import TestingSystem.Common.Group.Group;
 import TestingSystem.Common.Test.Test;
-import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.PassException;
 import Visual_DVM_2021.Passes.Pass_2021;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
 public class CreateTestFromFile extends Pass_2021<Test> {
-    VFileChooser fileChooser = new VFileChooser("Выберите файл для создания теста");
-    //---
-    File file;
+    //----
     Group group;
-    boolean from_file_chooser = false;
     ProjectFile projectFile;
-    //---
+    //----
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
     @Override
     public String getIconPath() {
         return "/icons/AddFile.png";
@@ -35,41 +33,27 @@ public class CreateTestFromFile extends Pass_2021<Test> {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         projectFile = null;
-        if (args.length == 0) {
-            from_file_chooser = true;
-            if (!Current.Check(Log, Current.Group))
-                return false;
-            group = Current.getGroup();
-            Utils.RestoreSelectedDirectory(fileChooser);
-            file = fileChooser.ShowDialog();
-            if (file == null) {
-                Log.Writeln_("Файл не выбран");
-                return false;
-            } else {
-                Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, file.getParent());
-            }
-        } else {
-            from_file_chooser = false;
-            file = (File) args[0];
-            group = (Group) args[1];
-        }
-        if (Utils.ContainsCyrillic(file.getName()) || Utils.ContainsForbiddenName(file.getName())) {
-            Log.Writeln_("Имя файла " + Utils.Brackets(file.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
+        File file_in = (File) args[0];
+        group = (Group) args[1];
+        //--
+        if (Utils.ContainsCyrillic(file_in.getName()) || Utils.ContainsForbiddenName(file_in.getName())) {
+            Log.Writeln_("Имя файла " + Utils.Brackets(file_in.getName()) + " содержит запрещённые символы " + Constants.all_forbidden_characters_string + ", или кириллицу.");
             return false;
         }
-        //если файл. все недопустимые файлы просто игнорируются.
-        projectFile = new ProjectFile(file);
+        //--
+        projectFile = new ProjectFile(file_in);
         if (!projectFile.fileType.equals(FileType.program) || !projectFile.languageName.equals(group.language)) {
-            Log.Writeln_("Не удалось распознать файл как программу на языке " + group.language.getDescription());
+            Log.Writeln_("Не удалось распознать файл " +Utils.Brackets(file_in.getName()) +
+                    " как программу на языке " + group.language.getDescription());
             return false;
         }
-        //-----
+        //--
         target = new Test();
         target.sender_address = Current.getAccount().email;
         target.sender_name = Current.getAccount().name;
         target.group_id = group.id;
-        target.description = Utils.getNameWithoutExtension(file.getName());
-        target.files = file.getName();
+        target.description = Utils.getNameWithoutExtension(file_in.getName());
+        target.files = file_in.getName();
         return true;
     }
     public File packTestCode() throws Exception {
@@ -93,23 +77,11 @@ public class CreateTestFromFile extends Pass_2021<Test> {
     }
     @Override
     protected void body() throws Exception {
-        ShowMessage1(file.getName());
+        ShowMessage1(projectFile.file.getName());
         //--
-        File tempProject = packTestCode(); //создание копии папки, и архивация.
-        //-- получить размерность консольным сапфором. папка уже отправлена и чистить ее не нужно!!
+        File tempProject = packTestCode();
         ShowMessage2("Синтаксический анализ и определение размерности");
-        if (group.language == LanguageName.fortran) {//если не определит, будут нули.
+        if (group.language == LanguageName.fortran)
             Sapfor.getMinMaxDim(Sapfor.getTempCopy(Current.getSapfor().getFile()), tempProject, target);
-        }
-    }
-    @Override
-    protected boolean validate() {
-        return Log.isEmpty();
-    }
-    @Override
-    protected void performDone() throws Exception {
-        super.performDone();
-        if (from_file_chooser)
-            passes.get(PassCode_2021.PublishTest).Do(target);
     }
 }
diff --git a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
index d447f649..265a9dea 100644
--- a/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
+++ b/src/Visual_DVM_2021/Passes/All/CreateTestsGroupFromSelectedVersions.java
@@ -5,10 +5,10 @@ import Common.UI.UI;
 import Common.Utils.Utils;
 import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import Visual_DVM_2021.Passes.PublishTests;
+import Visual_DVM_2021.Passes.PublishTests_OLD;
 
 import java.util.Vector;
-public class CreateTestsGroupFromSelectedVersions extends PublishTests {
+public class CreateTestsGroupFromSelectedVersions extends PublishTests_OLD {
     Vector<db_project_info> versions = new Vector<>();
     @Override
     public String getIconPath() {
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTests.java b/src/Visual_DVM_2021/Passes/All/PublishTests.java
new file mode 100644
index 00000000..d1099a20
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishTests.java
@@ -0,0 +1,68 @@
+package Visual_DVM_2021.Passes.All;
+import Common.UI.UI;
+import Common.Utils.Utils;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import TestingSystem.Common.Group.Group;
+import TestingSystem.Common.Test.Test;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+
+import java.io.File;
+import java.util.Vector;
+public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
+    protected Group group;
+    //----
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, target));
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        super.performFinish();
+        passes.get(PassCode_2021.SynchronizeTests).Do();
+    }
+    @Override
+    protected void FocusResult() {
+        UI.getMainWindow().FocusTests();
+    }
+    //--
+    protected abstract PassCode_2021 getCreateTestCode();
+    protected abstract String getNoFilesMessage();
+    //--
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        Vector<File> files = (Vector<File>) args[0];
+        group = (Group) args[1];
+        target = new Vector<>();
+        //---------------------
+        if (files.isEmpty()) {
+            Log.Writeln_("Не найдено " + getNoFilesMessage() + " для формирования тестов.");
+            return false;
+        }
+        //---
+        Pass_2021 createTestPass = passes.get(getCreateTestCode());
+        //---
+        for (File file : files) {
+            if (createTestPass.Do(file, group))
+                target.add((Test) createTestPass.target);
+        }
+        //---
+        if (target.isEmpty()) {
+            Log.Writeln_("Не удалось создать ни одного теста.");
+            return false;
+        }
+        //---
+        return UI.Question("В группу " + Utils.Brackets(group.description) +
+                "\nбудет добавлено " + target.size() + " тестов.\nПродолжить");
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java b/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
new file mode 100644
index 00000000..45b7f1c8
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/PublishTestsFromFiles.java
@@ -0,0 +1,39 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Current;
+import Common.Utils.Files.VFileChooser;
+import Common.Utils.Utils;
+import GlobalData.Settings.SettingName;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
+
+import java.io.File;
+import java.util.Vector;
+public class PublishTestsFromFiles extends PublishTests {
+    @Override
+    public String getIconPath() {
+        return "/icons/AddFile.png";
+    }
+    VFileChooser fileChooser = new VFileChooser("Выберите файл для создания теста");
+    @Override
+    protected PassCode_2021 getCreateTestCode() {
+        return PassCode_2021.CreateTestFromFile;
+    }
+    @Override
+    protected String getNoFilesMessage() {
+        return "ни одного файла";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Current.Check(Log, Current.Group)){
+            Utils.RestoreSelectedDirectory(fileChooser);
+            Vector<File> files = fileChooser.ShowMultiDialog();
+            if (files.isEmpty()){
+                Log.Writeln_("Не выбрано ни одного файла.");
+                return false;
+            }
+            Pass_2021.passes.get(PassCode_2021.UpdateSetting).Do(SettingName.ProjectsSearchDirectory, fileChooser.getCurrentDirectory());
+            return super.canStart(files, Current.getGroup());
+        }
+       return false;
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 31cf3674..afb21e88 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -302,12 +302,15 @@ public enum PassCode_2021 {
     CreateTestFromProject,
     SPF_RemoveComments,
     CreateTestFromFile,
+    PublishTestsFromFiles,
     //->
     TestPass;
     public String getDescription() {
         switch (this) {
             case Undefined:
                 return "?";
+            case PublishTestsFromFiles:
+                return "Добавить тесты из файлов к текущей группе";
             case CreateTestFromFile:
                 return "Создать тест из файла";
             case SPF_RemoveComments:
diff --git a/src/Visual_DVM_2021/Passes/PublishTests.java b/src/Visual_DVM_2021/Passes/PublishTests_OLD.java
similarity index 95%
rename from src/Visual_DVM_2021/Passes/PublishTests.java
rename to src/Visual_DVM_2021/Passes/PublishTests_OLD.java
index ed35e343..d36417e3 100644
--- a/src/Visual_DVM_2021/Passes/PublishTests.java
+++ b/src/Visual_DVM_2021/Passes/PublishTests_OLD.java
@@ -10,7 +10,7 @@ import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.io.File;
 import java.util.Vector;
-public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
+public abstract class PublishTests_OLD extends TestingSystemPass<Vector<Test>> {
     @Override
     public String getButtonText() {
         return "";
@@ -28,14 +28,14 @@ public abstract class PublishTests extends TestingSystemPass<Vector<Test>> {
     protected boolean canStart(Object... args) throws Exception {
         target = new Vector<>();
         files = new Vector<>();
-        //--------------------------
         group = null;
+        //--------------------------
+
         if (!getGroup()) return false;
         if (group == null) {
             Log.Writeln_("Группа не выбрана.");
             return false;
         }
-        files = new Vector<>();
         if (!findFiles()) return false;
         if (files.isEmpty()) {
             Log.Writeln_("Не найдено ни одной папки для формирования теста.");