From 1e782daa3ddccaf6baa953ee3c57c5b17bdb7223 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Sat, 14 Sep 2024 01:16:08 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D1=80=D0=B5=D0=B4?=
 =?UTF-8?q?=D0=B0=D0=BA=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D0=B5=20=D0=BF=D0=B0=D0=BA=D0=B5=D1=82=D0=BE=D0=B2=20=D1=82?=
 =?UTF-8?q?=D0=B5=D1=81=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20=D0=94=D0=92=D0=9C,=20=D0=B8=20=D0=B2=D0=BE=D0=B7?=
 =?UTF-8?q?=D0=BC=D0=BE=D0=B6=D0=BD=D0=BE=D1=81=D1=82=D1=8C=20=D0=B8=D1=85?=
 =?UTF-8?q?=20=D0=BF=D0=B5=D1=80=D0=B5=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA?=
 =?UTF-8?q?=D0=B0.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                               |  7 ++++++-
 properties                                        |  2 +-
 .../Common/TestingPackage/TestingPackage.java     | 15 +++++++++++++++
 .../DVM/RemoteDVMTestingPlanner.java              |  1 +
 .../Passes/AbortTestingPackage.java               |  3 +++
 .../Passes/All/SaveCurrentDVMPackage.java         |  1 +
 .../Passes/All/StartDVMPackage.java               |  4 ++--
 7 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index de9f9740..ad9ae1a0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,7 +7,12 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingPackage/TestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/AbortTestingPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index b9ac4e15..78b2a995 100644
--- a/properties
+++ b/properties
@@ -10,7 +10,7 @@
   "SMTPHost": "smtp.mail.ru",
   "SMTPPort": 465,
   "MailSocketPort": 465,
-  "collapseCredentials": false,
+  "collapseCredentials": true,
   "collapseFileGraphs": false,
   "collapseFileMessages": false,
   "collapseProjectTrees": false,
diff --git a/src/TestingSystem/Common/TestingPackage/TestingPackage.java b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
index 9a1a6f11..14d83317 100644
--- a/src/TestingSystem/Common/TestingPackage/TestingPackage.java
+++ b/src/TestingSystem/Common/TestingPackage/TestingPackage.java
@@ -130,6 +130,21 @@ public abstract class TestingPackage<J> extends riDBObject {
                 res.add(Global.testingServer.db.tests.get(o_id));
         return res;
     }
+    public void Reset() {
+        StartDate = 0;
+        ChangeDate = 0;
+        progress = 0;
+        state = TasksPackageState.Inactive;
+        //--
+        File loaded = new File(getLocalWorkspace(), Constants.LOADED);
+        if (loaded.exists()) {
+            try {
+                Utils.forceDeleteWithCheck(loaded);
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+    }
     /*
     public void printCGT() {
         try {
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 97d5f0bf..d82bd3f2 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -72,6 +72,7 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
         //--
         LinkedHashMap<Integer, File> tests = getTestsFromJson();
         //создать папку для пакета.
+        user.connection.RMDIR(packageRemoteWorkspace.full_name);
         user.connection.sftpChannel.mkdir(packageRemoteWorkspace.full_name);
         //положить туда запакованные тексты задач.
         Vector<String> compilationLines = new Vector<>();
diff --git a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
index ce672577..5941911d 100644
--- a/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
+++ b/src/Visual_DVM_2021/Passes/AbortTestingPackage.java
@@ -27,6 +27,9 @@ public abstract class AbortTestingPackage extends TestingSystemPass<TestingPacka
                 case Aborted:
                     Log.Writeln_("Пакет уже завершен.");
                     break;
+                case Inactive:
+                    Log.Writeln_("Пакет неактивен.");
+                    break;
                 default:
                     packageToKill = new TestingPackageToKill();
                     packageToKill.packageId = target.id;
diff --git a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java b/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java
index 8f29cd43..8008ca93 100644
--- a/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/SaveCurrentDVMPackage.java
@@ -167,6 +167,7 @@ public class SaveCurrentDVMPackage extends EditServerObject<TestingServer, DVMPa
         target.saveTests(tests);
         //--
         target.saveTasks(tasks, tasks_count);
+        target.Reset();
         super.ServerAction();
     }
     @Override
diff --git a/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java b/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java
index 20b4d463..7417ec12 100644
--- a/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java
+++ b/src/Visual_DVM_2021/Passes/All/StartDVMPackage.java
@@ -22,8 +22,8 @@ public class StartDVMPackage extends EditServerObject<TestingServer, DVMPackage>
         if (Current.Check(Log,Current.DVMPackage)) {
             target = Current.getDVMPackage();
             //-
-            if (target.state.isActive()) {
-                Log.Writeln_("Пакет уже запущен.");
+            if (!target.state.equals(TasksPackageState.Inactive)) {
+                Log.Writeln_("Возможно запустить только неактивный пакет.");
                 return false;
             }
             if (target.tasksCount == 0) {