From 5841f5ca7d8b9137f720bbdf520f595ff3dcf71a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 4 Feb 2025 20:57:32 +0300
Subject: [PATCH] no message

---
 .idea/workspace.xml                           |  6 ++--
 properties                                    |  2 +-
 .../Passes/All/DVMConvertProject.java         | 31 ++++++++-----------
 .../Repository/Server/ServerCode.java         |  2 ++
 4 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 10282365..fa7ac80e 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -7,10 +7,8 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/GetComponentsBackupsFromServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingComponentsServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PingTestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/PublishRemoteWorkspace.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index fff10d8d..7b2ec455 100644
--- a/properties
+++ b/properties
@@ -1,6 +1,6 @@
 {
   "Workspace": "E:\\Tests",
-  "ProjectsSearchDirectory": "E:\\Tests\\Downloads",
+  "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
   "VisualiserPath": "C:\\Users\\misha\\Downloads",
   "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
   "Visualizer_2Path": "C:\\Users\\misha\\Documents",
diff --git a/src/_VisualDVM/Passes/All/DVMConvertProject.java b/src/_VisualDVM/Passes/All/DVMConvertProject.java
index 245d7f4b..62c4d94e 100644
--- a/src/_VisualDVM/Passes/All/DVMConvertProject.java
+++ b/src/_VisualDVM/Passes/All/DVMConvertProject.java
@@ -6,6 +6,7 @@ import _VisualDVM.Current;
 import _VisualDVM.Global;
 import _VisualDVM.Passes.PassCode;
 import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
+import _VisualDVM.Passes.Server.ComponentsServerPass;
 import _VisualDVM.ProjectData.Files.DBProjectFile;
 import _VisualDVM.ProjectData.Project.db_project_info;
 import _VisualDVM.Repository.Server.ServerCode;
@@ -18,7 +19,7 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Date;
 import java.util.Vector;
-public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_info> {
+public class DVMConvertProject extends ComponentsServerPass<db_project_info> {
     File workspace = null;
     File archive = null;
     Vector<DBProjectFile> programsToConvert = null;
@@ -67,7 +68,14 @@ public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_i
                 Log.Writeln_("Размер архива проекта превышает 500 МБ");
                 return false;
             }
-            return true;
+            //--
+            Vector<String> unit_args = new Vector<>();
+            unit_args.add(target.name);
+            unit_args.add(target.languageName.toString());
+            unit_args.add(target.sapforProperties.DVMConvertationOptions);
+            unit_args.addAll(programsNames);
+            return SendRequest(ServerCode.DVMConvertProject, String.join("\n", unit_args),Utils_.fileToBytes(archive),0);
+            //--
         }
         return false;
     }
@@ -86,23 +94,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_i
         return true;
     }
     @Override
-    protected int getTimeout() {
-        return 0;
-    }
-    @Override
-    protected void ServerAction() throws Exception {
-        ServerExchangeUnit_2021 unit = new ServerExchangeUnit_2021(ServerCode.DVMConvertProject);
-        unit.object = Utils_.fileToBytes(archive);
-        Vector<String> unit_args = new Vector<>();
-        unit_args.add(target.name);
-        unit_args.add(target.languageName.toString());
-        unit_args.add(target.sapforProperties.DVMConvertationOptions);
-        unit_args.addAll(programsNames);
-        unit.arg = String.join("\n", unit_args);
-        Command(unit);
-        output = server_response.arg;
+    protected void body() throws Exception {
+        output = request.server_response.arg;
         versionArchive = new File(workspace, target.name + "_result.zip");
-        server_response.Unpack(versionArchive);
+        request.server_response.Unpack(versionArchive);
         File result = new File(workspace, "result");
         if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
             if (target.last_modification == null) {
diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java
index 58501ce6..7fa705f4 100644
--- a/src/_VisualDVM/Repository/Server/ServerCode.java
+++ b/src/_VisualDVM/Repository/Server/ServerCode.java
@@ -120,6 +120,8 @@ public enum ServerCode {
                 return  "Замена кода теста на сервере";
             case GetComponentsBackups:
                 return "Получение резервных копий компонента с сервера";
+            case DVMConvertProject:
+                return "Конвертация проекта на сервере";
             default:
                 return this.toString();
         }