From f2b2acb49f1e3923594cfc80ed3c5f1cf545a320 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 13 Feb 2025 23:07:18 +0300
Subject: [PATCH] =?UTF-8?q?v++=20=D0=98=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=20=D1=82=D0=B0=D0=B9=D0=BC=D0=B0=D1=83=D1=82?=
 =?UTF-8?q?=20=D0=BD=D0=B0=20=D1=81=D0=BA=D0=B0=D1=87=D0=B8=D0=B2=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2?=
 =?UTF-8?q?.=D0=A0=D0=B0=D0=B7=D1=80=D0=B5=D1=88=D0=B5=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D1=8F=D1=82=D1=8C=20=D0=B2?=
 =?UTF-8?q?=20=D0=B3=D1=80=D1=83=D0=BF=D0=BF=D1=83=20=D0=B7=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B5=D1=80=D1=88=D0=B5=D0=BD=D0=BD=D1=8B=D0=B9=20=D1=81=20?=
 =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=B0=D0=BC=D0=B8=20=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=BA=D0=B5=D1=82(=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D1=83=D1=81=D0=BF=D0=B5=D1=88=D0=BD=D1=8B=D0=B5=20=D0=B7=D0=B0?=
 =?UTF-8?q?=D0=B4=D0=B0=D1=87=D0=B8)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 ++-
 properties                                    |  2 +-
 .../Passes/All/CompareSapforPackages.java     |  4 +++
 .../Passes/All/DownloadDVMPackages.java       |  2 +-
 .../Passes/All/DownloadSapforPackage.java     |  2 +-
 .../All/JoinSapforTestingVersionsToGroup.java | 13 +-------
 .../TestingSystem/Common/TestingServer.java   | 31 ++++++++++---------
 7 files changed, 28 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 8e968c2e..fcbaf64a 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,7 +8,9 @@
   <component name="ChangeListManager">
     <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/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadDVMPackages.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadSapforPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index c292e1e6..3790ec4d 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\test_routine_5_1739460626\\test_routine_5\\v1\\v1\\v1",
+  "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1739383720\\1835",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/Passes/All/CompareSapforPackages.java b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
index ab820620..7bc9d925 100644
--- a/src/_VisualDVM/Passes/All/CompareSapforPackages.java
+++ b/src/_VisualDVM/Passes/All/CompareSapforPackages.java
@@ -18,6 +18,10 @@ public class CompareSapforPackages extends Pass<Vector<SapforPackage>> {
         return "";
     }
     @Override
+    protected boolean needsAnimation() {
+        return true;
+    }
+    @Override
     protected boolean canStart(Object... args) throws Exception {
         master = null;
         slave = null;
diff --git a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
index 39ff7334..99bd5ec3 100644
--- a/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
+++ b/src/_VisualDVM/Passes/All/DownloadDVMPackages.java
@@ -30,7 +30,7 @@ public class DownloadDVMPackages extends TestingServerPass<Vector<Integer>> {
     protected boolean canStart(Object... args) throws Exception {
         target = (Vector<Integer>) args[0];
         packed_packages = null;
-        return SendRequest(ServerCode.DownloadDVMPackages, "", target);
+        return SendRequest(ServerCode.DownloadDVMPackages, "", target,0 );
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
index d23ec677..bafcc445 100644
--- a/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
+++ b/src/_VisualDVM/Passes/All/DownloadSapforPackage.java
@@ -23,7 +23,7 @@ public class DownloadSapforPackage extends TestingServerPass<SapforPackage> {
         }
         int id = target.id;
         loaded = new File(target.getLocalWorkspace(), CommonConstants.LOADED);
-        return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id);
+        return !loaded.exists()&&SendRequest(ServerCode.DownloadSapforPackage, "", id, 0);
     }
     @Override
     protected void body() throws Exception {
diff --git a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
index 04e48749..c4bf8220 100644
--- a/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
+++ b/src/_VisualDVM/Passes/All/JoinSapforTestingVersionsToGroup.java
@@ -21,7 +21,7 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
         if (Global.testingServer.db.CheckCurrent(Log, Group.class, SapforPackage.class)){
             group = Global.testingServer.db.groups.getUI().getCurrent();
             sapforPackage = Global.testingServer.db.sapforPackages.getUI().getCurrent();
-            if (!sapforPackage.state.equals(TasksPackageState.Done)){
+            if (!sapforPackage.state.equals(TasksPackageState.Done)&&!sapforPackage.state.equals(TasksPackageState.DoneWithErrors)){
                 Log.Writeln_("Пакет не завершен!");
                 return false;
             }
@@ -30,17 +30,6 @@ public class JoinSapforTestingVersionsToGroup extends TestingServerPass {
         return false;
     }
     @Override
-    protected void body() throws Exception {
-        /*
-        Vector<String> res = (Vector<String>) request.server_response.object;
-        System.out.println("--");
-        for (String path: res){
-            System.out.println(Utils_.Brackets(path));
-        }
-        System.out.println("--");
-         */
-    }
-    @Override
     protected void performFinish() throws Exception {
         Global.mainModule.getPass(PassCode.SynchronizeTests).Do();
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index 623f0447..666847d1 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -9,6 +9,7 @@ import Common.Utils.Vector_;
 import _VisualDVM.Constants;
 import _VisualDVM.Global;
 import _VisualDVM.GlobalData.Account.Account;
+import _VisualDVM.GlobalData.Tasks.TaskState;
 import _VisualDVM.Passes.All.DownloadRepository;
 import _VisualDVM.Passes.All.ZipFolderPass;
 import _VisualDVM.Passes.PassCode;
@@ -633,20 +634,22 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         LinkedHashMap<String, File> versions = new LinkedHashMap<>();
         Vector<String> paths = new Vector<>();
         for (SapforTask task : json.tasks) {
-            File task_root = Paths.get(
-                    sapforPackage.getLocalWorkspace().getAbsolutePath(),
-                    String.valueOf(task.set_id),
-                    String.valueOf(task.sapfor_configuration_id)
-            ).toFile();
-            for (String path : getSapforTaskResults(task)) {
-                File versionProject = Paths.get(task_root.getAbsolutePath(), path).toFile();
-                Vector<String> name_parts = new Vector_<>(
-                        String.valueOf(task.id),
-                        task.test_description,
-                        versionProject.getName()
-                );
-                versions.put(String.join("_", name_parts), versionProject);
-                paths.add(versionProject.getAbsolutePath());
+            if (task.state.equals(TaskState.Done)) {
+                File task_root = Paths.get(
+                        sapforPackage.getLocalWorkspace().getAbsolutePath(),
+                        String.valueOf(task.set_id),
+                        String.valueOf(task.sapfor_configuration_id)
+                ).toFile();
+                for (String path : getSapforTaskResults(task)) {
+                    File versionProject = Paths.get(task_root.getAbsolutePath(), path).toFile();
+                    Vector<String> name_parts = new Vector_<>(
+                            String.valueOf(task.id),
+                            task.test_description,
+                            versionProject.getName()
+                    );
+                    versions.put(String.join("_", name_parts), versionProject);
+                    paths.add(versionProject.getAbsolutePath());
+                }
             }
         }
         ZipFolderPass zip = new ZipFolderPass();