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

патч для перехода на другие ключи багов.

Browse Source
This commit is contained in:
02090095
2025-12-15 21:56:29 +03:00
parent 42b179a0cc
commit 7bb4531c1b
6 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
.idea/workspace.xml generated
View File

@@ -8,12 +8,10 @@
<component name="ChangeListManager">
<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$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/BugReport.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReport/UI/BugReportsForm.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportRecipient/BugReportRecipient.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportSetting/BugReportSetting.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/ComponentsServer/BugReportsDatabase.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Global.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Passes/All/DownloadBugReport.java" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />

6
properties
View File

@@ -33,9 +33,9 @@
"CompleteRunEnvironments": true,
"CreateEthalonTasks": true,
"ErasePackageWorkspace": true,
"lastMachineId": 13,
"lastUserId": 34,
"lastCompilerId": 52,
"lastMachineId": -1,
"lastUserId": -1,
"lastCompilerId": -1,
"RegisterOn": false,
"SpacesOn": false,
"EmptyLinesOn": false,

21
src/_VisualDVM/ComponentsServer/BugReportsDatabase.java
View File

@@ -1,5 +1,6 @@
package _VisualDVM.ComponentsServer;
import Common.Database.SQLITE.SQLiteDatabase;
import Common.Utils.Utils_;
import _VisualDVM.ComponentsServer.BugReport.BugReport;
import _VisualDVM.ComponentsServer.BugReport.BugReportsDBTable;
import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipient;
@@ -7,8 +8,12 @@ import _VisualDVM.ComponentsServer.BugReportRecipient.BugReportRecipientsDBTable
import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSetting;
import _VisualDVM.ComponentsServer.BugReportSetting.BugReportSettingsDBTable;
import _VisualDVM.ComponentsServer.Recipient.RecipientsDataSet;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
import _VisualDVM.Utils;
import org.apache.commons.io.FileUtils;
import java.io.File;
import java.nio.file.Paths;
import java.util.Comparator;
import java.util.Vector;
@@ -89,6 +94,22 @@ public class BugReportsDatabase extends SQLiteDatabase {
Update(recipient);
}
}
//перенос архивов
for (BugReport bugReport: sortedBugs){
System.out.println("bugreport_id="+bugReport.id+"/"+bugReport.id_);
File new_home = new File(Global.BugReportsDirectory,String.valueOf(bugReport.id_));
//--
if (!new_home.exists())
FileUtils.forceMkdir(new_home);
//--
Utils.CleanDirectory(new_home);
//--
File old_archive = new File(Global.BugReportsDirectory_OLD, bugReport.id);
File new_archive = new File(new_home,String.valueOf(bugReport.id_)+".zip");
if (old_archive.exists()) {
FileUtils.copyFile(old_archive, new_archive);
}
}
//--
}
}

7
src/_VisualDVM/Global.java
View File

@@ -37,6 +37,7 @@ public class Global {
public static File ComponentsDirectory;
public static File KeysDirectory;
public static File DataDirectory;
public static File BugReportsDirectory_OLD;
public static File BugReportsDirectory;
public static File BackUpsDirectory; //бекапы компонентов на локальной машине.
public static File TempDirectory;
@@ -65,7 +66,8 @@ public class Global {
Utils_.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
//-
Utils_.CheckDirectory(RepoDirectory = new File(Utils_.getHomeDirectory(), Constants.RepoDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory_OLD = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), "BugReports"));
Utils_.CheckDirectory(BackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.BackUpsDirectoryName));
Utils_.CheckDirectory(ProjectsDirectory = new File(Utils_.getHomeDirectory(), Constants.ProjectsDirectoryName));
Utils_.CheckDirectory(CompilationTasksDirectory = new File(Utils_.getHomeDirectory(), Constants.CompilationTasksDirectoryName));
@@ -88,7 +90,8 @@ public class Global {
Utils_.CheckDirectory(DataDirectory = new File(Utils_.getHomeDirectory(), Constants.DataDirectoryName));
Utils_.CheckDirectory(DataBackUpsDirectory = new File(Utils_.getHomeDirectory(), Constants.DataBackUpsDirectoryName));
//--
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory_OLD = new File(Utils_.getHomeDirectory(), Constants.BugsDirectoryName));
Utils_.CheckDirectory(BugReportsDirectory = new File(Utils_.getHomeDirectory(), "BugReports"));
Utils_.CheckDirectory(KeysDirectory = new File(Utils_.getHomeDirectory(), Constants.KeyDirectoryName));
}
public static void CheckTestingSystemDirectories() {

4
src/_VisualDVM/Passes/All/DownloadAllBugReportsArchives.java
View File

@@ -1,4 +1,5 @@
package _VisualDVM.Passes.All;
import Common.Utils.Utils_;
import _VisualDVM.Current;
import _VisualDVM.Global;
import _VisualDVM.Passes.PassCode;
@@ -18,6 +19,7 @@ public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
protected void performPreparation() throws Exception {
Global.mainModule.getPass(PassCode.CloseCurrentProject).Do();
Global.mainModule.set(Current.Root, null); //чтобы гарантированно не существовало корня.
Utils.CleanDirectory(Global.BugReportsDirectory_OLD);
Utils.CleanDirectory(Global.BugReportsDirectory);
}
@Override
@@ -46,7 +48,7 @@ public class DownloadAllBugReportsArchives extends ComponentsServerPass<File> {
File[] archives = t2.listFiles();
if (archives != null) {
for (File file : archives) {
FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory.getAbsolutePath(), file.getName() + ".zip").toFile());
FileUtils.moveFile(file, Paths.get(Global.BugReportsDirectory_OLD.getAbsolutePath(), file.getName() + ".zip").toFile());
}
}
}

1
src/_VisualDVM/Passes/All/DownloadBugReport.java
View File

@@ -12,6 +12,7 @@ public class DownloadBugReport extends ComponentsServerPass<BugReport> {
}
@Override
protected void performPreparation() throws Exception {
Utils_.CheckDirectory(Global.BugReportsDirectory_OLD);
Utils_.CheckDirectory(Global.BugReportsDirectory);
}
@Override