From 74fcc2150dd567c8004a5423ad7400a2cbaddd35 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Wed, 12 Feb 2025 22:49:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=B2=D0=BD=D1=83=D1=82=D1=80=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B9=20=D0=BF=D1=80=D0=BE=D1=85=D0=BE=D0=B4=20?=
 =?UTF-8?q?=D0=BD=D0=B0=20=D0=BE=D0=B1=D0=BD=D0=BE=D0=B2=D0=BB=D0=B5=D0=BD?=
 =?UTF-8?q?=D0=B8=D0=B5=20=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0?=
 =?UTF-8?q?=D1=82=D0=BE=D0=B2=20=D0=B0=D0=BD=D0=B0=D0=BB=D0=B8=D0=B7=D0=B0?=
 =?UTF-8?q?=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D0=B4=D0=B2?=
 =?UTF-8?q?=D0=BC=20=D1=81=D0=B8=D1=81=D1=82=D0=B5=D0=BC=D1=8B.=20=D0=BF?=
 =?UTF-8?q?=D0=BE=D0=BA=D0=B0=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=BF=D0=BE=20=D0=B7=D0=B0=D1=8F=D0=B2=D0=BA=D0=B0=D0=BC,=20?=
 =?UTF-8?q?=D0=B2=20=D0=BE=D0=B1=D1=8B=D1=87=D0=BD=D0=BE=D0=B9=20=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=81=D0=B8=D0=B8=20=D0=BD=D0=B8=D0=BA=D0=BE=D0=BC?=
 =?UTF-8?q?=D1=83=20=D0=B5=D0=B3=D0=BE=20=D0=BD=D0=B5=20=D0=B2=D0=B8=D0=B4?=
 =?UTF-8?q?=D0=BD=D0=BE.=20=D0=92=D0=BE=D0=B7=D0=BC=D0=BE=D0=B6=D0=BD?=
 =?UTF-8?q?=D0=BE=20=D0=B8=20=D0=BD=D0=B5=20=D0=BF=D0=BE=D0=BD=D0=B0=D0=B4?=
 =?UTF-8?q?=D0=BE=D0=B1=D0=B8=D1=82=D1=81=D1=8F=20=D0=B1=D0=BE=D0=BB=D1=8C?=
 =?UTF-8?q?=D1=88=D0=B5.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |   7 +-
 .../Passes/All/DownloadTaskTest.java          |  14 ++-
 .../Passes/All/RefreshDVMPackageResults.java  | 112 +++++++++++++++++-
 .../Repository/Component/Visualiser.java      |   2 +-
 .../Repository/Server/ServerCode.java         |   4 +-
 .../TestingSystem/Common/TestingServer.java   |  32 ++---
 .../DVM/DVMPackage/UI/DVMPackagesForm.java    |   1 +
 src/_VisualDVM/Utils.java                     |   1 +
 8 files changed, 145 insertions(+), 28 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index f826cb78..7499622b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,14 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.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/_VisualDVM/Passes/PassCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/PassCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadTaskTest.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Utils.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Windows/TestingForm.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/_VisualDVM/Passes/All/DownloadTaskTest.java b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
index c6e919d3..bbb055dc 100644
--- a/src/_VisualDVM/Passes/All/DownloadTaskTest.java
+++ b/src/_VisualDVM/Passes/All/DownloadTaskTest.java
@@ -1,5 +1,6 @@
 package _VisualDVM.Passes.All;
 import _VisualDVM.Global;
+import _VisualDVM.Repository.Server.ServerCode;
 import _VisualDVM.TestingSystem.Common.Test.Test;
 import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
 public class DownloadTaskTest extends DownloadTest {
@@ -10,13 +11,14 @@ public class DownloadTaskTest extends DownloadTest {
     @Override
     protected boolean canStart(Object... args) throws Exception {
         target = null;
-        if (Global.mainModule.getAccount().CheckRegistered(Log) &&
-                Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
+        if (Global.testingServer.db.dvmRunTasks.getUI().CheckCurrent(Log)) {
             DVMRunTask task = Global.testingServer.db.dvmRunTasks.getUI().getCurrent();
-            //-- квазиобъект, нам от него нужно только имя.
-            target = new Test();
-            target.id = task.test_id;
-            return true;
+            if (!Global.testingServer.db.tests.containsKey(task.test_id)){
+                Log.Writeln_("Теста с ключом "+task.test_id+" не существует!");
+                return false;
+            }
+            target = Global.testingServer.db.tests.get(task.test_id);
+            return SendRequest(ServerCode.DownloadTest, String.valueOf(target.id));
         }
         return false;
     }
diff --git a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
index 6db4635f..8ad4b219 100644
--- a/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
+++ b/src/_VisualDVM/Passes/All/RefreshDVMPackageResults.java
@@ -1,6 +1,116 @@
 package _VisualDVM.Passes.All;
+import Common.CommonConstants;
+import Common.Utils.Utils_;
+import _VisualDVM.Constants;
+import _VisualDVM.Global;
+import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.Server.TestingServerPass;
+import _VisualDVM.Repository.Server.ServerCode;
+import _VisualDVM.TestingSystem.Common.TasksPackageState;
 import _VisualDVM.TestingSystem.DVM.DVMPackage.DVMPackage;
-public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMCompilationTask;
+import _VisualDVM.TestingSystem.DVM.DVMTasks.DVMRunTask;
+import _VisualDVM.Utils;
+import javafx.util.Pair;
+import org.apache.commons.io.FileUtils;
 
+import java.io.File;
+import java.nio.file.Paths;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Vector;
+public class RefreshDVMPackageResults extends TestingServerPass<DVMPackage> {
+    @Override
+    public String getIconPath() {
+        return "/icons/Menu/Undo.png";
+    }
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (!Global.testingServer.db.dvmPackages.getUI().CheckCurrent(Log))
+            return false;
+        target = Global.testingServer.db.dvmPackages.getUI().getCurrent();
+        if (!new File(target.getLocalWorkspace(), CommonConstants.LOADED).exists()) {
+            Log.Writeln_("Пакет не загружен!");
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected void body() throws Exception {
+        boolean hasErrors = false;
+        target.readJson();
+        Vector<DVMRunTask> runTasks = new Vector<>();
+        for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
+            runTasks.addAll(compilationTask.runTasks);
+        //----
+        int ct_count = 0;
+        int rt_count = 0;
+        int good = 0;
+        //--
+        for (DVMCompilationTask compilationTask : target.package_json.compilationTasks)
+            for (DVMRunTask runTask : compilationTask.runTasks) {
+                rt_count++;
+                if (compilationTask.state != TaskState.Done) {
+                    runTask.state = TaskState.Canceled;
+                } else {
+                    File rt_workspace = Paths.get(target.getLocalWorkspace().getAbsolutePath(), "results", String.valueOf(runTask.id)).toFile();
+                    if (rt_workspace.exists()) {
+                        //анализ задачи на запуск.
+                        File outFile = new File(rt_workspace, Constants.out_file);
+                        File errFile = new File(rt_workspace.getAbsolutePath(), Constants.err_file);
+                        //--
+                        String output = FileUtils.readFileToString(outFile);
+                        String errors = FileUtils.readFileToString(errFile);
+                        //--
+                        List<String> output_lines = Arrays.asList(output.split("\n"));
+                        List<String> errors_lines = Arrays.asList(errors.split("\n"));
+                        //---
+                        if (output.trim().isEmpty()) {
+                            runTask.state = TaskState.Crushed;
+                        } else {
+                            if (Utils.isCrushed(output_lines, errors_lines)) {
+                                runTask.state = TaskState.Crushed;
+                            } else {
+                                Pair<TaskState, Integer> results = new Pair<>(TaskState.Done, 100);
+                                switch (runTask.test_type) {
+                                    case Correctness:
+                                        results = Utils.analyzeCorrectness(output_lines);
+                                        break;
+                                    case Performance:
+                                        results = Utils.analyzePerformance(output_lines);
+                                        break;
+                                    default:
+                                        break;
+                                }
+                                runTask.state = results.getKey();
+                                runTask.progress = results.getValue();
+                                runTask.CleanTime = Utils.parseCleanTime(output);
+                            }
+                        }
+                    }
+                }
+                if (!runTask.state.equals(TaskState.Done))
+                    hasErrors = true;
+                else good++;
+            }
+        //--
+        target.saveJson(); //запись обновленных результатов пакета в json!
+        target.state = hasErrors ? TasksPackageState.DoneWithErrors : TasksPackageState.Done;
+        double percent = (((double) (good)) / target.tasksCount) * 100.0;
+        target.description = "Выполнено на " + ((int) percent) + "%\n" +
+                "Всего задач: " + target.tasksCount + ", из них с ошибками " + (target.tasksCount - good);
+        //--
+        //Global.testingServer.db.Update(target);
+       // RemoteFile remoteJson = new RemoteFile(target.get)
+        /*
+        SendRequest(ServerCode.EditObject, "", target);
+        SendRequest(ServerCode.SendFile)
+         */
+        SendRequest(ServerCode.ReplaceDVMPackageResults,"",
+                new Pair<>(
+                        target,
+                        Utils_.fileToBytes(target.getJsonFile())
+                )
+        );
+    }
 }
diff --git a/src/_VisualDVM/Repository/Component/Visualiser.java b/src/_VisualDVM/Repository/Component/Visualiser.java
index 075a626c..225b60ad 100644
--- a/src/_VisualDVM/Repository/Component/Visualiser.java
+++ b/src/_VisualDVM/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 = 1158;
+        version = 1159;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 57748120..7422b38c 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -92,9 +92,11 @@ public enum ServerCode {
     GetMaxSapforVersion,
     PerformAutoSapforTesting,
     JoinSapforVersionsToGroup,
-    TestCode;
+    TestCode, ReplaceDVMPackageResults;
     public String getDescription(){
         switch (this){
+            case ReplaceDVMPackageResults:
+                return "Заменить json DVM пакета";
             case JoinSapforVersionsToGroup:
                 return "Присоединение версий к группе на сервере";
             case GetComponentsVersionsInfo:
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 45387b9e..36b7478c 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -377,6 +377,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Получить финальные версии пакета тестирования SAPFOR");
                 JoinSapforPackageToGroup();
                 break;
+            case ReplaceDVMPackageResults:
+                Print("Заменить json DVM пакета");
+                ReplaceDVMPackageJson();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -863,22 +867,18 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         //-"sh"
     }
-    public void Patch(){
-        try {
-            db.BeginTransaction();
-            for (Test test : db.tests.Data.values()) {
-                if (test.sender_address.isEmpty()) {
-                    Group group = db.groups.get(test.group_id);
-                    test.sender_address = group.sender_address;
-                    test.sender_name = group.sender_name;
-                    db.Update(test);
-                }
-            }
-            db.Commit();
-        }
-        catch (Exception ex){
-            ex.printStackTrace();
-        }
+    private void ReplaceDVMPackageJson() throws Exception{
+        response= new ServerExchangeUnit_2021(ServerCode.OK);
+        Pair<DVMPackage, byte[]> p = (Pair<DVMPackage, byte[]>) request.object;
+        DVMPackage src = p.getKey();
+        byte[] packed_file = p.getValue();
+        //todo написать стандартное исключение на несуществование объекта с ключом
+        if (!db.dvmPackages.containsKey(src.id))
+            throw new RepositoryRefuseException("не существует пакета с ключом "+src.id);
+        DVMPackage dst = db.dvmPackages.get(src.id);
+        dst.SynchronizeFields(src);
+        db.Update(dst);
+        Utils_.bytesToFile(packed_file, dst.getJsonFile());
     }
 }
 
diff --git a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
index be6302cf..13d273ca 100644
--- a/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
+++ b/src/_VisualDVM/TestingSystem/DVM/DVMPackage/UI/DVMPackagesForm.java
@@ -141,6 +141,7 @@ public class DVMPackagesForm extends DataSetControlForm<DVMPackage> {
                 addPasses(PassCode.PauseDVMPackage,PassCode.ResumeDVMPackage,PassCode.AbortDVMPackage);
                 addSeparator();
                 addPasses(PassCode.DownloadDVMPackage,
+                     //   PassCode.RefreshDVMPackageResults,
                         PassCode.ExportDVMPackageToExcel,
                         PassCode.DeleteDVMPackage);
             }
diff --git a/src/_VisualDVM/Utils.java b/src/_VisualDVM/Utils.java
index f21a7f23..c89707f4 100644
--- a/src/_VisualDVM/Utils.java
+++ b/src/_VisualDVM/Utils.java
@@ -565,6 +565,7 @@ public class Utils {
        if (errors > 0) {
             state = TaskState.DoneWithErrors;
         } else {
+            complete = total;
             state = TaskState.Done;
         }
         return new Pair<>(state, (int) ((((double) complete) / total) * 100));