no message
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
package _VisualDVM.Repository.Server;
|
||||
import Common.Database.Objects.DBObject;
|
||||
import Common.Utils.CommonUtils;
|
||||
import Common.Utils.Utils_;
|
||||
import _VisualDVM.Global;
|
||||
import _VisualDVM.Utils;
|
||||
import _VisualDVM.GlobalData.Account.Account;
|
||||
@@ -99,9 +99,9 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
Print("Отправить клиенту архив всех архивов баг репортов");
|
||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||
ZipFolderPass zip = new ZipFolderPass();
|
||||
File archives = new File(CommonUtils.getDateName("Bugs"));
|
||||
File archives = new File(Utils_.getDateName("Bugs"));
|
||||
if (zip.Do("Bugs", archives.getAbsolutePath())) {
|
||||
response.object = CommonUtils.fileToBytes(archives);
|
||||
response.object = Utils_.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 = CommonUtils.fileToBytes(db.getFile());
|
||||
response.object = Utils_.fileToBytes(db.getFile());
|
||||
break;
|
||||
case ReceiveBugReport:
|
||||
Print("Скачать баг репорт по ключу " + request.arg);
|
||||
File bugArchive = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
|
||||
File bugArchive = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile();
|
||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||
response.object = CommonUtils.fileToBytes(bugArchive);
|
||||
response.object = Utils_.fileToBytes(bugArchive);
|
||||
break;
|
||||
case SendBugReport:
|
||||
Print("Отправить баг репорт " + request.arg);
|
||||
File bugArchive1 = Paths.get(CommonUtils.getHomePath(), "Bugs", request.arg).toFile();
|
||||
CommonUtils.bytesToFile((byte[]) request.object, bugArchive1);
|
||||
File bugArchive1 = Paths.get(Utils_.getHomePath(), "Bugs", request.arg).toFile();
|
||||
Utils_.bytesToFile((byte[]) request.object, bugArchive1);
|
||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||
break;
|
||||
//</editor-fold>
|
||||
case GetComponentsBackups:
|
||||
Print("Получить список сохраненных версий компонента " + request.arg);
|
||||
File backupsDirectory = Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "Backups").toFile();
|
||||
File backupsDirectory = Paths.get(Utils_.getHomePath(), "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(CommonUtils.getHomePath(), "Components", sComponentType, componentFileName).toFile();
|
||||
File versionFile = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "version.txt").toFile();
|
||||
File backupsFolder = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "Backups").toFile();
|
||||
File componentFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType, componentFileName).toFile();
|
||||
File versionFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType, "version.txt").toFile();
|
||||
File backupsFolder = Paths.get(Utils_.getHomePath(), "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 распаковка компонента
|
||||
CommonUtils.bytesToFile((byte[]) request.object, componentFile);
|
||||
Utils_.bytesToFile((byte[]) request.object, componentFile);
|
||||
//2 запись версии компонента
|
||||
FileUtils.writeStringToFile(versionFile, sComponentVersion);
|
||||
//3 запись в журнал компонента
|
||||
File changesLog = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType, "changes.txt").toFile();
|
||||
File changesLog = Paths.get(Utils_.getHomePath(), "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(CommonUtils.getHomePath(), "Components", sComponentType_, "minimal_version.txt").toFile();
|
||||
File minimal_versionFile = Paths.get(Utils_.getHomePath(), "Components", sComponentType_, "minimal_version.txt").toFile();
|
||||
FileUtils.writeStringToFile(minimal_versionFile, sComponentMinimalVersion);
|
||||
//-
|
||||
//3 запись в журнал компонента
|
||||
File changesLog_ = Paths.get(CommonUtils.getHomePath(), "Components", sComponentType_, "changes.txt").toFile();
|
||||
File changesLog_ = Paths.get(Utils_.getHomePath(), "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(CommonUtils.getHomePath(), "Components", packed1[0], packed1[1]).toFile();
|
||||
File componentFile1 = Paths.get(Utils_.getHomePath(), "Components", packed1[0], packed1[1]).toFile();
|
||||
Print("Получить компонент " + packed1[0]);
|
||||
response = new ServerExchangeUnit_2021(ServerCode.OK);
|
||||
response.object = CommonUtils.fileToBytes(componentFile1);
|
||||
response.object = Utils_.fileToBytes(componentFile1);
|
||||
break;
|
||||
default:
|
||||
throw new RepositoryRefuseException("Неподдерживаемый код: " + code);
|
||||
@@ -246,8 +246,8 @@ 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(CommonUtils.getHomePath(), "Components", sType, "version.txt").toFile();
|
||||
String v_string = CommonUtils.removeCharacters(
|
||||
File vFile = Paths.get(Utils_.getHomePath(), "Components", sType, "version.txt").toFile();
|
||||
String v_string = Utils_.removeCharacters(
|
||||
Utils.ReadAllText(vFile),
|
||||
"\n", "\r"
|
||||
);
|
||||
@@ -262,8 +262,8 @@ 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(CommonUtils.getHomePath(), "Components", sType, "minimal_version.txt").toFile();
|
||||
String mv_string = CommonUtils.removeCharacters(
|
||||
File vFile = Paths.get(Utils_.getHomePath(), "Components", sType, "minimal_version.txt").toFile();
|
||||
String mv_string = Utils_.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 = CommonUtils.fileToBytes(Paths.get(CommonUtils.getHomePath(), "Components", request.arg, "changes.txt").toFile());
|
||||
response.object = Utils_.fileToBytes(Paths.get(Utils_.getHomePath(), "Components", request.arg, "changes.txt").toFile());
|
||||
break;
|
||||
case CheckURLRegistered:
|
||||
Print("Проверить учетную запись на машине");
|
||||
@@ -308,17 +308,17 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
File program = Paths.get(project.getAbsolutePath(), fileName).toFile();
|
||||
//--
|
||||
File convertedProgram = Paths.get(program.getParent(),
|
||||
CommonUtils.getFileNameWithoutExtension(program) + ".DVMH." +
|
||||
Utils_.getFileNameWithoutExtension(program) + ".DVMH." +
|
||||
(projectLanguage.equals(LanguageName.fortran) ? "f" : "c")
|
||||
).toFile();
|
||||
String command =
|
||||
CommonUtils.DQuotes(server_dvm_drv) + " " +
|
||||
Utils_.DQuotes(server_dvm_drv) + " " +
|
||||
projectLanguage.getDVMCompile() + "dv " +
|
||||
options + " "
|
||||
+ CommonUtils.DQuotes(program.getName());
|
||||
+ Utils_.DQuotes(program.getName());
|
||||
//--
|
||||
File fileWorkspace = program.getParentFile();
|
||||
Process process = Utils.startScript(workspace, fileWorkspace, CommonUtils.getDateName("convert_script"), command);
|
||||
Process process = Utils.startScript(workspace, fileWorkspace, Utils_.getDateName("convert_script"), command);
|
||||
process.waitFor();
|
||||
String convertationOut = Utils.readAllOutput(process);
|
||||
convertationOut = convertationOut.replace(program.getName(), fileName); //для учета пути.
|
||||
@@ -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 = CommonUtils.fileToBytes(resultArchive);
|
||||
response.object = Utils_.fileToBytes(resultArchive);
|
||||
} else
|
||||
throw new RepositoryRefuseException("Внутренняя ошибка. Не удалось запаковать версию");
|
||||
//--
|
||||
@@ -417,7 +417,7 @@ public class ComponentsServer extends RepositoryServer<BugReportsDatabase> {
|
||||
//-------------------------------------
|
||||
Thread.sleep(60000);
|
||||
} catch (Exception ex) {
|
||||
CommonUtils.MainLog.PrintException(ex);
|
||||
Utils_.MainLog.PrintException(ex);
|
||||
}
|
||||
}
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user