Доделана очистка файлов пакета, после работы, вместе с jar.
This commit is contained in:
7
.idea/workspace.xml
generated
7
.idea/workspace.xml
generated
@@ -7,13 +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 afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageTree.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/DownloadSapforTasksPackage.java" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/ShowSapforTaskPackage.java" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.form" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/UI/Main/SapforPackageFields.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" />
|
||||||
|
|||||||
@@ -61,9 +61,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
|
|||||||
results_json.EndDate = new Date().getTime();
|
results_json.EndDate = new Date().getTime();
|
||||||
//записать результаты всех задач.
|
//записать результаты всех задач.
|
||||||
try {
|
try {
|
||||||
//очистка служебных файлов.
|
|
||||||
Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
|
|
||||||
//--
|
|
||||||
for (SapforTask task : results_json.tasks) {
|
for (SapforTask task : results_json.tasks) {
|
||||||
//--
|
//--
|
||||||
task.filesList = new Vector<>();
|
task.filesList = new Vector<>();
|
||||||
@@ -83,12 +80,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
|
|||||||
task.filesList.add(pf.file.getName());
|
task.filesList.add(pf.file.getName());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//--
|
|
||||||
/*
|
|
||||||
if (task.files.size() > 0) {
|
|
||||||
task.filesNames = String.join("\n", task.files);
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -262,6 +262,10 @@ public class SapforTasksPackageSupervisor {
|
|||||||
}
|
}
|
||||||
planner.ServerCommand(ServerCode.PublishSapforPackageTasks, planner.email, new Vector<>(results_json.tasks));
|
planner.ServerCommand(ServerCode.PublishSapforPackageTasks, planner.email, new Vector<>(results_json.tasks));
|
||||||
}
|
}
|
||||||
|
//Очистка
|
||||||
|
//очистка служебных файлов.
|
||||||
|
Utils.deleteFilesByExtensions(new File(sapforTasksPackage.workspace),
|
||||||
|
"proj", "dep", "jar", "sh", "exe", "bat");
|
||||||
}
|
}
|
||||||
public void Perform() throws Exception {
|
public void Perform() throws Exception {
|
||||||
if (packageNeedsKill()) {
|
if (packageNeedsKill()) {
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
package Visual_DVM_2021.Passes.All;
|
package Visual_DVM_2021.Passes.All;
|
||||||
|
import Common.Constants;
|
||||||
import Common.Current;
|
import Common.Current;
|
||||||
import Common.Global;
|
import Common.Global;
|
||||||
import Common.Utils.Utils;
|
import Common.Utils.Utils;
|
||||||
@@ -8,8 +9,11 @@ import SapforTestingSystem.SapforTasksPackage.SapforTasksPackage;
|
|||||||
import TestingSystem.TasksPackage.TasksPackageState;
|
import TestingSystem.TasksPackage.TasksPackageState;
|
||||||
import Visual_DVM_2021.Passes.PassCode_2021;
|
import Visual_DVM_2021.Passes.PassCode_2021;
|
||||||
import Visual_DVM_2021.Passes.TestingSystemPass;
|
import Visual_DVM_2021.Passes.TestingSystemPass;
|
||||||
|
import org.apache.commons.io.FileUtils;
|
||||||
|
|
||||||
import java.io.File;
|
import java.io.File;
|
||||||
|
import java.nio.file.Paths;
|
||||||
|
import java.util.Date;
|
||||||
public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
|
public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPackage> {
|
||||||
@Override
|
@Override
|
||||||
public String getIconPath() {
|
public String getIconPath() {
|
||||||
@@ -20,12 +24,22 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
|
|||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
File tmpArchive = null;
|
File tmpArchive = null;
|
||||||
|
File getLoaded() {
|
||||||
|
return Paths.get(Global.SapforPackagesDirectory.getAbsolutePath(), target.id, Constants.LOADED).toFile();
|
||||||
|
}
|
||||||
@Override
|
@Override
|
||||||
protected boolean canStart(Object... args) throws Exception {
|
protected boolean canStart(Object... args) throws Exception {
|
||||||
if (Current.Check(Log, Current.SapforTasksPackage)) {
|
if (Current.Check(Log, Current.SapforTasksPackage)) {
|
||||||
target = Current.getSapforTasksPackage();
|
target = Current.getSapforTasksPackage();
|
||||||
if (target.state.equals(TasksPackageState.Done)) return true;
|
if (!target.state.equals(TasksPackageState.Done)) {
|
||||||
else Log.Writeln_("Пакет не завершен.");
|
Log.Writeln_("Пакет не завершен.");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (getLoaded().exists()) {
|
||||||
|
System.out.println("Пакет уже загружен");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -46,7 +60,10 @@ public class DownloadSapforTasksPackage extends TestingSystemPass<SapforTasksPac
|
|||||||
if (passes.get(PassCode_2021.UnzipFolderPass).Do(
|
if (passes.get(PassCode_2021.UnzipFolderPass).Do(
|
||||||
tmpArchive.getAbsolutePath(),
|
tmpArchive.getAbsolutePath(),
|
||||||
Global.SapforPackagesDirectory.getAbsolutePath(), false
|
Global.SapforPackagesDirectory.getAbsolutePath(), false
|
||||||
)) ;
|
)) {
|
||||||
|
System.out.println("LOADED=" + Utils.Brackets(getLoaded().getAbsolutePath()));
|
||||||
|
FileUtils.writeStringToFile(getLoaded(), new Date().toString());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user