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

считаывание списка файлов у коррекции стиля кода. для сравнения.

Browse Source
This commit is contained in:
02090095
2023-10-22 23:22:49 +03:00
parent 7fac46b249
commit 19370c60d9
3 changed files with 47 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
.idea/workspace.xml generated
View File

@@ -7,16 +7,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
<change afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTest_json.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/Common/Current.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Current.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/Common/Utils/Utils.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Utils/Utils.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/Json/SapforTasksPackage_json.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/SapforTask/SapforTask.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTask/SapforTask.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackage/SapforTasksPackage.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/SapforTestingSystem/SapforTasksPackageSupervisor/SapforTasksPackageSupervisor.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

43
src/SapforTestingSystem/PackageModeSupervisor/PackageModeSupervisor.java
View File

@@ -2,10 +2,9 @@ package SapforTestingSystem.PackageModeSupervisor;
import Common.Constants;
import Common.Global;
import Common.Utils.Utils;
import SapforTestingSystem.Json.SapforConfiguration_json;
import SapforTestingSystem.Json.SapforTasksPackage_json;
import SapforTestingSystem.Json.SapforTasksResults_json;
import SapforTestingSystem.Json.SapforTest_json;
import ProjectData.Files.DBProjectFile;
import ProjectData.Files.FileType;
import SapforTestingSystem.Json.*;
import SapforTestingSystem.PerformSapforTask;
import SapforTestingSystem.SapforTask.SapforTask;
import SapforTestingSystem.ThreadsPlanner.ThreadsPlanner;
@@ -13,6 +12,7 @@ import org.apache.commons.io.FileUtils;
import java.io.File;
import java.util.Date;
import java.util.Vector;
public class PackageModeSupervisor extends ThreadsPlanner {
SapforTasksPackage_json package_json = null;
SapforTasksResults_json results_json = new SapforTasksResults_json();
@@ -45,14 +45,45 @@ public class PackageModeSupervisor extends ThreadsPlanner {
}
interruptThread.start();
}
void getTaskFiles(SapforTask task) throws Exception {
}
@Override
protected void finalize() {
results_json.EndDate = new Date().getTime();
//записать результаты всех задач.
try {
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
//тут же и строить версии.
//очистка служебных файлов.
Utils.deleteFilesByExtensions(new File(Global.Home), "proj", "dep"); //Потом txt тоже добавить.
//--
for (SapforTask task : results_json.tasks) {
//--
task.files = 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.files.add(pf.file.getName());
}
}
//--
/*
if (task.files.size() > 0) {
task.filesNames = String.join("\n", task.files);
}
*/
}
}
}
Utils.jsonToFile(results_json, new File(Global.Home, Constants.results_json));
FileUtils.writeStringToFile(new File(Constants.DONE), "");
} catch (Exception e) {
Global.Log.PrintException(e);

14
src/SapforTestingSystem/SapforTask/SapforTask.java
View File

@@ -7,6 +7,7 @@ import SapforTestingSystem.Json.SapforVersion_json;
import com.google.gson.annotations.Expose;
import com.sun.org.glassfish.gmbal.Description;
import java.util.List;
import java.util.Vector;
public class SapforTask extends DBObject {
//------------------------------------>>
@@ -29,14 +30,19 @@ public class SapforTask extends DBObject {
@Description("DEFAULT ''")
@Expose
public String root = "";
@Description("DEFAULT ''")
@Expose
public String last_version = "";
//-------------------------------------->>
@Description("DEFAULT 'Inactive'")
@Expose
public TaskState state = TaskState.Inactive;
//-----------
/*
@Description("DEFAULT ''")
@Expose
public String filesNames = ""; //для базы данных. имена файлов через enter //а надо ли?
*/
@Description("IGNORE")
@Expose
public List<String> files = new Vector<>(); //файлы проекта.Брать из коррекции стиля кода. есть первой версия
//-------------------------------------->>
@Description("IGNORE")
@Expose
public Vector<SapforVersion_json> versions = new Vector<>();