From e860e7968fb4e62e6039b163f1d79656305f76c2 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 21 May 2024 23:48:01 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                              |  1 +
 .../DVM/RemoteDVMTestingPlanner.java             | 16 ----------------
 src/TestingSystem/DVM/UserConnection.java        |  2 +-
 .../Passes/SSH/TaskConnectionPass.java           |  3 +++
 4 files changed, 5 insertions(+), 17 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a0c27ac9..a07679b0 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,6 +10,7 @@
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
index 3142b887..c1d6d412 100644
--- a/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
+++ b/src/TestingSystem/DVM/RemoteDVMTestingPlanner.java
@@ -1,31 +1,17 @@
 package TestingSystem.DVM;
 import Common.Constants;
-import Common.Current;
 import Common.Global;
 import Common.Utils.Utils;
-import GlobalData.Machine.Machine;
-import GlobalData.Machine.MachineType;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.TaskState;
-import GlobalData.User.User;
-import ProjectData.Files.ProjectFile;
-import ProjectData.LanguageName;
-import Repository.Server.ServerCode;
 import TestingSystem.Common.TasksPackageState;
-import TestingSystem.Common.TestingPlanner;
-import TestingSystem.DVM.DVMPackage.DVMPackage;
 import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
-import TestingSystem.DVM.DVMTasks.DVMTask;
 import Visual_DVM_2021.Passes.All.UnzipFolderPass;
-import Visual_DVM_2021.UI.Interface.Loggable;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
-import java.io.FileFilter;
-import java.net.InetAddress;
-import java.nio.charset.Charset;
 import java.nio.file.Paths;
 import java.util.*;
 public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
@@ -57,7 +43,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
             Print("Соединение c " + machine.getURL() + " " + user.login + " сброшено.");
         }
     }
-
     //----
     @Override
     protected void TestsSynchronize() throws Exception {
@@ -244,7 +229,6 @@ public class RemoteDVMTestingPlanner extends DVMTestingPlanner {
     protected void MachineConnectionError() {
         Finalize("Количество безуспешных попыток соединения с машиной " + machine.getURL() + " превысило 10");
     }
-
     @Override
     protected void Kill() throws Exception {
         if (!testingPackage.PID.isEmpty()) {
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index d61cb843..ae8b63be 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -520,7 +520,7 @@ public class UserConnection {
             String modules_log = compileModules(modulesDirectory);
             if (!modules_log.isEmpty())
                 throw new PassException(modules_log);
-
+            //--
             RemoteFile info = new RemoteFile(userWorkspace, email);
             user.connection.writeToFile("", info);
         }
diff --git a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
index f7a87edc..77d8678c 100644
--- a/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
+++ b/src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java
@@ -22,6 +22,8 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
         machine = supervisor.task.getMachine();
         user = supervisor.task.getUser();
         super.Connect();
+        user.connection.CheckUserInitialization(Current.getAccount().email);
+        /*
         RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
         if (!user.connection.Exists(userWorkspace))
             throw new WorkspaceNotFoundException(
@@ -30,6 +32,7 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
                             + "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
                             "Требуется выполнить повторную инициализацию пользователя."
             );
+         */
     }
     @Override
     protected void ServerAction() throws Exception {