no message

This commit is contained in:
2024-10-14 12:54:52 +03:00
parent e1627badd3
commit e64a4f4c47
45 changed files with 211 additions and 200 deletions

View File

@@ -66,11 +66,11 @@ public abstract class Component extends DBObject implements Loggable {
minimal_version = Long.parseLong(v_string);
}
public void ReplaceOldFile() throws Exception {
Utils.delete_with_check(getFile());
Utils_.forceDeleteWithCheck(getFile());
//-скопировать файл
Files.move(getNewFile().toPath(), getFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
//удалить новый файл.
Utils.delete_with_check(getNewFile());
Utils_.forceDeleteWithCheck(getNewFile());
}
public void Update() throws Exception {
if (!getNewFile().setExecutable(true)) throw new PassException("Не удалось разрешить файл\n" +

View File

@@ -449,11 +449,11 @@ public abstract class Sapfor extends OSDComponent {
int exit_code = CommonConstants.Nan;
//---
File data_workspace = new File(workspace, Constants.data);
Utils.CheckDirectory(data_workspace);
Utils_.CheckDirectory(data_workspace);
File outputFile = new File(data_workspace, outName);
File errorsFile = new File(data_workspace, errName);
Utils.delete_with_check(outputFile);
Utils.delete_with_check(errorsFile);
Utils_.forceDeleteWithCheck(outputFile);
Utils_.forceDeleteWithCheck(errorsFile);
//---
File file = new File(data_workspace, name + (Utils_.isWindows() ? ".bat" : ".sh"));
FileUtils.write(file,

View File

@@ -56,7 +56,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
if (object instanceof BugReport) {
BugReport bugReport = (BugReport) object;
if (!bugReport.project_version.isEmpty())
Utils.delete_with_check(BugReportInterface.getArchiveFile(bugReport));
Utils_.forceDeleteWithCheck(BugReportInterface.getArchiveFile(bugReport));
}
}
@Override
@@ -191,12 +191,12 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
if (versionFile.exists())
versionText = Utils.ReadAllText(versionFile);
//---->>
Utils.CheckDirectory(backupsFolder);
Utils_.CheckDirectory(backupsFolder);
Utils.keepNewFiles(backupsFolder, Global.properties.ComponentsBackUpsCount);
//-->>
File backupFile = new File(backupsFolder, sComponentType + "_" + versionText);
if (backupFile.exists())
Utils.delete_with_check(backupFile);
Utils_.forceDeleteWithCheck(backupFile);
FileUtils.moveFile(componentFile, backupFile);
}
//1 распаковка компонента
@@ -396,7 +396,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
//-
zip.Do("Bugs", bugsArchives.getAbsolutePath());
zip.Do(todayBackUp.getAbsolutePath(), todayBackUpArchive.getAbsolutePath());
Utils.forceDeleteWithCheck(todayBackUp);
Utils_.forceDeleteWithCheck(todayBackUp);
//-
for (Pair<Machine, User> cred : storages) {
backupSession.Do(cred.getKey(), cred.getValue(),