From cef74a241c4aaf041d65deffc0576a091ac3c717 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 7 Oct 2023 00:45:09 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9F=D1=80=D0=B8=20=D0=B0=D0=BD=D0=B0=D0=BB?=
 =?UTF-8?q?=D0=B8=D0=B7=D0=B5=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82?=
 =?UTF-8?q?=D0=B0=D1=82=D0=BE=D0=B2=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D1=83=D1=87=D0=B5=D1=82=20=D0=B2=D0=B5=D1=80?=
 =?UTF-8?q?=D1=81=D0=B8=D0=B9=20=D0=B8=20=D0=B2=D0=B0=D1=80=D0=B8=D0=B0?=
 =?UTF-8?q?=D0=BD=D1=82=D0=BE=D0=B2,=20=D0=BF=D1=80=D0=B8=20=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=83=D0=B4=D0=B0=D1=87=D0=BD=D0=BE=D0=BC=20=D0=B7=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=B8=D0=B8=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D1=86=D0=B5=D1=81=D1=81=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 13 +--
 src/Common/Constants.java                     |  2 +
 .../Messages/Errors/MessageError.java         |  5 +-
 .../PerformSapforTask.java                    | 80 +++++++++++--------
 4 files changed, 52 insertions(+), 48 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 289b38b5..91b56ab8 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,19 +9,8 @@
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/Utils/Files/ProjectsChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Files/ProjectsChooser.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/ProjectData/Messages/Errors/MessageError.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/ProjectData/Messages/Errors/MessageError.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PerformSapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/UserConnection.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyDirectory.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CreateEmptyProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenCurrentProject.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/OpenSapforTest.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/PublishTest.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/SSH/ConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index a10e98dd..91a2c329 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -18,6 +18,8 @@ public class Constants {
     public final static String DONE = "DONE";
     public final static String TIMEOUT = "TIMEOUT";
     //-вывод задач
+    public final static String parse_out_file = "parse_out.txt";
+    public final static String parse_err_file = "parse_err.txt";
     public final static String out_file = "out.txt";
     public final static String err_file = "err.txt";
     public final static String time_file = "total_time";
diff --git a/src/ProjectData/Messages/Errors/MessageError.java b/src/ProjectData/Messages/Errors/MessageError.java
index 7400446d..94396135 100644
--- a/src/ProjectData/Messages/Errors/MessageError.java
+++ b/src/ProjectData/Messages/Errors/MessageError.java
@@ -2,7 +2,10 @@ package ProjectData.Messages.Errors;
 import ProjectData.Messages.Message;
 public class MessageError extends Message {
     public MessageError(String file_in, int line_in, String value_in, int group_in) throws Exception {
-        super(file_in, line_in, value_in, group_in);
+        super(file_in,
+                line_in,
+                value_in,
+                group_in);
     }
     public MessageError() {
     }
diff --git a/src/SapforTestingSystem/PerformSapforTask.java b/src/SapforTestingSystem/PerformSapforTask.java
index 24f9192a..89bfa348 100644
--- a/src/SapforTestingSystem/PerformSapforTask.java
+++ b/src/SapforTestingSystem/PerformSapforTask.java
@@ -11,7 +11,6 @@ import SapforTestingSystem.Json.SapforConfiguration_json;
 import SapforTestingSystem.Json.SapforVersion_json;
 import SapforTestingSystem.SapforTask.SapforTask;
 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;
 
@@ -109,18 +108,17 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         procBuilder.directory(workspace);
         process = procBuilder.start();
         exit_code = process.waitFor();
-        if (exit_code != 0)
-            throw new PassException("Процесс завершился с кодом " + exit_code);
         process = null;
         //---
         outputLines = new Vector<>(FileUtils.readLines(outputFile));
         errorsLines = new Vector<>(FileUtils.readLines(errorsFile));
-        return checkLines(outputLines) && checkLines(errorsLines);
+        return (exit_code == 0) && checkLines(outputLines) && checkLines(errorsLines);
     }
     protected boolean parse() throws Exception {
         if (performSapforScript("parse", parentTask,
                 "-parse *.f *.for *.fdv *.f90 *.f77",
-                "parse_out.txt", "parse_err.txt")
+                Constants.parse_out_file,
+                Constants.parse_err_file)
                 && (new File(parentTask, "dvm.proj")).exists()) {
             return true;
         } else {
@@ -128,16 +126,19 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             return false;
         }
     }
+    //слегка изменить подход.
     protected boolean transformation(PassCode_2021 code) throws Exception {
         task = new File(parentTask, "v1");
         Utils.CheckAndCleanDirectory(task); //папка для преобразования.
+        //если версия пустая, это тоже результат тестирования. Поэтому должна учитываться в древе.
+        target.versions.add(new SapforVersion_json(task.getAbsolutePath(), code.getDescription()));
+        //---
         if (performSapforScript("transformation", parentTask,
                 code.getTestingCommand() + " -F " + Utils.DQuotes(task.getAbsolutePath()),
-                "out.txt",
-                "err.txt"
+                Constants.out_file,
+                Constants.err_file
         )) {
             target.state = TaskState.Done;
-            target.versions.add(new SapforVersion_json(task.getAbsolutePath(), code.getDescription()));
             parentTask = task;
             return true;
         }
@@ -145,24 +146,20 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         target.state = TaskState.DoneWithErrors;
         return false;
     }
-    protected boolean variants() throws Exception {
-        if (performSapforScript("create_variants", parentTask, " -t 13 -allVars",
-                "out.txt",
-                "err.txt"
-        )) {
-            //найти папки с вариантами.
-            File[] files_ = parentTask.listFiles((dir, name) -> dir.isDirectory() && Utils.isParallelVersionName(name));
-            if ((files_ != null) && (files_.length > 0)) {
-                Vector<File> files = new Vector<>(Arrays.asList(files_));
-                files.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getName().substring(1))));
-                target.state = TaskState.Done;
-                for (File file : files)
-                    target.variants.add(new SapforVersion_json(file.getAbsolutePath(), PassCode_2021.SPF_CreateParallelVariant.getDescription()));
-                return true;
-            }
+    protected void variants() throws Exception {
+        //папки вариантов создается самим сапфором.
+        target.state = performSapforScript("create_variants", parentTask, " -t 13 -allVars",
+                Constants.out_file,
+                Constants.err_file
+        ) ? TaskState.Done : TaskState.DoneWithErrors;
+        //найти папки с вариантами.
+        File[] files_ = parentTask.listFiles((dir, name) -> dir.isDirectory() && Utils.isParallelVersionName(name));
+        if ((files_ != null) && (files_.length > 0)) {
+            Vector<File> files = new Vector<>(Arrays.asList(files_));
+            files.sort(Comparator.comparingInt(o -> Integer.parseInt(o.getName().substring(1))));
+            for (File file : files)
+                target.variants.add(new SapforVersion_json(file.getAbsolutePath(), PassCode_2021.SPF_CreateParallelVariant.getDescription()));
         }
-        target.state = TaskState.DoneWithErrors;
-        return false;
     }
     //-------------------------------------------------->>
     public MessageError unpackMessage(String line_in) throws Exception {
@@ -281,7 +278,9 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             }
         }
     }
-    protected void checkVersion(SapforVersion_json version, boolean isTransformation) throws Exception {
+    //--
+    protected void createVersionProjectData(SapforVersion_json version, boolean isTransformation) throws Exception {
+        System.out.println("Checking version " + version);
         db_project_info project = new db_project_info();
         project.Home = new File(version.version);
         project.name = project.Home.getName();
@@ -292,8 +291,10 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
         Vector<MessageError> messages = new Vector<>();
         //--
         if (isTransformation) {
-            File p_out = Paths.get(project.Home.getAbsolutePath(), Constants.data, "parse_out.txt").toFile();
-            File out = Paths.get(project.Home.getAbsolutePath(), Constants.data, "out.txt").toFile();
+            File p_out = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.parse_out_file).toFile();
+            File p_err = Paths.get(project.Home.getAbsolutePath(), Constants.data,Constants.parse_err_file).toFile();
+            File out = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.out_file).toFile();
+            File err = Paths.get(project.Home.getAbsolutePath(), Constants.data, Constants.err_file).toFile();
             //--
             if (p_out.exists()) {
                 project.Log += (FileUtils.readFileToString(p_out));
@@ -303,9 +304,15 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
                 project.Log += "\n" + FileUtils.readFileToString(out);
                 readMessagesFromFileDump(out, messages);
             }
+            //в потоки ошибок идет информация от операционной системы. сообщений там быть не должно.
+            if (p_err.exists())
+                project.Log += (FileUtils.readFileToString(p_err));
+            if (err.exists())
+                project.Log += "\n" + FileUtils.readFileToString(err);
             //--
         }
         project.CreateVisualiserData();
+        System.out.println("visualiser data created");
         //---
         if (isTransformation && !messages.isEmpty()) {
             project.Open();
@@ -327,8 +334,9 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
     @Override
     protected void body() throws Exception {
         System.out.println(target.root + " " + Utils.Brackets(sapforConfiguration_json.flags));//!!
+        target.versions.add(new SapforVersion_json(target.root, "исходная"));
         for (PassCode_2021 code : sapforConfiguration_json.codes) {
-            //  System.out.println(code); //!!
+            System.out.println(code); //!!
             if (parse()) {
                 if (code.equals(PassCode_2021.CreateParallelVariants))
                     variants();
@@ -337,14 +345,16 @@ public class PerformSapforTask extends Pass_2021<SapforTask> {
             } else
                 break;
         }
-        //теперь строим деревья версий.
-        //System.out.println("Построение дерева версий..");
-        checkVersion(new SapforVersion_json(target.root, "исходная"), true);
+    }
+    @Override
+    protected void performFinish() throws Exception {
+        //теперь строим деревья версий. нельзя делать в body. так как могут быть исключения например неверный код процесса.
+        System.out.println("Построение дерева версий..");
         for (SapforVersion_json version : target.versions)
-            checkVersion(version, true);
+            createVersionProjectData(version, true);
         for (SapforVersion_json version : target.variants)
-            checkVersion(version, false);
+            createVersionProjectData(version, false);
         //---->>>>
-        //System.out.println("DONE");
+        System.out.println("DONE");
     }
 }