no message

This commit is contained in:
2023-10-26 23:56:39 +03:00
parent 343c4fdcd2
commit f51892a251
5 changed files with 21 additions and 41 deletions

3
.idea/workspace.xml generated
View File

@@ -8,7 +8,8 @@
<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$/.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/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/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackageInterface.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

@@ -2,9 +2,10 @@ package SapforTestingSystem.PackageModeSupervisor;
import Common.Constants; import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils; import Common.Utils.Utils;
import ProjectData.Files.DBProjectFile; import SapforTestingSystem.Json.SapforConfiguration_json;
import ProjectData.Files.FileType; import SapforTestingSystem.Json.SapforTasksPackage_json;
import SapforTestingSystem.Json.*; import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforTest_json;
import SapforTestingSystem.PerformSapforTask; import SapforTestingSystem.PerformSapforTask;
import SapforTestingSystem.SapforTask.SapforTask; import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner; import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
@@ -61,28 +62,6 @@ public class PackageModeSupervisor extends ThreadsPlanner {
results_json.EndDate = new Date().getTime(); results_json.EndDate = new Date().getTime();
//записать результаты всех задач. //записать результаты всех задач.
try { try {
for (SapforTask task : results_json.tasks) {
//--
task.filesList = new Vector<>();
//--
if (task.versions.size() > 1) {
SapforVersion_json correctness = task.versions.get(1); //0 - исходная, 1 коррекция стиля кода.
File home = new File(correctness.version);
//задача, получить список файлов. нет вложенных папок.
File[] files_ = home.listFiles();
if (files_ != null) {
for (File file : files_) {
if (file.isFile()) {
DBProjectFile pf = new DBProjectFile(); //только для определения типа файла.
pf.file = file;
pf.AutoDetectProperties();
if (pf.fileType != FileType.forbidden)
task.filesList.add(pf.file.getName());
}
}
}
}
}
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json)); Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
FileUtils.writeStringToFile(new File(Constants.DONE), ""); FileUtils.writeStringToFile(new File(Constants.DONE), "");
} catch (Exception e) { } catch (Exception e) {

View File

@@ -41,15 +41,8 @@ public class SapforTask extends DBObject {
public TaskState state = TaskState.Inactive; public TaskState state = TaskState.Inactive;
//в json не выносить. это только для БД. //в json не выносить. это только для БД.
@Description("DEFAULT ''") @Description("DEFAULT ''")
public String files = "";
@Description("DEFAULT ''")
public String versionsDescription = ""; public String versionsDescription = "";
//------ //------
//-----------
@Description("IGNORE")
@Expose
public List<String> filesList = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
//-------------------------------------->>
@Description("IGNORE") @Description("IGNORE")
@Expose @Expose
public Vector<SapforVersion_json> versions = new Vector<>(); public Vector<SapforVersion_json> versions = new Vector<>();
@@ -62,7 +55,6 @@ public class SapforTask extends DBObject {
} }
public void Reset() { public void Reset() {
state = TaskState.Inactive; state = TaskState.Inactive;
filesList.clear();
versions.clear(); versions.clear();
variants.clear(); variants.clear();
} }
@@ -85,7 +77,6 @@ public class SapforTask extends DBObject {
group_description = t.group_description; group_description = t.group_description;
versionsDescription = t.versionsDescription; versionsDescription = t.versionsDescription;
//-- //--
files = t.files;
codes = t.codes; codes = t.codes;
state = t.state; state = t.state;
//-- //--
@@ -120,6 +111,7 @@ public class SapforTask extends DBObject {
codes.equalsIgnoreCase(task.codes); codes.equalsIgnoreCase(task.codes);
} }
public boolean Compare(SapforTask task, Vector<String> comparisonLog) throws Exception { public boolean Compare(SapforTask task, Vector<String> comparisonLog) throws Exception {
/*
//1. сравнить списки файлов. без учета порядка. //1. сравнить списки файлов. без учета порядка.
if (filesList.size() != task.filesList.size()) if (filesList.size() != task.filesList.size())
return false; return false;
@@ -142,6 +134,7 @@ public class SapforTask extends DBObject {
//-- //--
if (!compareVersionsFiles(version1, version2, filesList)) return false; if (!compareVersionsFiles(version1, version2, filesList)) return false;
} }
*/
return false; return false;
} }
@Override @Override

View File

@@ -1,9 +1,20 @@
package SapforTestingSystem.SapforTasksPackage; package SapforTestingSystem.SapforTasksPackage;
import Common.Constants;
import Common.Global; import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforTasksResults_json;
import javax.swing.tree.DefaultMutableTreeNode;
import java.io.File; import java.io.File;
public class SapforTasksPackageInterface { public class SapforTasksPackageInterface {
public static File getPackageArchive(SapforTasksPackage package_in) { public static File getPackageArchive(SapforTasksPackage package_in) {
return new File(Global.SapforPackagesDirectory, package_in.id + ".zip"); return new File(Global.SapforPackagesDirectory, package_in.id + ".zip");
} }
public static DefaultMutableTreeNode getTree(SapforTasksPackage package_in) throws Exception {
File results_json_file = new File(package_in.workspace, Constants.results_json);
SapforTasksResults_json results_json =
(SapforTasksResults_json) Utils.jsonFromFile(results_json_file,
SapforTasksResults_json.class);
return null;
}
} }

View File

@@ -253,10 +253,6 @@ public class SapforTasksPackageSupervisor {
sapforTasksPackage.summary = String.join("\n", summary_lines); sapforTasksPackage.summary = String.join("\n", summary_lines);
for (SapforTask task : results_json.tasks) { for (SapforTask task : results_json.tasks) {
//-- //--
if (!task.filesList.isEmpty())
task.files = String.join("\n", task.filesList);
//---
task.filesList = null;
task.versions = null; task.versions = null;
task.variants = null; task.variants = null;
} }