From 505d151ee5708c8df1c48c2ef0fba364d8c1bc3b Mon Sep 17 00:00:00 2001 From: 02090095 Date: Mon, 3 Feb 2025 23:50:09 +0300 Subject: [PATCH] =?UTF-8?q?=D1=80=D0=B5=D1=84=D0=B0=D0=BA=D1=82=D0=BE?= =?UTF-8?q?=D1=80=D0=B8=D0=BD=D0=B3=20=D0=BE=D1=82=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=B1=D0=B0=D0=B3=D0=B0.=20?= =?UTF-8?q?=D0=B1=D1=8B=D0=BB=D0=B0=20=D0=B8=D0=B7=D0=B1=D1=8B=D1=82=D0=BE?= =?UTF-8?q?=D1=87=D0=BD=D0=B0=D1=8F=20=D0=BA=D0=BE=D0=BC=D0=B0=D0=BD=D0=B4?= =?UTF-8?q?=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/workspace.xml | 12 ++++------ properties | 2 +- .../Passes/All/ReplaceTestsFromFiles.java | 22 +++++++++-------- src/_VisualDVM/Passes/All/SendBugReport.java | 24 +++++++++---------- .../Repository/BugReport/BugReport.java | 2 ++ .../Repository/Server/ComponentsServer.java | 16 ++++++++++--- .../Repository/Server/ServerCode.java | 4 ++++ 7 files changed, 47 insertions(+), 35 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 2bce23da..c0b8cbaf 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -7,15 +7,11 @@ - - - - - - - - + + + + diff --git a/properties b/properties index 0bd91828..3817790e 100644 --- a/properties +++ b/properties @@ -1,6 +1,6 @@ { "Workspace": "E:\\Tests", - "ProjectsSearchDirectory": "E:\\Tests\\Downloads\\bugreport_1738149908\\BT\\v1\\v1", + "ProjectsSearchDirectory": "E:\\BUG", "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/ReplaceTestsFromFiles.java b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java index 53cf770f..7edaa588 100644 --- a/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java +++ b/src/_VisualDVM/Passes/All/ReplaceTestsFromFiles.java @@ -6,17 +6,19 @@ import Common.Visual.Windows.Dialog.VFileChooser; import _VisualDVM.Constants; import _VisualDVM.Global; import _VisualDVM.Passes.PassCode; +import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Passes.Server.TestingSystemPass; import _VisualDVM.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.TestingSystem.Common.Group.Group; import _VisualDVM.TestingSystem.Common.Test.Test; +import _VisualDVM.TestingSystem.Common.TestingServer; import _VisualDVM.Utils; import java.io.File; import java.util.LinkedHashMap; import java.util.Vector; -public class ReplaceTestsFromFiles extends TestingSystemPass> { +public class ReplaceTestsFromFiles extends ClientPass> { VFileChooser fileChooser = new VFileChooser("Выберите файлы для замены тестов"); //-- Group group; @@ -28,6 +30,10 @@ public class ReplaceTestsFromFiles extends TestingSystemPass> { public String getIconPath() { return "/icons/Menu/Undo.png"; } + @Override + protected TestingServer getServer() { + return Global.testingServer; + } //- @Override protected boolean canStart(Object... args) throws Exception { @@ -72,7 +78,7 @@ public class ReplaceTestsFromFiles extends TestingSystemPass> { //-- for (String name : filesByNames.keySet()) { boolean exists = false; - for (Test test : server.db.tests.Data.values()) { + for (Test test : getServer().db.tests.Data.values()) { if ((test.group_id == group.id) && test.description.equals(name)) { exists = true; //-- @@ -114,20 +120,16 @@ public class ReplaceTestsFromFiles extends TestingSystemPass> { newTests.add(new_test); } } + if (!replaceTests.isEmpty()) + SendRequest(ServerCode.ReplaceTestsCodes, null, replaceTests); + if (!newTests.isEmpty()) + SendRequest(ServerCode.PublishObjects, null, newTests); return true; } - ; return false; } //- @Override - protected void ServerAction() throws Exception { - if (!replaceTests.isEmpty()) - Command(new ServerExchangeUnit_2021(ServerCode.ReplaceTestsCodes, null, replaceTests)); - if (!newTests.isEmpty()) - Command(new ServerExchangeUnit_2021(ServerCode.PublishObjects, null, newTests)); - } - @Override protected void performFinish() throws Exception { super.performFinish(); Global.mainModule.getPass(PassCode.SynchronizeTests).Do(); diff --git a/src/_VisualDVM/Passes/All/SendBugReport.java b/src/_VisualDVM/Passes/All/SendBugReport.java index 9a1ba31d..0dc44d8a 100644 --- a/src/_VisualDVM/Passes/All/SendBugReport.java +++ b/src/_VisualDVM/Passes/All/SendBugReport.java @@ -1,27 +1,25 @@ package _VisualDVM.Passes.All; import Common.Utils.Utils_; import _VisualDVM.Global; -import _VisualDVM.Passes.Server.ComponentsRepositoryPass; +import _VisualDVM.Passes.Server.ClientPass; import _VisualDVM.Repository.BugReport.BugReport; import _VisualDVM.Repository.BugReport.BugReportState; +import _VisualDVM.Repository.Server.ComponentsServer; import _VisualDVM.Repository.Server.ServerCode; -import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; -public class SendBugReport extends ComponentsRepositoryPass { +public class SendBugReport extends ClientPass { @Override - protected void ServerAction() throws Exception { + protected boolean canStart(Object... args) throws Exception { target = Global.componentsServer.db.bugReports.getUI().getCurrent(); - if (!target.project_version.isEmpty()) { - //отправить архив. - Command(new ServerExchangeUnit_2021(ServerCode.SendBugReport, - target.id, - Utils_.fileToBytes(target.getArchiveFile()) - )); - } - // синхрон бд - Command(new ServerExchangeUnit_2021(ServerCode.PublishObject, "", target)); + if (!target.project_version.isEmpty()) + target.packed_archive = Utils_.fileToBytes(target.getArchiveFile()); + return SendRequest(ServerCode.PublishObject, "", target); } @Override protected void performFail() throws Exception { target.state = BugReportState.draft; } + @Override + protected ComponentsServer getServer() { + return Global.componentsServer; + } } diff --git a/src/_VisualDVM/Repository/BugReport/BugReport.java b/src/_VisualDVM/Repository/BugReport/BugReport.java index cd060701..1f17b698 100644 --- a/src/_VisualDVM/Repository/BugReport/BugReport.java +++ b/src/_VisualDVM/Repository/BugReport/BugReport.java @@ -40,6 +40,8 @@ public class BugReport extends rDBObject { public String commentAdditionDraft = ""; @Description("IGNORE") public File owner = null; + @Description("IGNORE") + public byte[] packed_archive = null; public BugReport() { } public BugReport(BugReport src) { diff --git a/src/_VisualDVM/Repository/Server/ComponentsServer.java b/src/_VisualDVM/Repository/Server/ComponentsServer.java index e92806d0..637d71e8 100644 --- a/src/_VisualDVM/Repository/Server/ComponentsServer.java +++ b/src/_VisualDVM/Repository/Server/ComponentsServer.java @@ -115,6 +115,16 @@ public class ComponentsServer extends RepositoryServer { return Global.properties.ComponentsServerPort; } @Override + protected void beforePublishAction(DBObject object) throws Exception { + if (object instanceof BugReport){ + BugReport bugReport = (BugReport) object; + if (bugReport.packed_archive!=null) { + File bugArchive = Utils_.getFile(Utils_.getHomePath(), "Bugs", bugReport.id); + Utils_.bytesToFile(bugReport.packed_archive, bugArchive); + } + } + } + @Override public void afterDeleteAction(DBObject object) throws Exception { if (object instanceof BugReport) { BugReport bugReport = (BugReport) object; @@ -208,13 +218,13 @@ public class ComponentsServer extends RepositoryServer { break; case ReceiveBugReport: Print("Скачать баг репорт по ключу " + request.arg); - File bugArchive = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile(); + File bugArchive = Utils_.getFile(Utils_.getHomePath(), "Bugs", request.arg); response = new ServerExchangeUnit_2021(ServerCode.OK); response.object = Utils_.fileToBytes(bugArchive); break; - case SendBugReport: + case SendBugReport: //todo устарело Print("Отправить баг репорт " + request.arg); - File bugArchive1 = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile(); + File bugArchive1 = Utils_.getFile(Utils_.getHomePath(), "Bugs", request.arg); Utils_.bytesToFile((byte[]) request.object, bugArchive1); response = new ServerExchangeUnit_2021(ServerCode.OK); break; diff --git a/src/_VisualDVM/Repository/Server/ServerCode.java b/src/_VisualDVM/Repository/Server/ServerCode.java index 08180f56..3ebbb251 100644 --- a/src/_VisualDVM/Repository/Server/ServerCode.java +++ b/src/_VisualDVM/Repository/Server/ServerCode.java @@ -101,6 +101,10 @@ public enum ServerCode { return "Опубликовать компонент"; case UpdateComponentMinimalVersion: return "Поднять минимальную версию компонента"; + case PublishObject: + return "Публикация объекта"; + case SendBugReport: + return "Отправка отчета об ошибке"; default: return this.toString(); }