From 630d6b3985202d021d19d67c63fd47c76e58393a Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Thu, 16 May 2024 01:26:03 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BF=D1=80=D0=BE=D0=BC=D0=B5=D0=B6=D1=83?=
 =?UTF-8?q?=D1=82=D0=BE=D1=87=D0=BD=D1=8B=D0=B9.=20=D0=BF=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20=D0=B2=D0=B5=D1=80=D1=81=D0=B8?=
 =?UTF-8?q?=D0=B8=20=D1=81=D0=B0=D0=BF=D1=84=D0=BE=D1=80=D0=B0=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=B8=20=D0=B0=D1=81=D0=B8=D0=BD=D1=85=D1=80=D0=BE=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=BE=D0=B9=20=D1=81=D0=B1=D0=BE=D1=80=D0=BA=D0=B5,=20?=
 =?UTF-8?q?=D0=B8=D0=B7=20=D1=80=D0=B5=D0=BF=D0=BE=D0=B7=D0=B8=D1=82=D0=BE?=
 =?UTF-8?q?=D1=80=D0=B8=D1=8F.=20=D0=97=D0=B0=D0=B2=D1=82=D1=80=D0=B0=20?=
 =?UTF-8?q?=D0=B4=D0=BE=D0=B4=D0=B5=D0=BB=D0=B0=D1=8E=20=D0=B8=20=D0=B7?=
 =?UTF-8?q?=D0=B0=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=87=D1=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  4 +-
 src/Repository/Component/Sapfor/Sapfor.java   | 26 ++++++++++
 src/TestingSystem/Common/TestingServer.java   | 49 +++++++++++++++++--
 .../SAPFOR/SapforTestingPlanner.java          | 25 +---------
 src/Visual_DVM_2021/Passes/All/TestPass.java  | 27 +++++-----
 5 files changed, 88 insertions(+), 43 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 86a57d51..36b0fe42 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -8,10 +8,12 @@
   <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/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Common/UI/Menus_2023/MainMenuBar/MainMenuBar.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Component/Sapfor/Sapfor.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Repository/Server/ServerCode.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestingServer.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/Common/TestsDatabase.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/SAPFOR/SapforTestingPlanner.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/Visual_DVM_2021/Passes/All/TestPass.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/Repository/Component/Sapfor/Sapfor.java b/src/Repository/Component/Sapfor/Sapfor.java
index 4a1f179a..9768d822 100644
--- a/src/Repository/Component/Sapfor/Sapfor.java
+++ b/src/Repository/Component/Sapfor/Sapfor.java
@@ -19,6 +19,7 @@ import java.io.File;
 import java.nio.charset.Charset;
 import java.util.Collections;
 import java.util.LinkedHashMap;
+import java.util.List;
 import java.util.Vector;
 public abstract class Sapfor extends OSDComponent {
     public static final int empty_code = -100;
@@ -555,4 +556,29 @@ public abstract class Sapfor extends OSDComponent {
         }
         return false;
     }
+    public static int readVersionFromCode(File versionFile) {
+        int res = Constants.Nan;
+        if (versionFile.exists()) {
+            try {
+                List<String> data = FileUtils.readLines(versionFile);
+                for (String s : data) {
+                    if (s.startsWith("#define VERSION_SPF ")) {
+                        String[] version_data = s.split("\"");
+                        if (version_data.length > 0) {
+                            String version_s = version_data[1];
+                            //-
+                            try {
+                                res = Integer.parseInt(version_s);
+                            } catch (Exception ex) {
+                                ex.printStackTrace();
+                            }
+                        }
+                    }
+                }
+            } catch (Exception ex) {
+                ex.printStackTrace();
+            }
+        }
+        return res;
+    }
 }
diff --git a/src/TestingSystem/Common/TestingServer.java b/src/TestingSystem/Common/TestingServer.java
index 8d6e3538..a018ece2 100644
--- a/src/TestingSystem/Common/TestingServer.java
+++ b/src/TestingSystem/Common/TestingServer.java
@@ -5,6 +5,7 @@ import Common.Global;
 import Common.Utils.Utils;
 import GlobalData.Account.Account;
 import ProjectData.LanguageName;
+import Repository.Component.Sapfor.Sapfor;
 import Repository.EmailMessage;
 import Repository.RepositoryRefuseException;
 import Repository.RepositoryServer;
@@ -107,6 +108,28 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         }
     }
     //-->>>
+    @Override
+    protected void beforePublishAction(DBObject object) throws Exception {
+        if (object instanceof ServerSapfor){
+            File versionFile = new File(Global.TempDirectory,"version.h");
+            if (versionFile.exists())
+                FileUtils.forceDelete(versionFile);
+            //1. Получить версию из репозитория.
+            Utils.startScript(Global.TempDirectory,
+                    Global.TempDirectory,
+                    "get_version",
+                    "wget --user dvmhuser --password dvmh2013  -P " +
+                            Utils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                            "  http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
+            ).waitFor();
+            if (!versionFile.exists())
+                throw new RepositoryRefuseException("Не удалось загрузить текущую версию SAPFOR из репозитория!");
+            int current_version = Sapfor.readVersionFromCode(versionFile);
+            int max_installed_version = db.getInstalledSapforMaxVersion();
+            if (max_installed_version==current_version)
+                throw new RepositoryRefuseException("Актуальная версия SAPFOR "+max_installed_version+" уже установлена");
+        }
+    }
     public TestingServer() {
         super(TestsDatabase.class);
         name = Utils.getDateName("testingServer");
@@ -333,11 +356,11 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
         response.object = db.getFirstActiveSapforPackagesCopies();
     }
     //---
-    void GetSapforForCompilation() throws Exception{
+    void GetSapforForCompilation() throws Exception {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = db.getSapforCopyForCompilation();
     }
-    void GetSapforMaxVersion() throws Exception{
+    void GetSapforMaxVersion() throws Exception {
         response = new ServerExchangeUnit_2021(ServerCode.OK);
         response.object = db.getInstalledSapforMaxVersion();
     }
@@ -539,7 +562,7 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             response.object = serverSapfor;
             serverSapfor.version = String.valueOf(current_version);
             //---
-          //  EmailSapforAssembly(current_version, true);
+            //  EmailSapforAssembly(current_version, true);
             //---
         } else {
             //---
@@ -662,5 +685,25 @@ public class TestingServer extends RepositoryServer<TestsDatabase> {
             ex.printStackTrace();
         }
     }
+    void GetSapforActualVersion() throws Exception {
+        response = new ServerExchangeUnit_2021(ServerCode.OK);
+        File versionFile = new File(Global.TempDirectory,"version.h");
+        if (versionFile.exists())
+            FileUtils.forceDelete(versionFile);
+        //1. Получить версию из репозитория.
+        Utils.startScript(Global.TempDirectory,
+                Global.TempDirectory,
+                "get_version",
+                "wget --user dvmhuser --password dvmh2013  -P " +
+                        Utils.DQuotes(Global.TempDirectory.getAbsolutePath()) +
+                        "  http://svn.dvm-system.org/svn/dvmhrepo/sapfor/experts/Sapfor_2017/_src/Utils/version.h"
+        ).waitFor();
+        if (!versionFile.exists())
+            throw new RepositoryRefuseException("Не удалось загрузить текущую версию SAPFOR из репозитория!");
+        int current_version = Sapfor.readVersionFromCode(versionFile);
+        int max_installed_version = db.getInstalledSapforMaxVersion();
+        if (max_installed_version==current_version)
+            throw new RepositoryRefuseException("Версия "+max_installed_version+" уже установлена");
+    }
 }
 
diff --git a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
index 2494b46a..ef00eeaf 100644
--- a/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
+++ b/src/TestingSystem/SAPFOR/SapforTestingPlanner.java
@@ -5,6 +5,7 @@ import Common.Global;
 import Common.GlobalProperties;
 import Common.Utils.Utils;
 import ProjectData.LanguageName;
+import Repository.Component.Sapfor.Sapfor;
 import Repository.RepositoryRefuseException;
 import Repository.Server.ServerCode;
 import TestingSystem.Common.TasksPackageState;
@@ -213,28 +214,6 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
                         Constants.err_file +
                         "\n").waitFor();
     }
-    int getSapforRepositoryVersion() throws Exception {
-        int res = Constants.Nan;
-        File versionFile = Paths.get(repo.getAbsolutePath(), "/sapfor/experts/Sapfor_2017/_src/Utils/version.h").toFile();
-        if (versionFile.exists()) {
-            List<String> data = FileUtils.readLines(versionFile);
-            for (String s : data) {
-                if (s.startsWith("#define VERSION_SPF ")) {
-                    String[] version_data = s.split("\"");
-                    if (version_data.length > 0) {
-                        String version_s = version_data[1];
-                        //-
-                        try {
-                            res = Integer.parseInt(version_s);
-                        } catch (Exception ex) {
-                            ex.printStackTrace();
-                        }
-                    }
-                }
-            }
-        }
-        return res;
-    }
     //--------------------
     public void checkServerSapforsForCompilation() throws Exception {
         sapfor = null;
@@ -246,7 +225,7 @@ public class SapforTestingPlanner extends TestingPlanner<SapforPackage> {
             //--
             SyncronizeRepository();
             max_version = (int) ServerCommand(ServerCode.GetMaxSapforVersion);
-            current_version = getSapforRepositoryVersion();
+            current_version = Sapfor.readVersionFromCode(Paths.get(repo.getAbsolutePath(), "/sapfor/experts/Sapfor_2017/_src/Utils/version.h").toFile());
             if (current_version==max_version){
                 System.out.println("Версия SAPFOR " + max_version + " уже собрана!");
                 ServerCommand(ServerCode.DeleteObjectByPK, new Pair(ServerSapfor.class,sapfor.id));
diff --git a/src/Visual_DVM_2021/Passes/All/TestPass.java b/src/Visual_DVM_2021/Passes/All/TestPass.java
index e548b9fa..07aa6b4f 100644
--- a/src/Visual_DVM_2021/Passes/All/TestPass.java
+++ b/src/Visual_DVM_2021/Passes/All/TestPass.java
@@ -1,16 +1,13 @@
 package Visual_DVM_2021.Passes.All;
-import Common.Current;
-import Common.Global;
-import Common.GlobalProperties;
-import Common.Utils.Utils;
-import TestingSystem.Common.TasksPackageState;
-import Visual_DVM_2021.Passes.Pass_2021;
-import org.apache.commons.io.FileUtils;
-
-import java.io.File;
-import java.net.InetAddress;
-import java.util.Vector;
-public class TestPass extends Pass_2021 {
+import Repository.Server.ServerCode;
+import Repository.Server.ServerExchangeUnit_2021;
+import Visual_DVM_2021.Passes.Server.TestingSystemPass;
+public class TestPass extends TestingSystemPass {
+    @Override
+    protected void ServerAction() throws Exception {
+       // Command(new ServerExchangeUnit_2021(ServerCode.GetSapforActualVersion));
+    }
+    /*
     @Override
     protected void body() throws Exception {
         /*
@@ -36,13 +33,11 @@ public class TestPass extends Pass_2021 {
         Utils.createScript(workspace, workspace,
                 "start",
                 "java -jar VisualSapfor.jar "+ String.join(" ", args));
-         */
+
         byte[] localIp = InetAddress.getLocalHost().getAddress();
         InetAddress address = InetAddress.getByName("alex-freenas.ddns.net");
         System.out.println(address);
-
-
         //java определить по адресу сервера совпадает ли он с локальным
-
     }
+    */
 }