v++

рефакторинг. Исправлен баг. если прервать локальную задачу, не удалялся файл interrupt.

.idea/workspace.xml

@@ -7,16 +7,32 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneSapforPackage.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/GlobalData/RemoteFile/UI/RemoteFileChooser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/RemoteFile/UI/RemoteFileChooser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/GlobalData/User/User.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/GlobalData/User/User.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.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/TestingSystem/DVM/DVMTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/DVMTestingPlanner.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/Test/TestDBTable.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/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforPackage/SapforPackagesBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Compile.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CloneDVMPackage.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadProject.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/Run.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OLD/AttachFileToProject.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/OLD/DeleteAttachments.java" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass_2023.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.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" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/SilentSapforPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/ConnectionPass.java" beforeDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />

src/GlobalData/RemoteFile/UI/RemoteFileChooser.java

@@ -4,7 +4,7 @@ import Common.Global;
 import Common.UI.UI;
 import Common.UI.Windows.Dialog.Dialog;
 import GlobalData.RemoteFile.RemoteFile;
-import files.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp.LsEntry;
 
 import javax.swing.tree.DefaultMutableTreeNode;
@@ -28,7 +28,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
         session = (ConnectionPass) params[0];
         target_is_directory = (boolean) params[1];
         try {
-            Refresh(session.getSftpChannel().pwd());
+            Refresh(session.user.connection.sftpChannel.pwd());
         } catch (Exception ex) {
             Global.Log.PrintException(ex);
             onCancel(); //закрываем окно.
@@ -45,7 +45,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
             root_file = new RemoteFile(path, true);
             root = new DefaultMutableTreeNode(root_file);
             //-------------------------------------------------------
-            Vector<LsEntry> files = session.getSftpChannel().ls(path);
+            Vector<LsEntry> files = session.user.connection.sftpChannel.ls(path);
             Vector<RemoteFile> directories_ = new Vector<>();
             Vector<RemoteFile> files_ = new Vector<>();
             //отсортировать по принадлежности.
@@ -74,7 +74,7 @@ public class RemoteFileChooser extends Dialog<String, RemoteFileChooserFields> {
     }
     public void goHome() {
         try {
-            Refresh(session.getSftpChannel().getHome());
+            Refresh(session.user.connection.sftpChannel.getHome());
         } catch (Exception ex) {
             Global.Log.PrintException(ex);
             onCancel(); //закрываем окно.

src/GlobalData/Tasks/Supervisor/Remote/MVSRunSupervisor.java

@@ -35,9 +35,11 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
         String res = "maxtime=" + Utils.DQuotes(mvs_time) + " ./run";
         if (!env.isEmpty())
             res = env + " " + res;
+        /*
         mvs.enqueueTask(pass.ShellCommand(
                 "cd " + Utils.DQuotes(getRemoteProject().full_name),
                 res), task);
+         */
     }
     @Override
     protected boolean isTaskActive() {
@@ -45,11 +47,11 @@ public class MVSRunSupervisor extends ServerRunSupervisor {
     }
     @Override
     protected void CheckTask() throws Exception {
-        mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
+      //  mvs.checkTask(pass.ShellCommand(mvs.getCheckTaskCommand(task)), task);
     }
     @Override
     protected void AbortTask() throws Exception {
-        pass.ShellCommand(mvs.getCancelTaskCommand(task));
+      //  pass.ShellCommand(mvs.getCancelTaskCommand(task));
     }
     @Override
     protected void CalculatePerformanceTime() throws Exception {

src/GlobalData/Tasks/Supervisor/Remote/RemoteCompilationSupervisor.java

@@ -10,36 +10,41 @@ public class RemoteCompilationSupervisor extends RemoteTaskSupervisor<Compilatio
     @Override
     protected void PrepareWorkspace() throws Exception {
         //0. если нет папки с его именем создаем.
-        pass.tryMKDir(getRemoteProject());
+        pass.user.connection.MKDIR(getRemoteProject());
-        pass.SynchronizeProjectSubDirsR(project, project.Home, getRemoteProject(), false);
+        pass.user.connection.SynchronizeProjectSubDirsR(project, project.Home, getRemoteProject(), false);
-        pass.tryRM(getBinary());
+        pass.user.connection.tryRM(getBinary());
         if (!task.binary_name.isEmpty()) {
             RemoteFile old_binary = new RemoteFile(getRemoteProject().full_name, task.binary_name);
-            pass.tryRM(old_binary);
+            pass.user.connection.tryRM(old_binary);
         }
         //отправить мейкфайл.
         Makefile makefile = task.getMakefile();
         File makefile_text = Utils.CreateTempFile("makefile", makefile.Generate(project));
-        pass.putSingleFile(makefile_text, new RemoteFile(getRemoteProject().full_name, "Makefile"));
+        pass.user.connection.putSingleFile(makefile_text, new RemoteFile(getRemoteProject().full_name, "Makefile"));
         //очистить все что связано с gcov
         //файлы gcda, gcno, gcov
-        pass.deleteFilesByExtensions(getRemoteProject(), "gcda", "gcno", "gcov");
+        pass.user.connection.deleteFilesByExtensions(getRemoteProject(), "gcda", "gcno", "gcov");
         //очистить служебные файлы.
         super.PrepareWorkspace();
     }
     @Override
     protected void StartTask() throws Exception {
         //UI.Info("starting task");
-        task.PID = pass.ShellCommand(
+        pass.user.connection.performScript(getRemoteProject(), getStartCommand()+" 1>PID");
-                "cd " + Utils.DQuotes(getRemoteProject().full_name),
+        RemoteFile PID = getPID();
-                getStartCommand());
+        while (!pass.user.connection.Exists(PID)){
+            System.out.println("PID NOT FOUND");
+            Utils.sleep(1000);
+        }
+        task.PID = pass.user.connection.readFromFile(PID).replace("\n","").replace("\r","");
+        System.out.println("PID="+Utils.Brackets(task.PID));
         task.state = TaskState.Running;
     }
     @Override
     protected void ValidateTaskResults() throws Exception {
-        if (pass.Exists(getBinary())) {
+        if (pass.user.connection.Exists(getBinary())) {
             RemoteFile renamed_binary = new RemoteFile(getRemoteProject().full_name, Utils.getDateName("spf_" + getBinary().name));
-            pass.sftpChannel.rename(getBinary().full_name, renamed_binary.full_name);
+            pass.user.connection.sftpChannel.rename(getBinary().full_name, renamed_binary.full_name);
             task.binary_name = renamed_binary.name;
             task.state = TaskState.Done;
         } else task.state = TaskState.DoneWithErrors;

src/GlobalData/Tasks/Supervisor/Remote/RemoteTaskSupervisor.java

@@ -5,7 +5,7 @@ import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.TaskSupervisor;
 import GlobalData.Tasks.Task;
 import GlobalData.Tasks.TaskState;
-import files.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSupervisor<T, ConnectionPass> {
     protected RemoteFile getRemoteProjectsPath() {
         return new RemoteFile(pass.user.getRemoteProjectsPath(), true);
@@ -16,6 +16,9 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     protected RemoteFile getBinary() {
         return new RemoteFile(getRemoteProject().full_name, "0");
     }
+    protected RemoteFile getPID() {
+        return new RemoteFile(getRemoteProject().full_name, "PID");
+    }
     protected RemoteFile getRemoteTime() {
         return new RemoteFile(getRemoteProject().full_name, Constants.time_file);
     }
@@ -34,40 +37,48 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     @Override
     protected void PrepareWorkspace() throws Exception {
         super.PrepareWorkspace(); //локальная подготовка
-        pass.tryRM(getDONE_file());
+        pass.user.connection.tryRM(getDONE_file());
-        pass.tryRM(getTIMEOUT_file());
+        pass.user.connection.tryRM(getPID());
-        pass.tryRM(getRemoteOutput());
+        pass.user.connection.tryRM(getTIMEOUT_file());
-        pass.tryRM(getRemoteErrors());
+        pass.user.connection.tryRM(getRemoteOutput());
-        pass.tryRM(getRemoteTime());
+        pass.user.connection.tryRM(getRemoteErrors());
+        pass.user.connection.tryRM(getRemoteTime());
     }
     @Override
     protected void CheckTask() throws Exception {
         RemoteFile DONE = new RemoteFile(getRemoteProject(), Constants.DONE);
         RemoteFile TIMEOUT = new RemoteFile(getRemoteProject(), Constants.TIMEOUT);
-        if (pass.Exists(DONE))
+        if (pass.user.connection.Exists(DONE))
             task.state = TaskState.Finished;
-        else if (pass.Exists(TIMEOUT))
+        else if (pass.user.connection.Exists(TIMEOUT))
             task.state = TaskState.AbortedByTimeout;
     }
     @Override
     protected void AchieveResults() throws Exception {
-        pass.tryGetSingleFileWithMaxSize(getRemoteOutput(), task.getOutputFile(), 10240);
+        pass.user.connection.tryGetSingleFileWithMaxSize(getRemoteOutput(), task.getOutputFile(), 10240);
-        pass.tryGetSingleFileWithMaxSize(getRemoteErrors(), task.getErrorsFile(), 10240);
+        pass.user.connection.tryGetSingleFileWithMaxSize(getRemoteErrors(), task.getErrorsFile(), 10240);
     }
     @Override
     protected void AbortTask() throws Exception {
-        pass.ShellCommand("kill -2 " + task.PID);
+        pass.user.connection.ShellCommand("kill -2 " + task.PID);
     }
     @Override
     protected void CalculatePerformanceTime() throws Exception {
-        if (pass.tryGetSingleFileWithMaxSize(getRemoteTime(), task.getTimeFile(), 0))
+        if (pass.user.connection.tryGetSingleFileWithMaxSize(getRemoteTime(), task.getTimeFile(), 0))
             task.RefreshTime();
     }
+    public String getStarter() {
+        return String.join("/", pass.user.workspace, "modules", "starter");
+    }
+    public String getLauncher() {
+        return String.join("/", pass.user.workspace, "modules", "launcher");
+    }
+
     protected String getStartCommand() {
         String res =
                 String.join(" ",
-                        Utils.DQuotes(pass.getStarter()),
+                        Utils.DQuotes(getStarter()),
-                        Utils.DQuotes(pass.getLauncher()),
+                        Utils.DQuotes(getLauncher()),
                         String.valueOf(task.maxtime),
                         Utils.DQuotes(getCoupDeGrace()),
                         task.getFullCommand()

src/GlobalData/Tasks/Supervisor/Remote/ServerRunSupervisor.java

@@ -16,10 +16,14 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
         String res = "./run";
         String env = String.join(" ", Current.getRunConfiguration().getEnvList());
         if (!env.isEmpty()) res = env + " " + res;
-        task.PID = pass.ShellCommand(
+        pass.user.connection.performScript(getRemoteProject(), "ulimit -s unlimited", res+" 1>PID");
-                "cd " + Utils.DQuotes(getRemoteProject().full_name),
+        RemoteFile PID = getPID();
-                "ulimit -s unlimited",
+        while (!pass.user.connection.Exists(PID)){
-                res);
+            System.out.println("PID NOT FOUND");
+            Utils.sleep(1000);
+        }
+        task.PID = pass.user.connection.readFromFile(PID).replace("\n","").replace("\r","");
+        System.out.println("PID="+Utils.Brackets(task.PID));
         task.state = TaskState.Running;
     }
     @Override
@@ -32,21 +36,21 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
         //-------------------------
         //удалить старую статистику если оная есть.
         if (!task.last_sts_name.isEmpty()) {
-            pass.tryRM(new RemoteFile(getRemoteProject().full_name, task.last_sts_name));
+            pass.user.connection.tryRM(new RemoteFile(getRemoteProject().full_name, task.last_sts_name));
             task.UpdateLastStsName("");
         }
         //-------------------------
         String launchScriptText = getLaunchScriptText();
         RemoteFile launchScript = new RemoteFile(getRemoteProject().full_name, "run");
-        pass.sftpChannel.put(
+        pass.user.connection.sftpChannel.put(
                 new ByteArrayInputStream(
                         launchScriptText.getBytes(StandardCharsets.UTF_8)), launchScript.full_name);
-        pass.sftpChannel.chmod(0777, launchScript.full_name);
+        pass.user.connection.sftpChannel.chmod(0777, launchScript.full_name);
         //-
         //отправить usr.par.
         if (task.hasDVMPar()) {
             File par_text = Utils.CreateTempFile("usr", String.join("\n", task.getRunConfiguration().getParList()));
-            pass.putSingleFile(par_text, new RemoteFile(getRemoteProject().full_name, "usr.par"));
+            pass.user.connection.putSingleFile(par_text, new RemoteFile(getRemoteProject().full_name, "usr.par"));
         }
     }
     protected String getLaunchScriptText() {
@@ -62,7 +66,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
         task.parseCleanTime();
         //теперь ищем статистику.
         //статистика
-        Vector<ChannelSftp.LsEntry> files = pass.sftpChannel.ls(getRemoteProject().full_name);
+        Vector<ChannelSftp.LsEntry> files = pass.user.connection.sftpChannel.ls(getRemoteProject().full_name);
         for (ChannelSftp.LsEntry file : files) {
             if (file.getFilename().endsWith("sts.gz+")) {
                 task.UpdateLastStsName(file.getFilename());
@@ -71,7 +75,7 @@ public class ServerRunSupervisor extends RemoteTaskSupervisor<RunTask> {
         }
         if (!task.last_sts_name.isEmpty()) {
             RemoteFile remote_sts = new RemoteFile(getRemoteProject().full_name, task.last_sts_name);
-            task.hasDvmSts = pass.tryGetSingleFileWithMaxSize(remote_sts, task.getLocalStsFile(), 10240);
+            task.hasDvmSts = pass.user.connection.tryGetSingleFileWithMaxSize(remote_sts, task.getLocalStsFile(), 10240);
         }
     }
 }

src/GlobalData/User/User.java

@@ -4,7 +4,6 @@ import Common.Current;
 import Common.Database.iDBObject;
 import GlobalData.Machine.Machine;
 import TestingSystem.DVM.UserConnection;
-import files.ConnectionPass;
 import com.sun.org.glassfish.gmbal.Description;
 
 import java.io.File;
@@ -53,20 +52,21 @@ public class User extends iDBObject {
     public File getLocalModulesDir() {
         return Paths.get(workspace, "modules").toFile();
     }
+
     public File getHeaderCodeFile() {
-        return Paths.get(workspace, "modules", ConnectionPass.Process_r_header).toFile();
+        return Paths.get(workspace, "modules", "Process_r.h").toFile();
     }
     public File getStarterCodeFile() {
-        return Paths.get(workspace, "modules", ConnectionPass.starter_code).toFile();
+        return Paths.get(workspace, "modules", "starter.cpp").toFile();
     }
     public File getStarterFile() {
-        return Paths.get(workspace, "modules", ConnectionPass.starter).toFile();
+        return Paths.get(workspace, "modules", "starter").toFile();
     }
     public File getLauncherCodeFile() {
-        return Paths.get(workspace, "modules", ConnectionPass.launcher_code).toFile();
+        return Paths.get(workspace, "modules", "launcher.cpp").toFile();
     }
     public File getLauncherFile() {
-        return Paths.get(workspace, "modules", ConnectionPass.launcher).toFile();
+        return Paths.get(workspace, "modules", "launcher").toFile();
     }
     //-
     @Description("IGNORE")

src/Repository/Component/Visualiser.java

@@ -62,7 +62,7 @@ public class Visualiser extends Component {
     //http://www.seostella.com/ru/article/2012/02/05/formatirovanie-daty-v-java.html
     @Override
     public void GetVersionInfo() {
-        version = 1062;
+        version = 1063;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());

src/TestingSystem/DVM/DVMTestingPlanner.java

@@ -16,7 +16,6 @@ import TestingSystem.DVM.DVMTasks.DVMCompilationTask;
 import TestingSystem.DVM.DVMTasks.DVMRunTask;
 import TestingSystem.DVM.DVMTasks.DVMTask;
 import Visual_DVM_2021.Passes.All.UnzipFolderPass;
-import files.ConnectionPass;
 import javafx.util.Pair;
 import org.apache.commons.io.FileUtils;
 
@@ -38,7 +37,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     protected File packageLocalWorkspace;
     //--
     public String getPlanner() {
-        return String.join("/", user.workspace, ConnectionPass.modules, ConnectionPass.planner);
+        return String.join("/", user.workspace, "modules", "planner");
     }
     //--
     //Получить ид тестов и их папки на сервере.

src/TestingSystem/DVM/UserConnection.java

@@ -6,6 +6,7 @@ import Common.Utils.Validators.ShellParser;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
+import ProjectData.Project.db_project_info;
 import Visual_DVM_2021.Passes.PassException;
 import com.jcraft.jsch.*;
 import javafx.util.Pair;
@@ -19,6 +20,7 @@ public class UserConnection {
     //--
     public ChannelSftp sftpChannel = null;
     public ChannelShell shellChannel = null;
+    public ChannelExec execChannel = null;
     //--
     JSch jsch = null;
     Session session = null;
@@ -92,10 +94,12 @@ public class UserConnection {
         }
         if (sftpChannel != null) sftpChannel.disconnect();
         if (shellChannel != null) shellChannel.disconnect();
+        if (execChannel != null) execChannel.disconnect();
         if (session != null) session.disconnect();
         //----------------------
         sftpChannel = null;
         shellChannel = null;
+        execChannel = null;
         jsch = null;
         session = null;
         //---
@@ -289,4 +293,122 @@ public class UserConnection {
         }
         return "";
     }
+    //--
+    public void tryRM(RemoteFile file) throws Exception {
+        if (Exists(file)) {
+            sftpChannel.rm(file.full_name);
+        }
+    }
+    //с проверкой.
+    public boolean tryGetSingleFileWithMaxSize(RemoteFile src, File dst, int maxSize) throws Exception {
+        if (Exists(src)) {
+            if ((maxSize == 0) || (getFileKBSize(src.full_name) <= maxSize)) {
+                getSingleFile(src.full_name, dst.getAbsolutePath());
+                return true;
+            } else {
+                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils.Brackets(src.full_name));
+            }
+        }
+        return false;
+    }
+    //--
+    public void SynchronizeProjectSubDirsR(db_project_info project, File local_dir, RemoteFile remote_dir, boolean data) throws Exception {
+       // ShowMessage2("синхронизация: " + local_dir.getName());
+        Vector<File> local_subdirs = project.getSubdirectoriesSimple(local_dir);
+        Vector<File> local_files = project.getActiveFilesForSynchronization(local_dir, data);
+        //------------------------------------------------------------------------
+        LinkedHashMap<String, RemoteFile> remote_subdirs = new LinkedHashMap<>();
+        LinkedHashMap<String, RemoteFile> remote_files = new LinkedHashMap<>();
+        Vector<ChannelSftp.LsEntry> files = sftpChannel.ls(remote_dir.full_name);
+        for (ChannelSftp.LsEntry file : files) {
+            if (file.getAttrs().isDir()) {
+                if (!file.getFilename().equals(".") && !file.getFilename().equals(".."))
+                    remote_subdirs.put(file.getFilename(), new RemoteFile(remote_dir.full_name, file.getFilename(), true));
+            } else {
+                RemoteFile rf = new RemoteFile(remote_dir.full_name, file.getFilename());
+                rf.updateTime = RemoteFile.convertUpdateTime(file.getAttrs().getMTime());
+                remote_files.put(file.getFilename(), rf);
+            }
+        }
+        for (File lsd : local_subdirs) {
+            RemoteFile rsd = null;
+            if (!remote_subdirs.containsKey(lsd.getName()))
+                sftpChannel.mkdir((rsd = new RemoteFile(remote_dir.full_name, lsd.getName(), true)).full_name);
+            else rsd = remote_subdirs.get(lsd.getName());
+            SynchronizeProjectSubDirsR(project, lsd, rsd, data);
+        }
+        for (File lf : local_files) {
+            RemoteFile rf = null;
+            if (!remote_files.containsKey(lf.getName())) {
+                rf = new RemoteFile(remote_dir.full_name, lf.getName());
+              //  ShowMessage2(lf.getName());
+                putSingleFile(lf, rf);
+            } else {
+                rf = remote_files.get(lf.getName());
+                if (lf.lastModified() > rf.updateTime) {
+                  //  ShowMessage2(lf.getName());
+                    putSingleFile(lf, rf);
+                }
+            }
+        }
+    }
+    //--
+    public Vector<RemoteFile> getFilesByExtensions(RemoteFile dir, String... extensions) throws Exception {
+        Vector<RemoteFile> res = new Vector<>();
+        Vector<ChannelSftp.LsEntry> files = sftpChannel.ls(dir.full_name);
+        for (ChannelSftp.LsEntry file : files) {
+            String[] data = file.getFilename().split("\\.");
+            if (data.length > 1) {
+                String file_extension = data[data.length - 1];
+                for (String extension : extensions) {
+                    if (file_extension.equalsIgnoreCase(extension))
+                        res.add(new RemoteFile(dir.full_name, file.getFilename()));
+                }
+            }
+        }
+        return res;
+    }
+    public void deleteFilesByExtensions(RemoteFile dir, String... extensions) throws Exception {
+        Vector<RemoteFile> to_delete = getFilesByExtensions(dir, extensions);
+        for (RemoteFile file : to_delete)
+            sftpChannel.rm(file.full_name);
+    }
+
+    public void Command(String... commands) throws Exception {
+        if (commands.length > 0) {
+            String command = String.join("\n", commands);
+            // UI.Print(DebugPrintLevel.Session, command);
+            //  UI.Print(DebugPrintLevel.Session, "Creating Exec Channel.");
+            execChannel = (ChannelExec) session.openChannel("exec");
+            execChannel.setErrStream(System.err);
+            execChannel.setCommand(command);
+            execChannel.connect();
+            BufferedReader in = new BufferedReader(new InputStreamReader(execChannel.getInputStream()));
+            while (in.readLine() != null) ;
+            execChannel.disconnect();
+        }
+    }
+    public String CommandWithAnswer(char end, String... commands) throws Exception {
+        String output = "";
+        if (commands.length > 0) {
+            String command = String.join("\n", commands);
+            //  UI.Print(DebugPrintLevel.Session, command);
+            //  UI.Print(DebugPrintLevel.Session, "Creating Exec Channel.");
+            //    System.out.println(Utils.Brackets(command));
+            execChannel = (ChannelExec) session.openChannel("exec");
+            execChannel.setErrStream(System.err);
+            InputStreamReader reader = new InputStreamReader(execChannel.getInputStream());
+            execChannel.setCommand(command);
+            execChannel.connect();
+            char[] chars = new char[1];
+            while (reader.read(chars) >= 0) if (chars[0] == end) break;
+            else output += chars[0];
+            execChannel.disconnect();
+        }
+        //  System.out.println(Utils.Brackets(output));
+        return output;
+    }
+    public void copy(RemoteFile src, RemoteFile dst) throws Exception {
+        ShellCommand("cp " + Utils.DQuotes(src.full_name) + " " + Utils.DQuotes(dst.full_name));
+    }
 }

src/Visual_DVM_2021/Passes/All/ArchivesBackupPass.java

@@ -4,7 +4,7 @@ import Common.Utils.Utils;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
-import files.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import com.jcraft.jsch.ChannelSftp;
 
 import java.io.File;
@@ -20,18 +20,14 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
         return true;
     }
     @Override
-    protected boolean needsInitialize() {
-        return false;
-    }
-    @Override
     protected void ServerAction() throws Exception {
-        String workspace_path = Utils.toU(Paths.get(sftpChannel.getHome(),Global.properties.BackupWorkspace).toString());
+        String workspace_path = Utils.toU(Paths.get(user.connection.sftpChannel.getHome(), Global.properties.BackupWorkspace).toString());
         RemoteFile workspace = new RemoteFile(workspace_path, true);
-        tryMKDir(workspace);
+        user.connection.MKDIR(workspace);
         RemoteFile dst = new RemoteFile(workspace.full_name, src.getName());
-        putSingleFile(src, dst);
+        user.connection.putSingleFile(src, dst);
         //-теперь, удалить старые файлы.
-        Vector<ChannelSftp.LsEntry> raw_files = sftpChannel.ls(workspace.full_name);
+        Vector<ChannelSftp.LsEntry> raw_files = user.connection.sftpChannel.ls(workspace.full_name);
         Vector<RemoteFile> files = new Vector<>();
         for (ChannelSftp.LsEntry file : raw_files) {
             if (!file.getAttrs().isDir()) {
@@ -44,7 +40,7 @@ public class ArchivesBackupPass extends ConnectionPass<File> {
         files.sort((o1, o2) -> (int) (o2.updateTime - o1.updateTime));
         for (int i = 2; i < files.size(); ++i) {
             System.out.println(files.get(i).full_name + ":" + files.get(i).updateTime);
-            sftpChannel.rm(files.get(i).full_name);
+            user.connection.sftpChannel.rm(files.get(i).full_name);
         }
         //--------------
     }

src/Visual_DVM_2021/Passes/All/Compile.java

@@ -70,6 +70,7 @@ public class Compile extends Pass_2021<db_project_info> {
                     subpass = passes.get(PassCode_2021.LinuxLocalCompilation);
                 break;
             case Undefined:
+            case MVS_cluster:
                 throw new PassException("Компиляция не реализована для типа машины " + Utils.DQuotes(Current.getMachine().type));
             default:
                 subpass = passes.get(PassCode_2021.RemoteCompilation);

src/Visual_DVM_2021/Passes/All/DownloadProject.java

@@ -24,19 +24,19 @@ public class DownloadProject extends CurrentConnectionPass {
             System.out.println(Current.getRemoteFile());
             remote_archive = new RemoteFile(src.full_name, src.name + ".zip", false);
             local_archive = Utils.getTempFileName(remote_archive.name);
-            if ((getFileKBSize(src.full_name)) <= maxSize) {
+            if ((user.connection.getFileKBSize(src.full_name)) <= maxSize) {
                 ShowMessage2("Запаковка папки проекта..");
-                Command(
+                user.connection.Command(
                         "cd " + Utils.DQuotes(src.full_name),
                         "zip -r " + Utils.DQuotes(remote_archive.full_name) + " ./"
                 );
                 //  try {
                 ShowMessage2("Загрузка проекта..");
-                getSingleFile(remote_archive.full_name, local_archive.getAbsolutePath());
+                user.connection.getSingleFile(remote_archive.full_name, local_archive.getAbsolutePath());
                 //  } catch (Exception ex) {
                 //      throw new PassException("Ошибка загрузки");
                 //  }
-                sftpChannel.rm(remote_archive.full_name);
+                user.connection.sftpChannel.rm(remote_archive.full_name);
             } else throw new PassException("Размер проекта превышает " + maxSize + " KB.\n");
         } else {
             //диалога не вышло, сбрасываем файл.

src/Visual_DVM_2021/Passes/All/InstallServerSapfor.java

@@ -8,7 +8,7 @@ import Repository.Server.ServerCode;
 import Repository.Server.ServerExchangeUnit_2021;
 import TestingSystem.SAPFOR.ServerSapfor.ServerSapfor;
 import Visual_DVM_2021.Passes.PassCode_2021;
-import files.ConnectionPass;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 import Visual_DVM_2021.Passes.Server.TestingSystemPass;
 
 import java.util.Date;
@@ -39,39 +39,39 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
         return true;
     }
     @Override
-    protected boolean needsInitialize() {
-        return false;
-    }
-    @Override
     protected boolean needsAnimation() {
         return true;
     }
     @Override
     protected void ServerAction() throws Exception {
-        RemoteFile testingSystemHome = new RemoteFile(sftpChannel.pwd(), "_testing_system", true);
+        RemoteFile testingSystemHome = new RemoteFile(user.connection.sftpChannel.pwd(), "_testing_system", true);
         RemoteFile repo = new RemoteFile(testingSystemHome.full_name, "Repo", true);
         RemoteFile repoSapforHome = new RemoteFile(repo.full_name + Constants.SAPFOR_REPOSITORY_BIN, true);
         //--
         ShowMessage1("Синхронизация ветви DVM...");
-        ShellCommand("cd " + Utils.DQuotes(repo.full_name), "svn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + Constants.DVM_REPOSITORY + "\n");
+        user.connection.performScript(repo,
+                "svn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + Constants.DVM_REPOSITORY + "\n"
+                );
         ShowMessage1("Синхронизация ветви SAPFOR...");
-        ShellCommand("cd " + Utils.DQuotes(repo.full_name), "svn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + Constants.SAPFOR_REPOSITORY + "\n");
+        user.connection.performScript(repo,
+                "svn checkout " + Constants.REPOSITORY_AUTHENTICATION + " " + Constants.SAPFOR_REPOSITORY + "\n"
+        );
         ShowMessage1("Сборка SAPFOR...");
         //-
         RemoteFile repo_bin = new RemoteFile(repoSapforHome.full_name, "Sapfor_F");
-        if (Exists(repo_bin))
+        if (user.connection.Exists(repo_bin))
-            sftpChannel.rm(repo_bin.full_name);
+            user.connection.sftpChannel.rm(repo_bin.full_name);
         //--
-        performScript(repoSapforHome, "cmake ../", "make -j 4");
+        user.connection.performScript(repoSapforHome, "cmake ../", "make -j 4");
         RemoteFile repoSapfor = new RemoteFile(repoSapforHome, "Sapfor_F");
-        result = Exists(repoSapfor);
+        result = user.connection.Exists(repoSapfor);
         if (result) {
             RemoteFile sapforsDirectory = new RemoteFile(testingSystemHome.full_name, "Sapfors", true);
             //создать папку. Для того чтобы скопировать из репозитория.
             RemoteFile sapforHome = new RemoteFile(sapforsDirectory.full_name, Utils.getDateName("sapfor"));
-            tryMKDir(sapforHome);
+            user.connection.MKDIR(sapforHome);
             RemoteFile sapforBin = new RemoteFile(sapforHome, "Sapfor_F");
-            copy(repo_bin, sapforBin);
+            user.connection.copy(repo_bin, sapforBin);
             //-->>>
             serverSapfor = new ServerSapfor();
             serverSapfor.home_path = sapforHome.full_name;
@@ -79,9 +79,13 @@ public class InstallServerSapfor extends ConnectionPass<Object> {
             serverSapfor.languageName = LanguageName.fortran;
             serverSapfor.buildDate = new Date().getTime();
             ///--->>
-            String raw = ShellCommand(serverSapfor.getVersionCommand());
+            RemoteFile version =new RemoteFile(sapforHome, "version.txt");
+            user.connection.ShellCommand(serverSapfor.getVersionCommand()+" 1>"+Utils.DQuotes(version.full_name));
+            if (user.connection.Exists(version)){
+                String raw = user.connection.readFromFile(version);
                 String[] data = raw.split(" ");
                 if (data.length >= 4) serverSapfor.version = data[3].replace(",", "");
+            }
             //---
         }
     }

src/Visual_DVM_2021/Passes/All/LocalInitaliseUser.java

@@ -5,7 +5,6 @@ import Common.Utils.Utils;
 import GlobalData.User.User;
 import GlobalData.User.UserState;
 import Visual_DVM_2021.Passes.ProcessPass;
-import files.ConnectionPass;
 import org.apache.commons.io.FileUtils;
 
 import java.io.File;
@@ -38,13 +37,13 @@ public class LocalInitaliseUser extends ProcessPass<User> {
             PerformScript(
                     String.join("\n",
                             "cd " + Utils.DQuotes(target.getLocalModulesDir()),
-                            "g++ " + ConnectionPass.starter_code + " -o " + ConnectionPass.starter,
+                            "g++ starter -o starter",
-                            "chmod 0777 " + ConnectionPass.starter
+                            "chmod 0777 starter"
                     ));
             PerformScript(String.join("\n",
                     "cd " + Utils.DQuotes(target.getLocalModulesDir()),
-                    "g++ " + ConnectionPass.launcher_code + " -o " + ConnectionPass.launcher,
+                    "g++ launcher.cpp  -o launcher",
-                    "chmod 0777 " + ConnectionPass.launcher
+                    "chmod 0777 launcher"
             ));
         }
         //-

src/Visual_DVM_2021/Passes/All/RemoteInitialiseUser.java

@@ -4,10 +4,10 @@ import Common.Current;
 import Common.Utils.Utils;
 import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.SSH.ConnectionPass_2023;
+import Visual_DVM_2021.Passes.SSH.ConnectionPass;
 
 import java.util.Vector;
-public class RemoteInitialiseUser extends ConnectionPass_2023<RemoteFile> {
+public class RemoteInitialiseUser extends ConnectionPass<RemoteFile> {
     RemoteFile modulesDirectory;
     @Override
     protected boolean needsAnimation() {

src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java

@@ -1,4 +1,6 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
 import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
 public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     String command = "";
@@ -12,6 +14,10 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     }
     @Override
     protected void ServerAction() throws Exception {
-        target = ShellCommand(command);
+        RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils.getDateName("out"));
+        user.connection.ShellCommand(command+" 1>"+Utils.DQuotes(file.full_name));
+        if (user.connection.Exists(file)){
+            target = user.connection.readFromFile(file);
+        }
     }
 }

src/Visual_DVM_2021/Passes/All/Run.java

@@ -64,10 +64,13 @@ public class Run extends Pass_2021<db_project_info> {
                     subpass = passes.get(PassCode_2021.LinuxLocalRun);
                 break;
             case Undefined:
+            case MVS_cluster:
                 throw new PassException("Запуск не реализован для типа машины " + Utils.DQuotes(Current.getMachine().type));
+                /*
             case MVS_cluster:
                 subpass = passes.get(PassCode_2021.MVSRun);
                 break;
+                 */
             default:
                 subpass = passes.get(PassCode_2021.ServerRun);
                 break;

src/Visual_DVM_2021/Passes/OLD/AttachFileToProject.java

@@ -1,38 +0,0 @@
-package Visual_DVM_2021.Passes.OLD;
-public class AttachFileToProject {
-
-}
-    /*
-        extends ToolBarPass<File> {
-    VFileChooser fileChooser = new VFileChooser(
-            "Выбор вложения",
-            "png",
-            "jpg",
-            "bmp",
-            "zip",
-            "7z",
-            "rar"
-    );
-    @Override
-    protected String getIconPath() {
-        return "/icons/LastOpened.png";
-    }
-    @Override
-    protected boolean CanStart() {
-        return Current.Check(Log, Current.Project) &&
-                ((target = fileChooser.ShowDialog()) != null) &&
-                Current.getProject().CheckAttachmentFile(target, Log);
-    }
-    @Override
-    protected void Action() throws Exception {
-        Utils.CheckDirectory(Current.getProject().getAttachmentsDirectory());
-        Path src = target.toPath();
-        Path dst = Paths.get(Current.getProject().getAttachmentsDirectory().getAbsolutePath(), target.getName());
-        Files.copy(src, dst, StandardCopyOption.REPLACE_EXISTING);
-    }
-    @Override
-    protected void PerformDone() throws Exception {
-        //  UI.getMainWindow().ShowAttachments();
-    }
-}
-     */

src/Visual_DVM_2021/Passes/OLD/DeleteAttachments.java

@@ -1,23 +0,0 @@
-package Visual_DVM_2021.Passes.OLD;
-
-public class DeleteAttachments {}
-        /*
-        extends ToolBarPass {
-    @Override
-    protected String getIconPath() {
-        return "/icons/Delete.png";
-    }
-    @Override
-    protected boolean CanStart() {
-        return Current.Check(Log, Current.Project) && UI.Warning("Удалить все вложения текущего проекта");
-    }
-    @Override
-    protected void Action() throws Exception {
-        Utils.CleanDirectory(Current.getProject().getAttachmentsDirectory());
-    }
-    @Override
-    protected void PerformFinish() {
-        // UI.getMainWindow().ShowAttachments();
-    }
-}
-*/

src/Visual_DVM_2021/Passes/SSH/ConnectionPass.java

@@ -3,9 +3,9 @@ import GlobalData.Machine.Machine;
 import GlobalData.User.User;
 import TestingSystem.DVM.UserConnection;
 import Visual_DVM_2021.Passes.Pass_2021;
-public class ConnectionPass_2023<T> extends Pass_2021<T> {
+public class ConnectionPass<T> extends Pass_2021<T> {
     protected Machine machine = null;
-    protected User user = null;
+    public User user = null;
     //--
     protected void Connect() throws Exception{
         user.connection = null;

src/Visual_DVM_2021/Passes/SSH/CurrentConnectionPass.java

@@ -1,6 +1,5 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.Current;
-import files.ConnectionPass;
 //завязан на текущие машину и юзера
 public abstract class CurrentConnectionPass<T> extends ConnectionPass<T> {
     @Override

src/Visual_DVM_2021/Passes/SSH/TaskConnectionPass.java

@@ -1,8 +1,9 @@
 package Visual_DVM_2021.Passes.SSH;
 import Common.Current;
 import Common.Global;
+import Common.Utils.Utils;
+import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.Tasks.Supervisor.Remote.RemoteTaskSupervisor;
-import files.ConnectionPass;
 public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends ConnectionPass {
     public S supervisor; //инициализация идет в конструкторе потомка.
     public TaskConnectionPass(Class<S> s_class) {
@@ -21,6 +22,14 @@ public abstract class TaskConnectionPass<S extends RemoteTaskSupervisor> extends
         machine = supervisor.task.getMachine();
         user = supervisor.task.getUser();
         super.Connect();
+        RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
+        if (!user.connection.Exists(userWorkspace))
+            throw new WorkspaceNotFoundException(
+                    "Рабочее пространство пользователя " + Utils.Brackets(user.login)
+                            + " на машине " + Utils.Brackets(machine.getURL())
+                            + "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
+                            "Требуется выполнить повторную инициализацию пользователя."
+            );
     }
     @Override
     protected void ServerAction() throws Exception {

src/Visual_DVM_2021/Passes/SapforPass.java

@@ -4,10 +4,6 @@ import Common.UI.UI;
 public class SapforPass extends SilentSapforPass {
     //отличается наличием журнала и сообщений
     @Override
-    protected void performPreparation() throws Exception {
-        //   target.CleanInterruptFile();
-    }
-    @Override
     protected void performFinish() throws Exception {
         target.db.BeginTransaction();
         try {

src/Visual_DVM_2021/Passes/SilentSapforPass.java

@@ -19,6 +19,10 @@ public class SilentSapforPass extends CurrentProjectPass {
         return super.canStart(args) && ((sapfor = Current.getSapfor()) != null);
     }
     @Override
+    protected void performPreparation() throws Exception {
+           target.CleanInterruptFile();
+    }
+    @Override
     protected boolean validate() {
         switch (sapfor.getErrorCode()) {
             case Sapfor.empty_code:

src/files/ConnectionPass.java

@@ -1,416 +0,0 @@
-package files;
-import Common.Constants;
-import Common.Utils.Utils;
-import Common.Utils.Validators.ShellParser;
-import GlobalData.Machine.Machine;
-import GlobalData.RemoteFile.RemoteFile;
-import GlobalData.User.User;
-import ProjectData.Project.db_project_info;
-import Visual_DVM_2021.Passes.PassException;
-import Visual_DVM_2021.Passes.Pass_2021;
-import Visual_DVM_2021.Passes.SSH.WorkspaceNotFoundException;
-import com.jcraft.jsch.*;
-import javafx.util.Pair;
-
-import java.io.*;
-import java.net.SocketException;
-import java.net.SocketTimeoutException;
-import java.net.UnknownHostException;
-import java.nio.charset.StandardCharsets;
-import java.util.LinkedHashMap;
-import java.util.Vector;
-//убираем лишний класс-прослойку.
-//старый server pass Пока не трогаем.
-//https://stackoverflow.com/questions/15108923/sftp-file-transfer-using-java-jsch
-//https://javadevblog.com/kak-dobavit-biblioteku-jar-fajl-v-proekt-intellij-idea.html
-//http://www.jcraft.com/jsch/
-//http://developer-remarks.blogspot.com/2013/05/ssh-via-jsch-example.html
-//https://stackoverflow.com/questions/4194439/sending-commands-to-server-via-jsch-shell-channel
-//todo вывести его. уже есть UserConnection.
-public abstract class ConnectionPass<T> extends Pass_2021<T> {
-    //-----------------------------------------------
-    public static final String modules = "modules";
-    //--------------
-    public static final String starter = "starter";
-    public static final String launcher = "launcher";
-    public static final String planner = "planner";
-    //--------------
-    public static final String Process_r_header = "Process_r.h";
-    public static final String starter_code = "starter.cpp";
-    public static final String launcher_code = "launcher.cpp";
-    //--------------
-    public static final String projects = "projects";
-    public static final String compilers = "compilers";
-    public static final String tests = "tests";
-    public Machine machine = null;
-    public User user = null;
-    //тут как в WinScp  - 2 независимых канала. один для файлов. другой для команд.
-    public ChannelSftp sftpChannel = null;
-    public ChannelShell shellChannel = null;
-    public ChannelExec execChannel = null;
-    //----------------------------------------------------
-    protected JSch jsch;
-    protected Session session = null;
-    protected boolean needsInitialize() {
-        return true;
-    }
-    //-------------------------------------
-    protected boolean isConnected = false; //пока
-    public ChannelSftp getSftpChannel() {
-        return sftpChannel;
-    }
-    //учитывать. что пока сокет не создан, прервать соединение нельзя.
-    public void Connect() throws Exception {
-        isConnected = false;
-        session = (jsch = new JSch()).getSession(user.login, machine.address, machine.port);
-        switch (user.authentication) {
-            case password:
-                session.setPassword(user.password);
-                break;
-                /* пока не совсем ясно как это делать.
-            case key:
-               // https://stackoverflow.com/questions/47422025/java-sftp-authentication-with-ppk-file
-                //todo перешифровать ключ https://www.example-code.com/java/ssh_ppk_to_pem.asp
-                jsch.addIdentity(user.password);
-                break;
-
-                 */
-        }
-        session.setConfig("StrictHostKeyChecking", "no");
-        //UI.Print("Establishing Connection...");
-        ShowMessage1("соединение с машиной " + Utils.Brackets(machine.getURL()) + "..");
-        session.connect(0);
-        //UI.Print("Connection established.");
-        //UI.Print("Creating SFTP Channel.");
-        sftpChannel = (ChannelSftp) session.openChannel("sftp");
-        sftpChannel.connect();
-        isConnected = true; // теперь можно прерывать метод.
-        if (needsInitialize()) {
-            RemoteFile userWorkspace = new RemoteFile(user.workspace, true);
-            if (!Exists(userWorkspace))
-                throw new WorkspaceNotFoundException(
-                        "Рабочее пространство пользователя " + Utils.Brackets(user.login)
-                                + " на машине " + Utils.Brackets(machine.getURL())
-                                + "\n" + Utils.Brackets(user.workspace) + "\nне найдено.\n" +
-                                "Требуется выполнить повторную инициализацию пользователя."
-                );
-        }
-    }
-    public void Disconnect() {
-        if (sftpChannel != null) sftpChannel.disconnect();
-        if (execChannel != null) execChannel.disconnect();
-        if (session != null) session.disconnect();
-        //----------------------
-        sftpChannel = null;
-        execChannel = null;
-        session = null;
-        isConnected = false;
-        //---------------------
-//        UI.Print(DebugPrintLevel.Session, "session ended");
-    }
-    @Override
-    protected void performFinish() throws Exception {
-        Disconnect();
-    }
-    public void Command(String... commands) throws Exception {
-        if (commands.length > 0) {
-            String command = String.join("\n", commands);
-            // UI.Print(DebugPrintLevel.Session, command);
-            //  UI.Print(DebugPrintLevel.Session, "Creating Exec Channel.");
-            execChannel = (ChannelExec) session.openChannel("exec");
-            execChannel.setErrStream(System.err);
-            execChannel.setCommand(command);
-            execChannel.connect();
-            BufferedReader in = new BufferedReader(new InputStreamReader(execChannel.getInputStream()));
-            while (in.readLine() != null) ;
-            execChannel.disconnect();
-        }
-    }
-    public String CommandWithAnswer(char end, String... commands) throws Exception {
-        String output = "";
-        if (commands.length > 0) {
-            String command = String.join("\n", commands);
-            //  UI.Print(DebugPrintLevel.Session, command);
-            //  UI.Print(DebugPrintLevel.Session, "Creating Exec Channel.");
-            //    System.out.println(Utils.Brackets(command));
-            execChannel = (ChannelExec) session.openChannel("exec");
-            execChannel.setErrStream(System.err);
-            InputStreamReader reader = new InputStreamReader(execChannel.getInputStream());
-            execChannel.setCommand(command);
-            execChannel.connect();
-            char[] chars = new char[1];
-            while (reader.read(chars) >= 0) if (chars[0] == end) break;
-            else output += chars[0];
-            execChannel.disconnect();
-        }
-        //  System.out.println(Utils.Brackets(output));
-        return output;
-    }
-    //https://stackoverflow.com/questions/4194439/sending-commands-to-server-via-jsch-shell-channel
-    @Override
-    protected void CheckException(Exception ex) {
-        if (ex instanceof WorkspaceNotFoundException) {
-            Log.Writeln_(ex.getMessage());
-            return;
-        }
-        Throwable cause = getCauseRec(ex);
-        if ((cause instanceof UnknownHostException) || (cause instanceof SocketException)) {
-            Log.Writeln(machine.getFullDescription() + " не найден(а).\n" + "Проверьте наличие подключения к сети.");
-        } else if (cause instanceof SocketTimeoutException) {
-            Log.Writeln(machine.getFullDescription() + " не отвечает.");
-        } else super.CheckException(ex);
-    }
-    public Vector<String> read_file_lines(String path_r) throws Exception {
-        Vector<String> res = new Vector<>();
-        InputStream out = sftpChannel.get(path_r);
-        BufferedReader br = new BufferedReader(new InputStreamReader(out));
-        String line;
-        while ((line = br.readLine()) != null) res.add(line);
-        br.close();
-        return res;
-    }
-    public void getSingleFile(String src, String dst) throws Exception {
-        sftpChannel.get(src, dst);
-    }
-    //с проверкой.
-    public boolean tryGetSingleFileWithMaxSize(RemoteFile src, File dst, int maxSize) throws Exception {
-        if (Exists(src)) {
-            if ((maxSize == 0) || (getFileKBSize(src.full_name) <= maxSize)) {
-                getSingleFile(src.full_name, dst.getAbsolutePath());
-                return true;
-            } else {
-                Utils.WriteToFile(dst, "Размер файла превышает " + maxSize + " KB.\n" + "Файл не загружен. Его можно просмотреть на машине по адресу\n" + Utils.Brackets(src.full_name));
-            }
-        }
-        return false;
-    }
-    public void putSingleFile(File src, RemoteFile dst) throws Exception {
-        sftpChannel.put(src.getAbsolutePath(), dst.full_name);
-    }
-    public void tryMKDir(RemoteFile dir) throws Exception {
-        if (!Exists(dir)) sftpChannel.mkdir(dir.full_name);
-    }
-    public void tryRM(RemoteFile file) throws Exception {
-        if (Exists(file))
-            sftpChannel.rm(file.full_name);
-    }
-    public void putSingleFile(String src, String dst) throws Exception {
-        sftpChannel.put(src, dst);
-    }
-    public void put_resource(String res_name) throws Exception {
-        putSingleFile(Utils.CreateTempResourceFile(res_name).getAbsolutePath(), res_name);
-    }
-    @Override
-    public void body() throws Exception {
-        Connect();
-        ServerAction();
-    }
-    protected void ServerAction() throws Exception {
-    }
-    //https://losst.ru/komanda-find-v-linux#%D0%9E%D1%81%D0%BD%D0%BE%D0%B2%D0%BD%D1%8B%D0%B5_%D0%BF%D0%B0%D1%80%D0%B0%D0%BC%D0%B5%D1%82%D1%80%D1%8B_%D0%BA%D0%BE%D0%BC%D0%B0%D0%BD%D0%B4%D1%8B_find
-    public String getStarter() {
-        return String.join("/", user.workspace, modules, starter);
-    }
-    public String getLauncher() {
-        return String.join("/", user.workspace, modules, launcher);
-    }
-    //насчет даты.
-    //http://i-leon.ru/tools/time
-    //этот метод для того чтобы не пересылать подверсии. В случае тестов их наличие исключено!
-    public void SynchronizeProjectSubDirsR(db_project_info project, File local_dir, RemoteFile remote_dir, boolean data) throws Exception {
-        ShowMessage2("синхронизация: " + local_dir.getName());
-        Vector<File> local_subdirs = project.getSubdirectoriesSimple(local_dir);
-        Vector<File> local_files = project.getActiveFilesForSynchronization(local_dir, data);
-        //------------------------------------------------------------------------
-        LinkedHashMap<String, RemoteFile> remote_subdirs = new LinkedHashMap<>();
-        LinkedHashMap<String, RemoteFile> remote_files = new LinkedHashMap<>();
-        Vector<ChannelSftp.LsEntry> files = sftpChannel.ls(remote_dir.full_name);
-        for (ChannelSftp.LsEntry file : files) {
-            if (file.getAttrs().isDir()) {
-                if (!file.getFilename().equals(".") && !file.getFilename().equals(".."))
-                    remote_subdirs.put(file.getFilename(), new RemoteFile(remote_dir.full_name, file.getFilename(), true));
-            } else {
-                RemoteFile rf = new RemoteFile(remote_dir.full_name, file.getFilename());
-                rf.updateTime = RemoteFile.convertUpdateTime(file.getAttrs().getMTime());
-                remote_files.put(file.getFilename(), rf);
-            }
-        }
-        for (File lsd : local_subdirs) {
-            RemoteFile rsd = null;
-            if (!remote_subdirs.containsKey(lsd.getName()))
-                sftpChannel.mkdir((rsd = new RemoteFile(remote_dir.full_name, lsd.getName(), true)).full_name);
-            else rsd = remote_subdirs.get(lsd.getName());
-            SynchronizeProjectSubDirsR(project, lsd, rsd, data);
-        }
-        for (File lf : local_files) {
-            RemoteFile rf = null;
-            if (!remote_files.containsKey(lf.getName())) {
-                rf = new RemoteFile(remote_dir.full_name, lf.getName());
-                ShowMessage2(lf.getName());
-                putSingleFile(lf, rf);
-            } else {
-                rf = remote_files.get(lf.getName());
-                if (lf.lastModified() > rf.updateTime) {
-                    ShowMessage2(lf.getName());
-                    putSingleFile(lf, rf);
-                }
-            }
-        }
-    }
-    protected int getFileKBSize(String path) throws Exception {
-        return Integer.parseInt(CommandWithAnswer('\t', "du " + Utils.DQuotes(path)));
-    }
-    //https://stackoverflow.com/questions/4194439/sending-commands-to-server-via-jsch-shell-channel
-    public String ShellCommand(String... commands) throws Exception {
-        shellChannel = (ChannelShell) session.openChannel("shell");
-        PipedInputStream in = new PipedInputStream();
-        PipedOutputStream out = new PipedOutputStream();
-        shellChannel.setInputStream(in);
-        shellChannel.setOutputStream(out);
-        PipedOutputStream pin = new PipedOutputStream(in);
-        PipedInputStream pout = new PipedInputStream(out);
-        shellChannel.connect();
-        InputStreamReader fromServer = new InputStreamReader(pout);
-        ShellParser.setUserName(user.login);
-        ShellParser.ReadInvitation(fromServer);
-        //  System.out.println("first invitation read");
-        String result = "";
-        //формат работы с шеллом.
-        //<эхо-команды\n><ответ команды><приглашение\n><приглашение>
-        for (String command : commands) {
-            // System.out.println(command);
-            pin.write((command + "\r\n").getBytes());
-            ShellParser.ReadLine(fromServer);
-            //  UI.Info("echo read");
-            ShellParser.ReadInvitation(fromServer);
-            //  UI.Info("first invitation read");
-            result = ShellParser.getCommandResult(fromServer);
-            //  UI.Info("result = " + Utils.Brackets(result));
-        }
-        shellChannel.disconnect();
-        return result;
-    }
-    public Vector<RemoteFile> getFilesByExtensions(RemoteFile dir, String... extensions) throws Exception {
-        Vector<RemoteFile> res = new Vector<>();
-        Vector<ChannelSftp.LsEntry> files = sftpChannel.ls(dir.full_name);
-        for (ChannelSftp.LsEntry file : files) {
-            String[] data = file.getFilename().split("\\.");
-            if (data.length > 1) {
-                String file_extension = data[data.length - 1];
-                for (String extension : extensions) {
-                    if (file_extension.equalsIgnoreCase(extension))
-                        res.add(new RemoteFile(dir.full_name, file.getFilename()));
-                }
-            }
-        }
-        return res;
-    }
-    public void deleteFilesByExtensions(RemoteFile dir, String... extensions) throws Exception {
-        Vector<RemoteFile> to_delete = getFilesByExtensions(dir, extensions);
-        for (RemoteFile file : to_delete)
-            sftpChannel.rm(file.full_name);
-    }
-    public void copy(RemoteFile src, RemoteFile dst) throws Exception {
-        ShellCommand("cp " + Utils.DQuotes(src.full_name) + " " + Utils.DQuotes(dst.full_name));
-    }
-    //-------
-    public void writeToFile(String text, RemoteFile dst) throws Exception {
-        sftpChannel.put(new ByteArrayInputStream(text.getBytes(StandardCharsets.UTF_8)), dst.full_name);
-        sftpChannel.chmod(0777, dst.full_name);
-    }
-    public void SynchronizeSubDirsR(File local_dir, RemoteFile remote_dir) throws Exception {
-        File[] local_subdirs = local_dir.listFiles(File::isDirectory);
-        File[] local_files = local_dir.listFiles(File::isFile);
-        //------------------------------------------------------------------------
-        LinkedHashMap<String, RemoteFile> remote_subdirs = new LinkedHashMap<>();
-        LinkedHashMap<String, RemoteFile> remote_files = new LinkedHashMap<>();
-        Vector<ChannelSftp.LsEntry> files = sftpChannel.ls(remote_dir.full_name);
-        for (ChannelSftp.LsEntry file : files) {
-            if (file.getAttrs().isDir()) {
-                if (!file.getFilename().equals(".") && !file.getFilename().equals(".."))
-                    remote_subdirs.put(file.getFilename(), new RemoteFile(remote_dir.full_name, file.getFilename(), true));
-            } else {
-                RemoteFile rf = new RemoteFile(remote_dir.full_name, file.getFilename());
-                rf.updateTime = RemoteFile.convertUpdateTime(file.getAttrs().getMTime());
-                remote_files.put(file.getFilename(), rf);
-            }
-        }
-        if (local_subdirs != null) {
-            for (File lsd : local_subdirs) {
-                if (!lsd.getName().equals(Constants.data)) {
-                    RemoteFile rsd = null;
-                    if (!remote_subdirs.containsKey(lsd.getName()))
-                        sftpChannel.mkdir((rsd = new RemoteFile(remote_dir.full_name, lsd.getName(), true)).full_name);
-                    else rsd = remote_subdirs.get(lsd.getName());
-                    SynchronizeSubDirsR(lsd, rsd);
-                }
-            }
-        }
-        if (local_files != null) {
-            for (File lf : local_files) {
-                RemoteFile rf = null;
-                if (!remote_files.containsKey(lf.getName())) {
-                    rf = new RemoteFile(remote_dir.full_name, lf.getName());
-                    putSingleFile(lf, rf);
-                } else {
-                    rf = remote_files.get(lf.getName());
-                    if (lf.lastModified() > rf.updateTime) {
-                        putSingleFile(lf, rf);
-                    }
-                }
-            }
-        }
-    }
-    public void RMDIR(String dir) throws Exception {
-        if (!dir.isEmpty() && !dir.equals("/") && !dir.equals("\\") && !dir.equals("*")) {
-            ShellCommand("rm -rf " + Utils.DQuotes(dir));
-        } else throw new PassException("Недопустимый путь для удаления папки " + Utils.DQuotes(dir));
-    }
-    //скорее всего,временные методы. они есть в UserConnection, при удаленном запуске тестирования
-    //--------------------------------------------------------------------------------
-    public void MKDIR(RemoteFile dir) throws Exception {
-        if (!Exists(dir)) sftpChannel.mkdir(dir.full_name);
-    }
-    //--
-    public Pair<RemoteFile, RemoteFile> performScript(RemoteFile directory, String... commands) throws Exception {
-        RemoteFile script_file = new RemoteFile(directory.full_name, Constants.script);
-        RemoteFile out = new RemoteFile(directory.full_name, Constants.out_file);
-        RemoteFile err = new RemoteFile(directory.full_name, Constants.err_file);
-        //
-        Vector<RemoteFile> files = new Vector<>();
-        files.add(script_file);
-        files.add(out);
-        files.add(err);
-        for (RemoteFile file : files) {
-            if (Exists(file))
-                sftpChannel.rm(file.full_name);
-        }
-        //--
-        writeToFile(String.join("\n", commands), script_file);
-        //--
-        ShellCommand("cd " + Utils.DQuotes(directory.full_name),
-                script_file.full_name + " 1>" + Constants.out_file + " 2>" + Constants.err_file);
-        return new Pair<>(out, err);
-    }
-    //--
-    //--сам себя
-    public boolean Exists(String file_full_name) throws Exception {
-        try {
-            sftpChannel.stat(file_full_name);
-            return true;
-        } catch (SftpException e) {
-            if (e.id == ChannelSftp.SSH_FX_NO_SUCH_FILE) {
-                // file doesn't exist
-                return false;
-            } else {
-                // something else went wrong
-                throw e;
-            }
-        }
-    }
-    public boolean Exists(RemoteFile file) throws Exception {
-        return Exists(file.full_name);
-    }
-}
-
-