M/VisualSapfor
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

no message

Browse Source
This commit is contained in:
02090095
2025-02-04 18:13:49 +03:00
parent fb98945b38
commit 281ec9bfc2
2 changed files with 12 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.idea/workspace.xml generated
View File

@@ -7,8 +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/ShowComponentChangesLog.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ShowComponentChangesLog.java" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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/ResurrectComponentFromServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/ResurrectComponentFromServer.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" />

28
src/_VisualDVM/Passes/All/ResurrectComponentFromServer.java
View File

@@ -10,6 +10,7 @@ import _VisualDVM.GlobalData.RemoteFile.RemoteFile;
import _VisualDVM.Passes.CurrentComponentPass; import _VisualDVM.Passes.CurrentComponentPass;
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.Repository.Server.ServerCode; import _VisualDVM.Repository.Server.ServerCode;
import _VisualDVM.Repository.Server.ServerExchangeUnit_2021; import _VisualDVM.Repository.Server.ServerExchangeUnit_2021;
import _VisualDVM.Utils; import _VisualDVM.Utils;
@@ -22,22 +23,26 @@ import java.io.File;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.StandardCopyOption; import java.nio.file.StandardCopyOption;
import java.util.Vector; import java.util.Vector;
public class ResurrectComponentFromServer extends CurrentComponentPass { public class ResurrectComponentFromServer extends ComponentsServerPass<_VisualDVM.Repository.Component.Component> {
Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ. Vector<RemoteFile> backups; //не забывать что файлы на СЕРВЕРЕ.
RemoteFile remoteFile; RemoteFile remoteFile;
File localFile; File localFile;
/*
@Override @Override
public JMenuItem createMenuItem() { public JMenuItem createMenuItem() {
if (menuItem == null) if (menuItem == null)
menuItem = new PassMenuItem(this); menuItem = new PassMenuItem(this);
return menuItem; return menuItem;
} }
*/
@Override @Override
protected boolean canStart(Object... args) throws Exception { protected boolean canStart(Object... args) throws Exception {
remoteFile = null; remoteFile = null;
localFile = null; localFile = null;
if (super.canStart() && Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).Do()) { if (Global.components.getUI().CheckCurrent(Log) && Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).Do()) {
//1. Получить список бекапов. //1. Получить список бекапов.
target = Global.components.getUI().getCurrent();
backups = (Vector<RemoteFile>) Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).target; backups = (Vector<RemoteFile>) Global.mainModule.getPass(PassCode.GetComponentsBackupsFromServer).target;
backups.sort((o1, o2) -> o2.name.compareTo(o1.name)); backups.sort((o1, o2) -> o2.name.compareTo(o1.name));
Dialog d = new Dialog(null) { Dialog d = new Dialog(null) {
@@ -81,29 +86,16 @@ public class ResurrectComponentFromServer extends CurrentComponentPass {
}; };
if (d.ShowDialog("Выбор версии для восстановления") && Global.mainModule.Check(Log, Current.ComponentServerBackup)) { if (d.ShowDialog("Выбор версии для восстановления") && Global.mainModule.Check(Log, Current.ComponentServerBackup)) {
remoteFile = Global.mainModule.getComponentServerBackup(); remoteFile = Global.mainModule.getComponentServerBackup();
return true; return SendRequest(ServerCode.ReceiveFile, remoteFile.full_name);
} }
;
} }
return false; return false;
} }
@Override @Override
protected void body() throws Exception { protected void body() throws Exception {
//1. Скачать файл. //1. Скачать файл.
Pass receivePass = new ComponentsRepositoryPass_OLD() { localFile = Utils.getTempFileName(remoteFile.name);
@Override request.server_response.Unpack(localFile);
public String getDescription() {
return "Скачивание файла с сервера";
}
@Override
protected void ServerAction() throws Exception {
Command(new ServerExchangeUnit_2021(ServerCode.ReceiveFile, remoteFile.full_name));
localFile = Utils.getTempFileName(remoteFile.name);
server_response.Unpack(localFile);
}
};
if (!receivePass.Do())
throw new PassException("Не удалось скачать файл!");
//------------>> //------------>>
Files.copy(localFile.toPath(), target.getNewFile().toPath(), StandardCopyOption.REPLACE_EXISTING); Files.copy(localFile.toPath(), target.getNewFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
target.Update(); target.Update();