no message

This commit is contained in:
2024-10-07 22:04:09 +03:00
parent 7fac84740d
commit 17c0bf7eb3
103 changed files with 560 additions and 491 deletions

View File

@@ -101,7 +101,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
ZipFolderPass zip = new ZipFolderPass();
File archives = new File(Utils.getDateName("Bugs"));
if (zip.Do("Bugs", archives.getAbsolutePath())) {
response.object = Utils.packFile(archives);
response.object = CommonUtils.fileToBytes(archives);
Print("Архив успешно запакован");
} else throw new RepositoryRefuseException("Не удалось запаковать архивы");
break;
@@ -135,24 +135,24 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
case ReceiveBugReportsDatabase:
Print("Получить базу данных баг репортов");
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = Utils.packFile(db.getFile());
response.object = CommonUtils.fileToBytes(db.getFile());
break;
case ReceiveBugReport:
Print("Скачать баг репорт по ключу " + request.arg);
File bugArchive = Paths.get(Global.Home, "Bugs", request.arg).toFile();
File bugArchive = Paths.get(CommonUtils.Home, "Bugs", request.arg).toFile();
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = Utils.packFile(bugArchive);
response.object = CommonUtils.fileToBytes(bugArchive);
break;
case SendBugReport:
Print("Отправить баг репорт " + request.arg);
File bugArchive1 = Paths.get(Global.Home, "Bugs", request.arg).toFile();
Utils.unpackFile((byte[]) request.object, bugArchive1);
File bugArchive1 = Paths.get(CommonUtils.Home, "Bugs", request.arg).toFile();
CommonUtils.bytesToFile((byte[]) request.object, bugArchive1);
response = new ServerExchangeUnit_2021(ServerCode.OK);
break;
//</editor-fold>
case GetComponentsBackups:
Print("Получить список сохраненных версий компонента " + request.arg);
File backupsDirectory = Paths.get(Global.Home, "Components", request.arg, "Backups").toFile();
File backupsDirectory = Paths.get(CommonUtils.Home, "Components", request.arg, "Backups").toFile();
//--
if (backupsDirectory.exists()) {
File[] files = backupsDirectory.listFiles(File::isFile);
@@ -182,9 +182,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
3
);
Print("Опубликовать компонент " + sComponentType);
File componentFile = Paths.get(Global.Home, "Components", sComponentType, componentFileName).toFile();
File versionFile = Paths.get(Global.Home, "Components", sComponentType, "version.txt").toFile();
File backupsFolder = Paths.get(Global.Home, "Components", sComponentType, "Backups").toFile();
File componentFile = Paths.get(CommonUtils.Home, "Components", sComponentType, componentFileName).toFile();
File versionFile = Paths.get(CommonUtils.Home, "Components", sComponentType, "version.txt").toFile();
File backupsFolder = Paths.get(CommonUtils.Home, "Components", sComponentType, "Backups").toFile();
//0 архивация старой версии, если она есть.
if (componentFile.exists()) {
String versionText = "";
@@ -200,11 +200,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
FileUtils.moveFile(componentFile, backupFile);
}
//1 распаковка компонента
Utils.unpackFile((byte[]) request.object, componentFile);
CommonUtils.bytesToFile((byte[]) request.object, componentFile);
//2 запись версии компонента
FileUtils.writeStringToFile(versionFile, sComponentVersion);
//3 запись в журнал компонента
File changesLog = Paths.get(Global.Home, "Components", sComponentType, "changes.txt").toFile();
File changesLog = Paths.get(CommonUtils.Home, "Components", sComponentType, "changes.txt").toFile();
FileWriter writer = new FileWriter(changesLog.getAbsolutePath(), true);
BufferedWriter bufferWriter = new BufferedWriter(writer);
bufferWriter.write(componentChangeRecord);
@@ -217,11 +217,11 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
String sComponentType_ = packed_[0];
String sComponentMinimalVersion = packed_[1];
Print("Поднять минимальную версию компонента " + sComponentType_);
File minimal_versionFile = Paths.get(Global.Home, "Components", sComponentType_, "minimal_version.txt").toFile();
File minimal_versionFile = Paths.get(CommonUtils.Home, "Components", sComponentType_, "minimal_version.txt").toFile();
FileUtils.writeStringToFile(minimal_versionFile, sComponentMinimalVersion);
//-
//3 запись в журнал компонента
File changesLog_ = Paths.get(Global.Home, "Components", sComponentType_, "changes.txt").toFile();
File changesLog_ = Paths.get(CommonUtils.Home, "Components", sComponentType_, "changes.txt").toFile();
FileWriter writer_ = new FileWriter(changesLog_.getAbsolutePath(), true);
BufferedWriter bufferWriter_ = new BufferedWriter(writer_);
bufferWriter_.write("Минимальная версия поднята до " + sComponentMinimalVersion + "\n");
@@ -233,10 +233,10 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
case ReceiveComponent:
String[] packed1 = request.arg.split("\n");
//тип/имя файла
File componentFile1 = Paths.get(Global.Home, "Components", packed1[0], packed1[1]).toFile();
File componentFile1 = Paths.get(CommonUtils.Home, "Components", packed1[0], packed1[1]).toFile();
Print("Получить компонент " + packed1[0]);
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = Utils.packFile(componentFile1);
response.object = CommonUtils.fileToBytes(componentFile1);
break;
default:
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
@@ -246,7 +246,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
LinkedHashMap<ComponentType, String> response_actual_versions_ = new LinkedHashMap<>();
for (String sType : types) {
ComponentType componentType = ComponentType.valueOf(sType);
File vFile = Paths.get(Global.Home, "Components", sType, "version.txt").toFile();
File vFile = Paths.get(CommonUtils.Home, "Components", sType, "version.txt").toFile();
String v_string = CommonUtils.removeCharacters(
Utils.ReadAllText(vFile),
"\n", "\r"
@@ -262,7 +262,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
LinkedHashMap<ComponentType, String> response_minimal_versions_ = new LinkedHashMap<>();
for (String sType : types_) {
ComponentType componentType = ComponentType.valueOf(sType);
File vFile = Paths.get(Global.Home, "Components", sType, "minimal_version.txt").toFile();
File vFile = Paths.get(CommonUtils.Home, "Components", sType, "minimal_version.txt").toFile();
String mv_string = CommonUtils.removeCharacters(
Utils.ReadAllText(vFile),
"\n", "\r"
@@ -275,7 +275,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
case GetComponentChangesLog:
Print("Получить журнал изменений компонента " + request.arg);
response = new ServerExchangeUnit_2021(ServerCode.OK);
response.object = Utils.packFile(Paths.get(Global.Home, "Components", request.arg, "changes.txt").toFile());
response.object = CommonUtils.fileToBytes(Paths.get(CommonUtils.Home, "Components", request.arg, "changes.txt").toFile());
break;
case CheckURLRegistered:
Print("Проверить учетную запись на машине");
@@ -337,7 +337,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
response.arg = String.join("\n", badFiles) + "|" + output;
File resultArchive = new File(workspace, projectName + "_result.zip");
if (ComponentsServer.zip.Do(project.getAbsolutePath(), resultArchive.getAbsolutePath())) {
response.object = Utils.packFile(resultArchive);
response.object = CommonUtils.fileToBytes(resultArchive);
} else
throw new RepositoryRefuseException("Внутренняя ошибка. Не удалось запаковать версию");
//--
@@ -417,7 +417,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
//-------------------------------------
Thread.sleep(60000);
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
}
}
});