From b1740da1f1ba151c1f0db623c346962ce0162374 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 10 Mar 2025 01:48:41 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D0=BB=20=D0=B1=D0=B5=D0=BA=D0=B0=D0=BF=D1=8B.=20=D0=BD?=
 =?UTF-8?q?=D0=B0=20=D0=BF=D0=BE=D1=87=D1=82=D1=83=20=D1=88=D0=BB=D0=B5?=
 =?UTF-8?q?=D1=82=D1=81=D1=8F=20=D1=82=D0=BE=D0=BB=D1=8C=D0=BA=D0=BE=20?=
 =?UTF-8?q?=D0=B1=D0=B4,(=D0=B8=D0=BD=D0=B0=D1=87=D0=B5=20=D0=B2=D0=BB?=
 =?UTF-8?q?=D0=BE=D0=B6=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BD=D0=B5=20=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=B7=D0=B0=D1=8E=D1=82).=20=D1=82=D0=B5=D1=81?=
 =?UTF-8?q?=D1=82=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D1=81?=
 =?UTF-8?q?=D0=BE=D1=85=D1=80=D0=B0=D0=BD=D1=8F=D0=B5=D1=82=20=D1=82=D0=BE?=
 =?UTF-8?q?=D0=BB=D1=8C=D0=BA=D0=BE=20=D0=B1=D0=B4=20=D0=B8=20=D1=82=D0=B5?=
 =?UTF-8?q?=D1=81=D1=82=D1=8B.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                                 |  6 ++++--
 properties                                          |  2 +-
 .../Repository/Server/BackUpsChecker.java           |  2 +-
 .../Repository/Server/RepositoryServer.java         | 13 +++++++++----
 .../TestingSystem/Common/TestingServer.java         |  3 ---
 5 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1a9aa0ec..d9df7a53 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,8 +8,10 @@
   <component name="ChangeListManager">
     <list default="true" id="e42177c3-2328-4b27-8a01-35779b2beb99" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Constants.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Visual/Tables/RendererTestingPackageStatus.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/properties" beforeDir="false" afterPath="$PROJECT_DIR$/properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/BackUpsChecker.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/Repository/Server/RepositoryServer.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/_VisualDVM/TestingSystem/Common/TestingServer.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/properties b/properties
index 789eef95..ee5b0e03 100644
--- a/properties
+++ b/properties
@@ -26,7 +26,7 @@
   "Kernels": 8,
   "LocalMakePathWindows": "C:\\MinGW\\msys\\1.0\\bin\\make.exe",
   "CheckTestingIntervalSeconds": 10,
-  "AutoCheckTesting": true,
+  "AutoCheckTesting": false,
   "EmailOnTestingProgress": true,
   "CompleteCompilationOptions": false,
   "CompleteRunEnvironments": false,
diff --git a/src/_VisualDVM/Repository/Server/BackUpsChecker.java b/src/_VisualDVM/Repository/Server/BackUpsChecker.java
index 582bfadc..9237c6b4 100644
--- a/src/_VisualDVM/Repository/Server/BackUpsChecker.java
+++ b/src/_VisualDVM/Repository/Server/BackUpsChecker.java
@@ -18,7 +18,7 @@ public class BackUpsChecker extends RepositoryServerClient {
         Calendar rightNow = Calendar.getInstance();
         int hour = rightNow.get(Calendar.HOUR_OF_DAY);
         int minute = rightNow.get(Calendar.MINUTE);
-        if ((hour == 0) && (minute == 0)) {
+        if ((hour == 1) && (minute == 45)) {
             ServerCommand(ServerCode.CreateBackUp,false);
         }
     }
diff --git a/src/_VisualDVM/Repository/Server/RepositoryServer.java b/src/_VisualDVM/Repository/Server/RepositoryServer.java
index 35a7fd3e..a49ae7f5 100644
--- a/src/_VisualDVM/Repository/Server/RepositoryServer.java
+++ b/src/_VisualDVM/Repository/Server/RepositoryServer.java
@@ -323,6 +323,7 @@ public abstract class RepositoryServer<D extends Database> {
     }
     void CreateBackUp() throws Exception {
         //определить имя папки с багом.
+        System.out.println("create backup");
         boolean force = (boolean) request.object;
         //--
         Calendar rightNow = Calendar.getInstance();
@@ -331,9 +332,10 @@ public abstract class RepositoryServer<D extends Database> {
         int day = rightNow.get(Calendar.DAY_OF_MONTH);
         //--
         String backUpName = year + "_" + (month + 1) + "_" + (day);
+        System.out.println("name="+backUpName);
         File todayBackUp = new File(Global.DataBackUpsDirectory, backUpName);
         File todayBackUpArchive = new File(Global.DataBackUpsDirectory, backUpName + ".zip");
-        if (force && todayBackUpArchive.exists())
+        if (force || todayBackUpArchive.exists())
             Utils_.forceDeleteWithCheck(todayBackUpArchive);
         //-
         // Чистка старых бекапов на самом сервере.
@@ -353,11 +355,14 @@ public abstract class RepositoryServer<D extends Database> {
             //     backupSession.Do(cred.getKey(), cred.getValue(), todayBackUpArchive);
             // }
             //bonus backup
-            if (rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
-                EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия файлов");
-                message.addAttachement(todayBackUpArchive);
+            if (!force&&rightNow.get(Calendar.DAY_OF_WEEK) == Calendar.MONDAY) {
+                System.out.println("MONDAY");
+                //на почту шлем только базу.
+                EmailMessage message = new EmailMessage(getClass().getSimpleName() + " BackUp","Резервная копия базы данных");
+                message.addAttachement(db.getFile());
                 for (String address : Constants.admins_mails)
                     EmailMessagesQueue.add(new Pair<>(address,message));
+                //--
             }
         }
     }
diff --git a/src/_VisualDVM/TestingSystem/Common/TestingServer.java b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
index fee100e1..e66f77c9 100644
--- a/src/_VisualDVM/TestingSystem/Common/TestingServer.java
+++ b/src/_VisualDVM/TestingSystem/Common/TestingServer.java
@@ -81,9 +81,6 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
     @Override
     protected void extraBackup(File todayBackUp) {
         zip.Do("Tests", new File(todayBackUp, "Tests.zip").getAbsolutePath());
-        zip.Do("Sapfors", new File(todayBackUp, "Sapfors.zip").getAbsolutePath());
-        zip.Do("DVMPackages", new File(todayBackUp, "DVMPackages.zip").getAbsolutePath());
-        zip.Do("SapforPackages", new File(todayBackUp, "SapforPackages.zip").getAbsolutePath());
     }
     public static void TimerOn() {
         checkTimer = new Timer(Global.normalProperties.CheckTestingIntervalSeconds * 1000, e -> {