рефакторинг команд ssh

v++
динамическая смена названия прохода Анализ Кода

.idea/workspace.xml

@@ -8,6 +8,21 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/UI/Menus_2023/PassControl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/PassControl.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/Repository/Component/Visualiser.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Visualiser.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ComponentsServer.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/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/CheckAccount.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/SPF_GetArrayDistribution.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/UpdateSetting.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" />

src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java

@@ -61,8 +61,7 @@ public class MainMenuBar extends VisualiserMenuBar {
                 setIcon("/icons/Apply.png");
                 setToolTipText("Test");
                 addActionListener(e -> {
-                  // Pass_2021.passes.get(PassCode_2021.TestPass).Do();
+                   Pass_2021.passes.get(PassCode_2021.TestPass).Do();
-                    Current.getFile().form.SwitchGraphs(false);
                 });
             }
         });

src/Common/UI/Menus_2023/MainMenuBar/TransformationsMenu.java

@@ -10,7 +10,7 @@ public class TransformationsMenu extends VisualiserMenu {
         add(new PassesSubMenu("Циклы", "/icons/Menu/Loops.png",
                 Sapfor.getLoopsTransformationsCodes()));
         addSeparator();
-        add(new PassesSubMenu("Вставка директив приватизации", "/icons/Menu/Privates.png",
+        add(new PassesSubMenu("Приватные переменные", "/icons/Menu/Privates.png",
                 Sapfor.getPrivatesTransformationsCodes()));
         addSeparator();
         add(new PassesSubMenu("Процедуры", "/icons/Menu/Functions.png",

src/Common/UI/Menus_2023/PassControl.java

@@ -4,4 +4,5 @@ public interface PassControl {
     void setEnabled(boolean flag);
     void setVisible(boolean flag);
     void setToolTipText(String text);
+    void setText(String text);
 }

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

@@ -60,7 +60,7 @@ public abstract class RemoteTaskSupervisor<T extends Task> extends TaskSuperviso
     }
     @Override
     protected void AbortTask() throws Exception {
-        pass.user.connection.ShellCommand("kill -2 " + task.PID);
+        pass.user.connection.Command("kill -2 " + task.PID);
     }
     @Override
     protected void CalculatePerformanceTime() throws Exception {

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 = 1086;
+        version = 1088;
         String pattern = "MMM dd yyyy HH:mm:ss";
         DateFormat df = new SimpleDateFormat(pattern, Locale.ENGLISH);
         date_text = df.format(getClassBuildTime());

src/Repository/Server/ComponentsServer.java

@@ -46,7 +46,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
                 if (subscriber.mailOn>0){
                     checkedTargets.add(email);
                 }
-            }
+            }else checkedTargets.add(email); //если почта не зарегана значит это мейл с регистрацией.
         }
         message_in.targets = checkedTargets;
     }

src/TestingSystem/DVM/DVMTestingPlanner.java

@@ -181,10 +181,8 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     }
     @Override
     protected void PackageStart() throws Exception {
-        user.connection.ShellCommand("ulimit -s unlimited"); // нужно, для запуска сишной части.
-        ///--
         String plannerStartCommand = String.join(" ", "nohup", Utils.DQuotes(getPlanner()), Utils.DQuotes(user.workspace), Utils.DQuotes(packageRemoteWorkspace.full_name), Utils.DQuotes(testingPackage.kernels), Utils.DQuotes(testingPackage.drv), "&");
-        user.connection.ShellCommand(plannerStartCommand);
+        user.connection.CommandNoRead("ulimit -s unlimited",plannerStartCommand);
         RemoteFile PID = new RemoteFile(packageRemoteWorkspace, "PID");
         RemoteFile STARTED = new RemoteFile(packageRemoteWorkspace, "STARTED");
         while (!user.connection.Exists(STARTED)) {
@@ -315,7 +313,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
     @Override
     protected void Kill() throws Exception {
         if (!testingPackage.PID.isEmpty()) {
-            user.connection.ShellCommand("kill -9 " + testingPackage.PID);
+            user.connection.Command("kill -9 " + testingPackage.PID);
         }
     }
     @Override
@@ -335,7 +333,7 @@ public class DVMTestingPlanner extends TestingPlanner<DVMPackage> {
         if (user.connection == null) {
             try {
                 user.connection = new UserConnection(machine, user);
-                Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
+             //   Print("Соединение c " + machine.getURL() + " " + user.login + " успешно установлено.");
             } catch (Exception ex) {
                 Print(ex.toString());
                 user.connection = null;

src/TestingSystem/DVM/UserConnection.java

@@ -2,7 +2,6 @@ package TestingSystem.DVM;
 import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
-import Common.Utils.Validators.ShellParser;
 import GlobalData.Machine.Machine;
 import GlobalData.RemoteFile.RemoteFile;
 import GlobalData.User.User;
@@ -46,6 +45,7 @@ public class UserConnection {
         shellChannel = (ChannelShell) session.openChannel("shell");
         in = new PipedInputStream();
         out = new PipedOutputStream();
+        /*
         shellChannel.setInputStream(in);
         shellChannel.setOutputStream(out);
         pin = new PipedOutputStream(in);
@@ -55,6 +55,7 @@ public class UserConnection {
         fromServer = new InputStreamReader(pout);
         ShellParser.setUserName(user.login);
         ShellParser.ReadInvitation(fromServer); //прочитать первое приглашение от машины.
+         */
     }
     public void Disconnect() {
         if (in != null) {
@@ -114,6 +115,8 @@ public class UserConnection {
     //--
     //todo из за мусора результатом пользоваться в общем случае невозможно.
     //следует перенаправлять вывод в какой нибудь временный файл на сервере.
+
+    /*
     public String ShellCommand(String command) throws Exception {
         StringBuilder result = new StringBuilder();
         pin.write((command + "\r\n").getBytes());
@@ -122,6 +125,7 @@ public class UserConnection {
         String[] data = result.toString().split("\n");
         return (data.length > 0) ? data[data.length - 1] : result.toString();
     }
+    */
     public void getSingleFile(String src, String dst) throws Exception {
         sftpChannel.get(src, dst);
     }
@@ -146,7 +150,7 @@ public class UserConnection {
     //-
     public void RMDIR(String dir) throws Exception {
         if (!dir.isEmpty() && !dir.equals("/") && !dir.equals("\\") && !dir.equals("*")) {
-            ShellCommand("rm -rf " + Utils.DQuotes(dir));
+            Command("rm -rf " + Utils.DQuotes(dir));
         } else throw new PassException("Недопустимый путь для удаления папки " + Utils.DQuotes(dir));
     }
     //-
@@ -237,7 +241,7 @@ public class UserConnection {
         //--
         writeToFile("cd " + Utils.DQuotes(directory.full_name) + "\n" + String.join("\n", commands), script_file);
         //--
-        ShellCommand(Utils.DQuotes(script_file.full_name) + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
+        Command(Utils.DQuotes(script_file.full_name) + " 1>" + Utils.DQuotes(out.full_name) + " 2>" + Utils.DQuotes(err.full_name));
         return new Pair<>(out, err);
     }
     public void putResource(RemoteFile dstDirectory, String resource_name) throws Exception {
@@ -308,10 +312,9 @@ public class UserConnection {
     }
     //--
     public void tryRM(RemoteFile file) throws Exception {
-        if (Exists(file)) {
+        if (Exists(file))
             sftpChannel.rm(file.full_name);
     }
-    }
     //с проверкой.
     public boolean tryGetSingleFileWithMaxSize(RemoteFile src, File dst, int maxSize) throws Exception {
         if (Exists(src)) {
@@ -386,7 +389,6 @@ public class UserConnection {
         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);
@@ -397,10 +399,25 @@ public class UserConnection {
             execChannel.setCommand(command);
             execChannel.connect();
             BufferedReader in = new BufferedReader(new InputStreamReader(execChannel.getInputStream()));
-            while (in.readLine() != null) ;
+            String line = null;
+            while ((line = in.readLine()) != null) {
+                System.out.println(Utils.Brackets(line));
+            }
+        }
+        execChannel.disconnect();
+    }
+    public void CommandNoRead(String... commands) throws Exception {
+        if (commands.length > 0) {
+            String command = String.join("\n", commands);
+            execChannel = (ChannelExec) session.openChannel("exec");
+            execChannel.setErrStream(System.err);
+            execChannel.setCommand(command);
+            execChannel.connect();
             execChannel.disconnect();
         }
     }
+
+    /*
     public String CommandWithAnswer(char end, String... commands) throws Exception {
         String output = "";
         if (commands.length > 0) {
@@ -421,7 +438,10 @@ public class UserConnection {
         //  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/CheckAccount.java

@@ -20,6 +20,7 @@ public class CheckAccount extends Pass_2021<Boolean> {
     }
     @Override
     protected void body() throws Exception {
+        /*
         switch (Current.getAccount().email){
             case "vmk-post@yandex.ru":
             case "79854210702@ya.ru":
@@ -42,14 +43,14 @@ public class CheckAccount extends Pass_2021<Boolean> {
                 target = true;
                 break;
         }
+         */
 
         //временно. оффлайн проверка по почте
-        /*
+
         target = Current.getAccount().email.equals("?") ?
                 (Pass_2021.passes.get(PassCode_2021.EditAccount).Do() &&
                         Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do()) :
                 (Pass_2021.passes.get(PassCode_2021.CheckRegistrationOnServer).Do());
-         */
     }
     @Override
     protected boolean validate() {

src/Visual_DVM_2021/Passes/All/RemoteSingleCommand.java

@@ -15,7 +15,7 @@ public class RemoteSingleCommand extends CurrentConnectionPass<String> {
     @Override
     protected void ServerAction() throws Exception {
         RemoteFile file = new RemoteFile(user.connection.sftpChannel.getHome(), Utils.getDateName("out"));
-        user.connection.ShellCommand(command + " 1>" + Utils.DQuotes(file.full_name));
+        user.connection.Command(command + " 1>" + Utils.DQuotes(file.full_name));
         if (user.connection.Exists(file)) {
             target = user.connection.readFromFile(file);
             user.connection.sftpChannel.rm(file.full_name);

src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistribution.java

@@ -3,6 +3,7 @@ import Common.Global;
 import Common.UI.UI;
 import GlobalData.Settings.SettingName;
 import Visual_DVM_2021.Passes.PassCode_2021;
+import Visual_DVM_2021.Passes.Pass_2021;
 import Visual_DVM_2021.Passes.SapforAnalysis;
 public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalysis {
     @Override
@@ -36,4 +37,8 @@ public class SPF_GetArrayDistribution extends SPF_GetArrayDistributionOnlyAnalys
         }
         return super.canStart(args);
     }
+    @Override
+    public String getDescription() {
+       return code().getDescription();
+    }
 }

src/Visual_DVM_2021/Passes/All/SPF_GetArrayDistributionOnlyAnalysis.java

@@ -1,6 +1,9 @@
 package Visual_DVM_2021.Passes.All;
+import Common.Global;
+import Common.UI.Menus_2023.PassControl;
 import Common.UI.UI;
 import Common.Utils.Index;
+import GlobalData.Settings.SettingName;
 import ProjectData.SapforData.Regions.ParallelRegion;
 import Visual_DVM_2021.Passes.PassCode_2021;
 import Visual_DVM_2021.Passes.SapforAnalysis;
@@ -67,4 +70,13 @@ public class SPF_GetArrayDistributionOnlyAnalysis extends SapforAnalysis {
         UI.getMainWindow().FocusProject();
         UI.getMainWindow().getProjectWindow().FocusAnalysis();
     }
+    @Override
+    public String getDescription() {
+        return Global.db.settings.get(SettingName.MPI_PROGRAM).toBoolean()?
+                "Анализ кода (общая память)":"Анализ кода";
+    }
+    public void RefreshControls(){
+        for (PassControl control: controls)
+            control.setText(getDescription());
+    }
 }

src/Visual_DVM_2021/Passes/All/TestPass.java

@@ -1,58 +1,14 @@
 package Visual_DVM_2021.Passes.All;
 import Common.Utils.Utils;
-import Visual_DVM_2021.Passes.Pass_2021;
+import Visual_DVM_2021.Passes.PassException;
-import org.apache.commons.io.FileUtils;
+import Visual_DVM_2021.Passes.SSH.CurrentConnectionPass;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
+public class TestPass extends CurrentConnectionPass {
-import org.apache.poi.ss.usermodel.*;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.util.Date;
-public class TestPass extends Pass_2021 {
     @Override
-    protected boolean needsAnimation() {
+    protected void ServerAction() throws Exception {
-        return super.needsAnimation();
+        String dir = "/home/testuser/jack sparrow/";
-    }
+        String command = "rm -rf " + Utils.DQuotes(dir);
-    @Override
+        if (!dir.isEmpty() && !dir.equals("/") && !dir.equals("\\") && !dir.equals("*")) {
-    protected void body() throws Exception {
+            user.connection.Command(command);
-        File file = Utils.getTempFileName("table");
+        } else throw new PassException("Недопустимый путь для удаления папки " + Utils.DQuotes(dir));
-    //--
-        Workbook book = new HSSFWorkbook();
-        Sheet sheet = book.createSheet("Birthdays");
-
-        // Нумерация начинается с нуля
-        Row row = sheet.createRow(0);
-
-        // Мы запишем имя и дату в два столбца
-        // имя будет String, а дата рождения --- Date,
-        // формата dd.mm.yyyy
-        Cell name = row.createCell(0);
-        name.setCellValue("John");
-
-        Cell birthdate = row.createCell(1);
-
-        DataFormat format = book.createDataFormat();
-        CellStyle dateStyle = book.createCellStyle();
-        dateStyle.setDataFormat(format.getFormat("dd.mm.yyyy"));
-        birthdate.setCellStyle(dateStyle);
-
-
-        // Нумерация лет начинается с 1900-го
-        birthdate.setCellValue(new Date(110, 10, 10));
-
-        // Меняем размер столбца
-        sheet.autoSizeColumn(1);
-
-        // Записываем всё в файл
-        FileOutputStream stream = new FileOutputStream(file);
-        book.write(stream);
-        book.close();
-        stream.close();
-        ///--
-        File res = new File("kek.xls");
-        FileUtils.copyFile(file, res);
-        book= null;
-        stream = null;
-        file = null;
     }
 }

src/Visual_DVM_2021/Passes/All/UpdateSetting.java

@@ -136,6 +136,8 @@ public class UpdateSetting extends Pass_2021<DBSetting> {
                     break;
                 case MPI_PROGRAM:
                     Pass_2021.passes.get(PassCode_2021.CleanAnalyses).Do();
+                    ((SPF_GetArrayDistributionOnlyAnalysis)
+                            Pass_2021.passes.get(PassCode_2021.SPF_GetArrayDistributionOnlyAnalysis)).RefreshControls();
                     break;
                 case SmallScreen:
                     boolean small = target.toBoolean();

src/Visual_DVM_2021/Passes/PassCode_2021.java

@@ -378,7 +378,7 @@ public enum PassCode_2021 {
             case AddTasksToSapforPackage:
                 return "Добавить задачи в пакет SAPFOR";
             case SPF_InsertPrivateFromGUI:
-                return "Вставка директив для нераспределяемых массивов";
+                return "Вставка директив приватизации";
             case CreateTestFromSelectedFiles:
                 return "Создать тест из выделенных файлов";
             case DownloadSapforPackage: