From c1c56621c22e9b9ed39f30e31a547aa13ac63ca3 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Tue, 14 Nov 2023 20:08:19 +0300
Subject: [PATCH] =?UTF-8?q?=D1=81=D0=BC=D0=B5=D0=BD=D0=B0=20=D0=B8=D0=BC?=
 =?UTF-8?q?=D0=B5=D0=BD=20=D0=B1=D0=B4=20=D1=82=D0=B5=D1=81=D1=82=D0=BE?=
 =?UTF-8?q?=D0=B2=20=D0=BD=D0=B0=20=D0=B0=D0=BA=D1=82=D1=83=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D1=8B=D0=B5.=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D1=81=D1=82=D0=B0=D1=80=D1=8B=D1=85=20?=
 =?UTF-8?q?=D0=BF=D1=80=D0=B8=20=D0=B7=D0=B0=D0=BF=D1=83=D1=81=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 11 +++++++-
 src/Common/Constants.java                     | 13 ++++++++-
 src/Common/Global.java                        | 27 ++++++++++++-------
 src/Repository/Component/Component.java       |  2 +-
 src/TestingSystem/TasksDatabase.java          |  6 ++---
 src/TestingSystem/TestingPlanner.java         |  2 +-
 src/TestingSystem/TestingServer.java          |  2 +-
 src/TestingSystem/TestsDatabase.java          |  3 ++-
 .../Passes/RepositoryPass.java                |  3 ++-
 9 files changed, 49 insertions(+), 20 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1b075c79..288af3a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,16 @@
     </artifacts-to-build>
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="" />
+    <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
+      <change beforePath="$PROJECT_DIR$/src/Common/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Constants.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Common/Global.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/Global.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Component.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Component.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TasksDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestingServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/TestsDatabase.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/RepositoryPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/RepositoryPass.java" afterDir="false" />
+    </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
     <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
diff --git a/src/Common/Constants.java b/src/Common/Constants.java
index 874a0893..1a72e8fe 100644
--- a/src/Common/Constants.java
+++ b/src/Common/Constants.java
@@ -58,7 +58,18 @@ public class Constants {
     public static final String attachments = "attachments";
     public static final String statistic = "statistic";
     public static final String unknown_metric = " — ";
-
+    public static final String old_tests_db_name = "tests2023";
+    public static final String tests_db_name = "tests2024";
+    public static final String dateNaN = "NaN";
+    //пробный коммит. изменение комментария.++
+    //кронтаб и перезагрузка
+    //https://snipp.ru/raznoe/crontab
+    // /var/spool/cron/crontabs/testuser что менять
+    //https://saribzhanov.ru/tehno/perezagruzka-ubuntu-po-cron/ //раз в сутки
+    //testuser ALL=NOPASSWD:/sbin/reboot
+    //0          2          2,15       *          *  reboot &>/var/log/reboot.log
+    //https://unix.stackexchange.com/questions/117148/how-can-i-run-reboot-as-a-normal-user-without-needing-to-enter-a-password
+    public static final String ServerAddress = "alex-freenas.ddns.net";
     //--
     //https://losst.ru/komandy-terminala-linux
     public static String[] linux_system_commands = new String[]{
diff --git a/src/Common/Global.java b/src/Common/Global.java
index de63df3d..09927ac1 100644
--- a/src/Common/Global.java
+++ b/src/Common/Global.java
@@ -25,16 +25,6 @@ import java.io.File;
 import java.nio.file.Paths;
 import java.util.Vector;
 public class Global {
-    //пробный коммит. изменение комментария.++
-    //кронтаб и перезагрузка
-    //https://snipp.ru/raznoe/crontab
-    // /var/spool/cron/crontabs/testuser что менять
-    //https://saribzhanov.ru/tehno/perezagruzka-ubuntu-po-cron/ //раз в сутки
-    //testuser ALL=NOPASSWD:/sbin/reboot
-    //0          2          2,15       *          *  reboot &>/var/log/reboot.log
-    //https://unix.stackexchange.com/questions/117148/how-can-i-run-reboot-as-a-normal-user-without-needing-to-enter-a-password
-    public static final String ServerAddress = "alex-freenas.ddns.net";
-    public static final String dateNaN = "NaN";
     //--------------------------------------------------
     //текущая папка системы. в отличие от шарпа никогда не должна меняться.
     public static final String components = "Components";
@@ -248,8 +238,25 @@ public class Global {
         return String.join("|", res_);
     }
     //--
+    public static void removeOldDatabases() {
+        File data = Paths.get(System.getProperty("user.dir"), "Data").toFile();
+        File[] files = data.listFiles();
+        if (files != null) {
+            for (File file : files) {
+                if (file.getName().contains(Constants.old_tests_db_name)) {
+                    System.out.println("found "+Utils.Brackets(file.getAbsolutePath()));
+                    try {
+                        Utils.forceDeleteWithCheck(file);
+                    } catch (Exception ex) {
+                        ex.printStackTrace();
+                    }
+                }
+            }
+        }
+    }
     public static void NormalMode(int port) throws Exception {
         isWindows = System.getProperty("os.name").startsWith("Windows");
+        removeOldDatabases();
         CheckVisualiserDirectories();
         CreateLog();
         //-
diff --git a/src/Repository/Component/Component.java b/src/Repository/Component/Component.java
index dff31b4f..8371f69a 100644
--- a/src/Repository/Component/Component.java
+++ b/src/Repository/Component/Component.java
@@ -13,7 +13,7 @@ import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.nio.file.StandardCopyOption;
 public abstract class Component extends DBObject implements Loggable {
-    public String date_text = Global.dateNaN;
+    public String date_text = Constants.dateNaN;
     public long version = Constants.Nan;
     public long actual_version = Constants.Nan;
     public long minimal_version = Constants.Nan;
diff --git a/src/TestingSystem/TasksDatabase.java b/src/TestingSystem/TasksDatabase.java
index 49098a0a..def56ff7 100644
--- a/src/TestingSystem/TasksDatabase.java
+++ b/src/TestingSystem/TasksDatabase.java
@@ -1,4 +1,5 @@
 package TestingSystem;
+import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import Common.Global;
 import GlobalData.Settings.SettingName;
@@ -23,7 +24,6 @@ import java.sql.PreparedStatement;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 public class TasksDatabase extends SQLiteDatabase {
-    public static final String tests_db_name = "tests2023";
     public TSettingsDBTable settings;
     public TasksPackageDBTable packages;
     public TasksPackageToKillDBTable packagesToKill;
@@ -35,13 +35,13 @@ public class TasksDatabase extends SQLiteDatabase {
     public SapforTasksDBTable sapforTasks;
     //---------
     public TasksDatabase(String email) {
-        super(Paths.get(Global.DataDirectory.getAbsolutePath(), email + "_" + tests_db_name + ".sqlite").toFile());
+        super(Paths.get(Global.DataDirectory.getAbsolutePath(), email + "_" + Constants.tests_db_name + ".sqlite").toFile());
     }
     public TasksDatabase(File file_in) {
         super(file_in);
     }
     public void setFile(String email) {
-        file = Paths.get(Global.DataDirectory.getAbsolutePath(), email + "_" + tests_db_name + ".sqlite").toFile();
+        file = Paths.get(Global.DataDirectory.getAbsolutePath(), email + "_" + Constants.tests_db_name + ".sqlite").toFile();
     }
     @Override
     protected void initAllTables() throws Exception {
diff --git a/src/TestingSystem/TestingPlanner.java b/src/TestingSystem/TestingPlanner.java
index ea73c55d..aff002d2 100644
--- a/src/TestingSystem/TestingPlanner.java
+++ b/src/TestingSystem/TestingPlanner.java
@@ -25,7 +25,7 @@ import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Vector;
 
-import static TestingSystem.TasksDatabase.tests_db_name;
+import static Common.Constants.tests_db_name;
 public class TestingPlanner {
     public String email;
     TasksPackage tasksPackage;
diff --git a/src/TestingSystem/TestingServer.java b/src/TestingSystem/TestingServer.java
index 4ad61a91..285e005a 100644
--- a/src/TestingSystem/TestingServer.java
+++ b/src/TestingSystem/TestingServer.java
@@ -46,7 +46,7 @@ import java.util.LinkedHashMap;
 import java.util.Vector;
 import java.util.stream.Collectors;
 
-import static TestingSystem.TasksDatabase.tests_db_name;
+import static Common.Constants.tests_db_name;
 public class TestingServer extends RepositoryServer<TestsDatabase> {
     LinkedHashMap<String, TasksDatabase> accountsBases = new LinkedHashMap<>();
     //--------------------------------->>>
diff --git a/src/TestingSystem/TestsDatabase.java b/src/TestingSystem/TestsDatabase.java
index c3f61e61..90f60d2b 100644
--- a/src/TestingSystem/TestsDatabase.java
+++ b/src/TestingSystem/TestsDatabase.java
@@ -1,4 +1,5 @@
 package TestingSystem;
+import Common.Constants;
 import Common.Database.SQLITE.SQLiteDatabase;
 import GlobalData.Settings.SettingName;
 import SapforTestingSystem.SapforConfiguration.SapforConfigurationDBTable;
@@ -22,7 +23,7 @@ public class TestsDatabase extends SQLiteDatabase {
     //----
     public ServerSapforsDBTable serverSapfors;
     public TestsDatabase() {
-        super(Paths.get(System.getProperty("user.dir"), "Data", TasksDatabase.tests_db_name + ".sqlite").toFile());
+        super(Paths.get(System.getProperty("user.dir"), "Data", Constants.tests_db_name + ".sqlite").toFile());
     }
     @Override
     protected void initAllTables() throws Exception {
diff --git a/src/Visual_DVM_2021/Passes/RepositoryPass.java b/src/Visual_DVM_2021/Passes/RepositoryPass.java
index 66a67bbb..e80d41e5 100644
--- a/src/Visual_DVM_2021/Passes/RepositoryPass.java
+++ b/src/Visual_DVM_2021/Passes/RepositoryPass.java
@@ -1,4 +1,5 @@
 package Visual_DVM_2021.Passes;
+import Common.Constants;
 import Common.Global;
 import Common.Utils.Utils;
 import Repository.RepositoryRefuseException;
@@ -33,7 +34,7 @@ public abstract class RepositoryPass<S extends RepositoryServer, T> extends Pass
     }
     //-
     protected void connect() throws Exception {
-        clientSocket = Utils.createClientSocket(InetAddress.getByName(Global.ServerAddress),
+        clientSocket = Utils.createClientSocket(InetAddress.getByName(Constants.ServerAddress),
                 server.getPort(),
                 getTimeout()
         );