no message

This commit is contained in:
2025-02-04 20:57:32 +03:00
parent d4c2875ed5
commit 5841f5ca7d
4 changed files with 18 additions and 23 deletions

6
.idea/workspace.xml generated
View File

@@ -7,10 +7,8 @@
</component> </component>
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment=""> <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/DVMConvertProject.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DVMConvertProject.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/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/ServerCode.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" />
</list> </list>
<option name="SHOW_DIALOG" value="false" /> <option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" /> <option name="HIGHLIGHT_CONFLICTS" value="true" />

View File

@@ -1,6 +1,6 @@
{ {
"Workspace": "E:\\Tests", "Workspace": "E:\\Tests",
"ProjectsSearchDirectory": "E:\\Tests\\Downloads", "ProjectsSearchDirectory": "E:\\SAPFOR\\Tests\\BT_inserted",
"VisualiserPath": "C:\\Users\\misha\\Downloads", "VisualiserPath": "C:\\Users\\misha\\Downloads",
"Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F", "Sapfor_FPath": "E:\\_sapfor_x64\\Components\\Sapfor_F",
"Visualizer_2Path": "C:\\Users\\misha\\Documents", "Visualizer_2Path": "C:\\Users\\misha\\Documents",

View File

@@ -6,6 +6,7 @@ import _VisualDVM.Current;
import _VisualDVM.Global; import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode; import _VisualDVM.Passes.PassCode;
import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD; import _VisualDVM.Passes.Server.ComponentsRepositoryPass_OLD;
import _VisualDVM.Passes.Server.ComponentsServerPass;
import _VisualDVM.ProjectData.Files.DBProjectFile; import _VisualDVM.ProjectData.Files.DBProjectFile;
import _VisualDVM.ProjectData.Project.db_project_info; import _VisualDVM.ProjectData.Project.db_project_info;
import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
@@ -18,7 +19,7 @@ import java.io.File;
import java.nio.file.Paths; import java.nio.file.Paths;
import java.util.Date; import java.util.Date;
import java.util.Vector; 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 workspace = null;
File archive = null; File archive = null;
Vector<DBProjectFile> programsToConvert = null; Vector<DBProjectFile> programsToConvert = null;
@@ -67,7 +68,14 @@ public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_i
Log.Writeln_("Размер архива проекта превышает 500 МБ"); Log.Writeln_("Размер архива проекта превышает 500 МБ");
return false; 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; return false;
} }
@@ -86,23 +94,10 @@ public class DVMConvertProject extends ComponentsRepositoryPass_OLD<db_project_i
return true; return true;
} }
@Override @Override
protected int getTimeout() { protected void body() throws Exception {
return 0; output = request.server_response.arg;
}
@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;
versionArchive = new File(workspace, target.name + "_result.zip"); versionArchive = new File(workspace, target.name + "_result.zip");
server_response.Unpack(versionArchive); request.server_response.Unpack(versionArchive);
File result = new File(workspace, "result"); File result = new File(workspace, "result");
if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) { if (Global.mainModule.getPass(PassCode.UnzipFolderPass).Do(versionArchive.getAbsolutePath(), result.getAbsolutePath())) {
if (target.last_modification == null) { if (target.last_modification == null) {

View File

@@ -120,6 +120,8 @@ public enum ServerCode {
return "Замена кода теста на сервере"; return "Замена кода теста на сервере";
case GetComponentsBackups: case GetComponentsBackups:
return "Получение резервных копий компонента с сервера"; return "Получение резервных копий компонента с сервера";
case DVMConvertProject:
return "Конвертация проекта на сервере";
default: default:
return this.toString(); return this.toString();
} }