From e69769713b721886b625c32868c46943fc975775 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 16 Dec 2023 11:35:37 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BA=D0=B0=D1=87=D0=B0=D1=82=D1=8C=20?=
 =?UTF-8?q?=D1=80=D0=B5=D0=B7=D1=83=D0=BB=D1=8C=D1=82=D0=B0=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D1=82=D0=B5=D0=BA=D1=83=D1=89=D0=B5=D0=B3=D0=BE=20?=
 =?UTF-8?q?=D0=B4=D0=B2=D0=BC=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                    |  1 +
 .idea/workspace.xml                           | 78 +++++++++++++------
 src/Common/Global.java                        |  2 +-
 .../Component}/ComponentsMenuBar.java         |  2 +-
 src/Repository/Server/ServerCode.java         |  2 +-
 src/TestingSystem/Common/TestingServer.java   | 15 ++++
 .../DVM/DVMPackage/DVMPackagesBar.java        |  1 +
 .../Passes/All/DownloadDVMPackage.java        | 68 ++++++++++++++++
 src/Visual_DVM_2021/Passes/PassCode_2021.java |  3 +
 9 files changed, 147 insertions(+), 25 deletions(-)
 rename src/{Common/UI/Menus_2023/ComponentsMenuBar => Repository/Component}/ComponentsMenuBar.java (96%)
 create mode 100644 src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java

diff --git a/.gitignore b/.gitignore
index ac5f5851..35487f33 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,6 +39,7 @@ Archives/*
 Temp/*
 Projects/*
 CompilationTasks/*
+Packages/*
 SapforPackages/*
 User/*
 RunTasks/*
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 7f1e7103..7b10964e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,29 +7,63 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change afterPath="$PROJECT_DIR$/Packages/31/LOADED" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/package_json" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/0/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/0/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/1/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/10/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/10/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/11/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/12/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/12/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/13/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/14/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/14/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/15/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/16/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/16/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/17/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/2/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/2/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/3/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/4/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/4/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/5/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/6/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/6/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/7/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/8/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/8/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/err.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/out.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/9/statistic.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/CompilationInfo.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/Packages/31/results/RunningInfo.txt" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/BugReportsMenuBar/BugReportsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/BugReport/BugReportsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/CompilersMenuBar/CompilersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Compiler/CompilersMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ConfigurationsMenuBar/ConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/Configuration/ConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/DVMParametersMenuBar/DVMParametersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/DVMParameter/DVMParametersMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/EnvironmentValuesMenuBar/EnvironmentValuesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/EnvironmentValue/EnvironmentValuesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/GroupsMenuBar/GroupsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MachinesMenuBar/MachinesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Machine/MachinesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MakefilesMenuBar/MakefilesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Makefile/MakefilesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ModulesMenuBar/ModulesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Module/ModulesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/RunConfigurationsMenuBar/RunConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RunConfiguration/RunConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationCommandsMenuBar/SapforConfigurationCommandsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfigurationCommand/SapforConfigurationCommandsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforConfigurationsMenuBar/SapforConfigurationsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforConfiguration/SapforConfigurationsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksBar/SapforTasksMenuBar.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SapforTasksPackagesBar/SapforTasksPackagesBar.java" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ServerSapforsBar/ServerSapforsBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/ServerSapfor/ServerSapforsBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscriberWorkspacesMenuBar/SubscriberWorkspacesMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/SubscriberWorkspace/SubscriberWorkspacesMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/SubscribersMenuBar/SubscribersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Subscribes/SubscribersMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/TestsMenuBar/TestsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestsMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/UsersMenuBar/UsersMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/UsersMenuBar.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Common/UI/UI.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/UI.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Group/GroupsDBTable.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/ComponentsMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.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" />
diff --git a/src/Common/Global.java b/src/Common/Global.java
index 84eb6c21..5d2231aa 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -1,6 +1,6 @@
 package Common;
 import Common.Database.DataSet;
-import Common.UI.Menus_2023.ComponentsMenuBar.ComponentsMenuBar;
+import Repository.Component.ComponentsMenuBar;
 import Common.UI.UI;
 import Common.Utils.Utils;
 import GlobalData.Account.Account;
diff --git a/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java b/src/Repository/Component/ComponentsMenuBar.java
similarity index 96%
rename from src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java
rename to src/Repository/Component/ComponentsMenuBar.java
index a979cefc..39e8eff0 100644
--- a/src/Common/UI/Menus_2023/ComponentsMenuBar/ComponentsMenuBar.java
+++ b/src/Repository/Component/ComponentsMenuBar.java
@@ -1,4 +1,4 @@
-package Common.UI.Menus_2023.ComponentsMenuBar;
+package Repository.Component;
 import Common.Current;
 import Common.UI.Menus_2023.DataMenuBar;
 import Common.UI.Menus_2023.VisualiserMenu;
diff --git a/src/Repository/Server/ServerCode.java b/src/Repository/Server/ServerCode.java
index b582b591..b6dba388 100644
--- a/src/Repository/Server/ServerCode.java
+++ b/src/Repository/Server/ServerCode.java
@@ -89,5 +89,5 @@ public enum ServerCode {
     GetFirstActiveDVMPackage,
     DVMPackageNeedsKill,  // не доделано.
     UpdateActiveDVMPackages,
-    GetFirstActiveSapforPackage, SapforPackageNeedsKill, UpdateActiveSapforPackages;
+    GetFirstActiveSapforPackage, SapforPackageNeedsKill, UpdateActiveSapforPackages, DownloadDVMPackage;
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 37b75018..a4203a21 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -552,6 +552,10 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
                 Print("Получить данные по пакетам Sapfor");
                 UpdateActiveSapforPackages();
                 break;
+            case DownloadDVMPackage:
+                Print("Загрузить пакет DVM");
+                DownloadDVMPackage();
+                break;
             default:
                 throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
         }
@@ -832,4 +836,15 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
         response.object = res_;
     }
+    private void DownloadDVMPackage() throws Exception{
+        int dvmPackage_id = (int) request.object;
+        if (!db.dvmPackages.containsKey(dvmPackage_id))
+            throw new RepositoryRefuseException("Не найдено пакета тестирования DVM с ключом "+dvmPackage_id);
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+        DVMPackage dvmPackage = db.dvmPackages.get(dvmPackage_id);
+        File workspace = dvmPackage.getLocalWorkspace();
+        File results_zip = new File (workspace, "results.zip");
+        File package_json = dvmPackage.getJsonFile();
+        response.object = new Pair(Utils.packFile(results_zip), Utils.packFile(package_json));
+    }
 }
diff --git a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
index b2311e84..8d1f7a6c 100644
--- a/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
+++ b/src/TestingSystem/DVM/DVMPackage/DVMPackagesBar.java
@@ -6,6 +6,7 @@ public class DVMPackagesBar extends DataMenuBar {
         super("пакеты задач DVM", PassCode_2021.AddDVMPackage,
                 PassCode_2021.AddTasksToDVMPackage,
                 PassCode_2021.StartDVMPackage,
+                PassCode_2021.DownloadDVMPackage,
                 PassCode_2021.AbortDVMPackage,
                 PassCode_2021.DeleteDVMPackage
                 //   PassCode_2021.ExportTasksPackageToExcel,
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
new file mode 100644
index 00000000..0c1c1c76
--- /dev/null
+++ b/src/Visual_DVM_2021/Passes/All/DownloadDVMPackage.java
@@ -0,0 +1,68 @@
+package Visual_DVM_2021.Passes.All;
+import Common.Constants;
+import Common.Current;
+import Common.Utils.Utils;
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import TestingSystem.DVM.DVMPackage.DVMPackage;
+import TestingSystem.DVM.TasksPackage.TasksPackageState;
+import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+import javafx.util.Pair;
+import org.apache.commons.io.FileUtils;
+
+import java.io.File;
+import java.util.Date;
+public class DownloadDVMPackage extends TestingSystemPass<DVMPackage> {
+    @Override
+    public String getIconPath() {
+        return "/icons/Apply.png";
+    }
+    @Override
+    public String getButtonText() {
+        return "";
+    }
+    File workspace;
+    File results_zip;
+    File results;
+    File loaded;
+    @Override
+    protected boolean canStart(Object... args) throws Exception {
+        if (Current.Check(Log, Current.DVMPackage)){
+            //--
+            target = Current.getDVMPackage();
+            workspace = target.getLocalWorkspace();
+            results_zip = new File(workspace, "results.zip");
+            results = new File(workspace, "results");
+            loaded = new File(workspace, Constants.LOADED);
+            //--
+            if (!target.state.equals(TasksPackageState.Done)){
+                Log.Writeln_("Возможно скачать только завершённый пакет!");
+                return false;
+            }
+            if (loaded.exists()){
+                Log.Writeln_("Пакет уже загружен");
+                return false;
+            }
+            return true;
+        }
+        return false;
+    }
+    @Override
+    protected void performPreparation() throws Exception {
+        Utils.CheckAndCleanDirectory(target.getLocalWorkspace());
+    }
+    @Override
+    protected void ServerAction() throws Exception {
+        Command(new ServerExchangeUnit_2021(ServerCode.DownloadDVMPackage,"", target.id));
+    }
+    @Override
+    protected void performDone() throws Exception {
+        super.performDone();
+        Pair<byte[], byte[]> packed = (Pair<byte[], byte[]>) response.object;
+        Utils.unpackFile(packed.getKey(), results_zip);
+        Utils.unpackFile(packed.getValue(), target.getJsonFile());
+        passes.get(PassCode_2021.UnzipFolderPass).Do(results_zip.getAbsolutePath(), workspace.getAbsolutePath());
+        FileUtils.writeStringToFile(loaded, new Date().toString());
+    }
+}
diff --git a/src/Visual_DVM_2021/Passes/PassCode_2021.java b/src/Visual_DVM_2021/Passes/PassCode_2021.java
index 52ba4fd2..c9875879 100644
--- a/src/Visual_DVM_2021/Passes/PassCode_2021.java
+++ b/src/Visual_DVM_2021/Passes/PassCode_2021.java
@@ -319,6 +319,7 @@ public enum PassCode_2021 {
     DeleteSapforPackage,
     StartSapforPackage,
     AbortSapforPackage,
+    DownloadDVMPackage,
     //->
     TestPass;
     public String getDescription() {
@@ -339,6 +340,8 @@ public enum PassCode_2021 {
                 return "Удалить пакет задач DVM";
             case StartDVMPackage:
                 return "Запустить пакет задач DVM";
+            case DownloadDVMPackage:
+                return "Скачать пакет задач DVM";
             case AddTasksToDVMPackage:
                 return "Добавить задачи в пакет тестирования DVM";
             case AddDVMPackage: