From 343c4fdcd28eb8dc82bd7d668c1a78dc1e1f5321 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 26 Oct 2023 21:40:37 +0300
Subject: [PATCH] =?UTF-8?q?=D0=94=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D1=84?=
 =?UTF-8?q?=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82?=
 =?UTF-8?q?=D0=B0,=20=D0=BF=D0=BE=D1=81=D0=BB=D0=B5=20=D1=80=D0=B0=D0=B1?=
 =?UTF-8?q?=D0=BE=D1=82=D1=8B,=20=D0=B2=D0=BC=D0=B5=D1=81=D1=82=D0=B5=20?=
 =?UTF-8?q?=D1=81=20jar.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  7 +-----
 .../PackageModeSupervisor.java                |  9 --------
 .../SapforTasksPackageSupervisor.java         |  4 ++++
 .../All/DownloadSapforTasksPackage.java       | 23 ++++++++++++++++---
 4 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index bf73c783..b1ac2266 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,13 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.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/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
index be92f26d..48d007bf 100644
--- a/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
+++ b/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
@@ -61,9 +61,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
         results_json.EndDate = new Date().getTime();
         //записать результаты всех задач.
         try {
-            //очистка служебных файлов.
-            Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
-            //--
             for (SapforTask task : results_json.tasks) {
                 //--
                 task.filesList = new Vector<>();
@@ -83,12 +80,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
                                     task.filesList.add(pf.file.getName());
                             }
                         }
-                        //--
-                        /*
-                        if (task.files.size() > 0) {
-                            task.filesNames = String.join("\n", task.files);
-                        }
-                         */
                     }
                 }
             }
diff --git a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
index 9c71031e..28daa863 100644
--- a/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
+++ b/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java
@@ -262,6 +262,10 @@ public class SapforTasksPackageSupervisor {
             }
             planner.ServerCommand(ServerCode.PublishSapforPackageTasks, planner.email, new Vector<>(results_json.tasks));
         }
+        //Очистка
+        //очистка служебных файлов.
+        Utils.deleteFilesByExtensions(new File(sapforTasksPackage.workspace),
+                "proj", "dep", "jar", "sh", "exe", "bat");
     }
     public void Perform() throws Exception {
         if (packageNeedsKill()) {
diff --git a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
index 6a35d739..7c1b3a1a 100644
--- a/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Constants;
 import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
@@ -8,8 +9,11 @@ import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
 import TestingSystem.TasksPackage.TasksPackageState;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.TestingSystemPass;
+import org.apache.commons.io.FileUtils;
 
 import java.io.File;
+import java.nio.file.Paths;
+import java.util.Date;
 public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
     @Override
     public String getIconPath() {
@@ -20,12 +24,22 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
         return "";
     }
     File tmpArchive = null;
+    File getLoaded() {
+        return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), target.id, Constants.LOADED).toFile();
+    }
     @Override
     protected boolean canStart(Object... args) throws Exception {
         if (Current.Check(Log, Current.SapforTasksPackage)) {
             target = Current.getSapforTasksPackage();
-            if (target.state.equals(TasksPackageState.Done)) return true;
-            else Log.Writeln_("Пакет не завершен.");
+            if (!target.state.equals(TasksPackageState.Done)) {
+                Log.Writeln_("Пакет не завершен.");
+                return false;
+            }
+            if (getLoaded().exists()) {
+                System.out.println("Пакет уже загружен");
+                return false;
+            }
+            return true;
         }
         return false;
     }
@@ -46,7 +60,10 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
         if (passes.get(PassCode_2021.UnzipFolderPass).Do(
                 tmpArchive.getAbsolutePath(),
                 Global.SapforPackagesDirectory.getAbsolutePath(), false
-        )) ;
+        )) {
+            System.out.println("LOADED=" + Utils.Brackets(getLoaded().getAbsolutePath()));
+            FileUtils.writeStringToFile(getLoaded(), new Date().toString());
+        }
     }
 }