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

no message

Browse Source
This commit is contained in:
02090095
2024-10-07 22:04:09 +03:00
parent 7fac84740d
commit 17c0bf7eb3
103 changed files with 560 additions and 491 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Repository/Component/Instruction.java
View File

@@ -1,5 +1,5 @@
package Repository.Component;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import java.text.DateFormat;
@@ -51,7 +51,7 @@ public class Instruction extends Component {
DateFormat df = new SimpleDateFormat("MMM dd yyyy HH:mm:ss", Locale.ENGLISH);
date_text = df.format(getFile().lastModified());
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
}
}
}

6
src/Repository/Component/OSDComponent.java
View File

@@ -1,12 +1,12 @@
package Repository.Component;
import _VisualDVM.Global;
import Common.Utils.CommonUtils;
public abstract class OSDComponent extends Component {
@Override
public String getFileName() {
return getComponentType().toString() + (Global.isWindows ? ".exe" : "");
return getComponentType().toString() + (CommonUtils.isWindows ? ".exe" : "");
}
@Override
public String getNewFileName() {
return getComponentType().toString() + "_new" + (Global.isWindows ? ".exe" : "");
return getComponentType().toString() + "_new" + (CommonUtils.isWindows ? ".exe" : "");
}
}

4
src/Repository/Component/Sapfor/MessagesServer.java
View File

@@ -1,6 +1,6 @@
package Repository.Component.Sapfor;
import Common.Utils.CommonUtils;
import Common_old.Current;
import _VisualDVM.Global;
import java.io.BufferedReader;
import java.io.InputStreamReader;
@@ -47,7 +47,7 @@ public class MessagesServer {
if (serverSocket != null)
serverSocket.close();
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
}
}
public int getPort() {

8
src/Repository/Component/Sapfor/Sapfor.java
View File

@@ -138,7 +138,7 @@ public abstract class Sapfor extends OSDComponent {
RunAnalysis("SPF_GetVersionAndBuildDate", -1, "", "");
Visualizer_2.UnpackVersionInfo(this, getResult());
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
UI.Error("Не удалось получить версию компонента " + CommonUtils.DQuotes(getComponentType().getDescription()));
}
}
@@ -455,7 +455,7 @@ public abstract class Sapfor extends OSDComponent {
Utils.delete_with_check(outputFile);
Utils.delete_with_check(errorsFile);
//---
File file = new File(data_workspace, name + (Global.isWindows ? ".bat" : ".sh"));
File file = new File(data_workspace, name + (CommonUtils.isWindows ? ".bat" : ".sh"));
FileUtils.write(file,
CommonUtils.DQuotes(sapfor_drv)
+ (flags.isEmpty() ? "" : (" " + flags))
@@ -478,7 +478,7 @@ public abstract class Sapfor extends OSDComponent {
exit_code = process.waitFor();
flag = true;
} catch (Exception ex) {
Global.Log.PrintException(ex);
CommonUtils.MainLog.PrintException(ex);
Utils.sleep(1000);
}
}
@@ -529,7 +529,7 @@ public abstract class Sapfor extends OSDComponent {
public static File temp_copy = null;
public static File getTempCopy(File src) throws Exception {
if (temp_copy == null || !temp_copy.exists()) {
temp_copy = Utils.getTempFileName("SAPFOR" + (Global.isWindows ? ".exe" : ""));
temp_copy = Utils.getTempFileName("SAPFOR" + (CommonUtils.isWindows ? ".exe" : ""));
FileUtils.copyFile(src, temp_copy);
temp_copy.setExecutable(true);
}

6
src/Repository/Component/Visualizer_2.java
View File

@@ -40,7 +40,7 @@ public class Visualizer_2 extends OSDComponent {
}
@Override
public String getHome() {
return Global.Home;
return CommonUtils.Home;
}
@Override
public void GetVersionInfo() {
@@ -48,7 +48,7 @@ public class Visualizer_2 extends OSDComponent {
Command("get_version: ");
UnpackVersionInfo(this, response);
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
}
}
public void refreshPid(){
@@ -58,7 +58,7 @@ public class Visualizer_2 extends OSDComponent {
PID = response;
// UI.Info("SERVER PID = "+Utils.Brackets(PID));
} catch (Exception e) {
Global.Log.PrintException(e);
CommonUtils.MainLog.PrintException(e);
}
}
@Override

4
src/Repository/EmailMessage.java
View File

@@ -1,5 +1,5 @@
package Repository;
import Common_old.Utils.Utils;
import Common.Utils.CommonUtils;
import java.io.File;
import java.io.Serializable;
@@ -18,6 +18,6 @@ public class EmailMessage implements Serializable {
targets.addAll(targets_in);
}
public void addAttachement(File f) throws Exception {
files.put(f.getName(), Utils.packFile(f));
files.put(f.getName(), CommonUtils.fileToBytes(f));
}
}

4
src/Repository/RepositoryServer.java
View File

@@ -102,7 +102,7 @@ public abstract class RepositoryServer<D extends Database> {
LinkedHashMap<String, File> innerFiles = new LinkedHashMap<>();
for (String aName : message_in.files.keySet()) {
File f = Utils.getTempFileName(aName);
Utils.unpackFile(message_in.files.get(aName), f);
CommonUtils.bytesToFile(message_in.files.get(aName), f);
innerFiles.put(aName, f);
}
Vector<String> targets_ = new Vector<>(message_in.targets);
@@ -223,7 +223,7 @@ public abstract class RepositoryServer<D extends Database> {
Print("Отправить клиенту файл по пути " + CommonUtils.Brackets(request.arg));
response = new ServerExchangeUnit_2021(ServerCode.OK);
File file = new File(request.arg);
response.object = file.exists() ? Utils.packFile(file) : null;
response.object = file.exists() ? CommonUtils.fileToBytes(file) : null;
break;
case Email:
Print("Отправка сообщения электронной почты");

42
src/Repository/Server/ComponentsServer.java
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);
}
}
});

5
src/Repository/Server/ServerExchangeUnit_2021.java
View File

@@ -1,6 +1,5 @@
package Repository.Server;
import Common.Utils.CommonUtils;
import Common_old.Utils.Utils;
import java.io.File;
import java.io.Serializable;
@@ -30,10 +29,10 @@ public class ServerExchangeUnit_2021 implements Serializable {
}
//--------
public void Unpack() throws Exception {
Utils.unpackFile((byte[]) object, new File(arg));
CommonUtils.bytesToFile((byte[]) object, new File(arg));
}
public void Unpack(File file) throws Exception {
Utils.unpackFile((byte[]) object, file);
CommonUtils.bytesToFile((byte[]) object, file);
}
public void Print() {
System.out.println("codeName=" + CommonUtils.Brackets(codeName));

3
src/Repository/Subscribes/UI/SubscriberForm.java
View File

@@ -3,7 +3,6 @@ import Common.Utils.CommonUtils;
import Common.Visual.CommonUI;
import _VisualDVM.Global;
import Common_old.UI.Windows.Dialog.DBObjectDialog;
import Common_old.Utils.Utils;
import GlobalData.Account.AccountRole;
import Repository.Subscribes.Subscriber;
public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields> {
@@ -22,7 +21,7 @@ public class SubscriberForm extends DBObjectDialog<Subscriber, SubscriberFields>
public void validateFields() {
if (fields.tfName.getText().isEmpty())
Log.Writeln("Имя учётной записи не может быть пустым");
Utils.validateEmail(fields.tfAddress.getText(), Log);
CommonUtils.validateEmail(fields.tfAddress.getText(), Log);
if (fields.tfAddress.getText().isEmpty())
Log.Writeln_("Адрес электронной почты не может быть пустым");
if (!title_text.equals("Регистрация") && (fields.tfAddress.isEditable() && Global.componentsServer.db.subscribers.Data.containsKey(fields.tfAddress.getText()))) {