From 11fae0bc4ee8f46b28f69bb0627c8855c2ad8c48 Mon Sep 17 00:00:00 2001
From: 02090095 <vmk-post@yandex.ru>
Date: Mon, 4 Dec 2023 18:42:20 +0300
Subject: [PATCH] =?UTF-8?q?=D0=BC=D0=B5=D1=82=D0=BE=D0=B4=D1=8B=20=D0=BA?=
 =?UTF-8?q?=D0=BE=D0=BF=D0=B8=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  8 ++++-
 .../DVM/TestsSupervisor_2022.java             |  7 ++++-
 src/TestingSystem/DVM/UserConnection.java     |  4 ---
 src/files/Planner/CompilationTask.h           |  3 +-
 src/files/Planner/Utils.h                     | 31 ++++++++++++++-----
 5 files changed, 37 insertions(+), 16 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b844b61d..8c13a709 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -6,7 +6,13 @@
     </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$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/TestsSupervisor_2022.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/TestingSystem/DVM/UserConnection.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/CompilationTask.h" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/files/Planner/Utils.h" beforeDir="false" afterPath="$PROJECT_DIR$/src/files/Planner/Utils.h" 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/TestingSystem/DVM/TestsSupervisor_2022.java b/src/TestingSystem/DVM/TestsSupervisor_2022.java
index 0bc07291..81a1cee6 100644
--- a/src/TestingSystem/DVM/TestsSupervisor_2022.java
+++ b/src/TestingSystem/DVM/TestsSupervisor_2022.java
@@ -164,9 +164,14 @@ public class TestsSupervisor_2022 {
     }
     public void DownloadResults() throws Exception {
         Utils.CheckDirectory(packageLocalWorkspace);
+        RemoteFile remote_results = new RemoteFile(packageRemoteWorkspace, "results");
+        RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace, "results.zip");
+        connection.ShellCommand(
+
+                "zip -r "+Utils.DQuotes(remote_results_archive.full_name)+" "+Utils.DQuotes(remote_results.full_name));
         /*
         RemoteFile remote_results_archive = new RemoteFile(packageRemoteWorkspace.full_name, "results.zip");
-        File results_archive = new File(packageLocalWorkspace, "results.zip");
+
         if (connection.Exists()) {
             connection.getSingleFile(remote_results_archive, results_archive);
             UnzipFolderPass unzipFolderPass = new UnzipFolderPass();
diff --git a/src/TestingSystem/DVM/UserConnection.java b/src/TestingSystem/DVM/UserConnection.java
index af99fa0d..54f614fd 100644
--- a/src/TestingSystem/DVM/UserConnection.java
+++ b/src/TestingSystem/DVM/UserConnection.java
@@ -109,14 +109,10 @@ public class UserConnection {
     //следует перенаправлять вывод в какой нибудь временный файл на сервере.
     public String ShellCommand(String command) throws Exception {
         StringBuilder result = new StringBuilder();
-        //       System.out.println("command=" + Utils.Brackets(command));
         pin.write((command + "\r\n").getBytes());
         ShellParser.ReadInvitation(fromServer); //первое приглашение после эхо. возможен мусор.
         result.append(ShellParser.getCommandResult(fromServer)); //возможный результат и второе приглашение.
-//        System.out.println("answer=" + Utils.Brackets(result));
-        //в реалиях визуалиазтора нас интересует только ПОСЛЕДНЯЯ СТРОКА ОТВЕТА.
         String[] data = result.toString().split("\n");
-        //  System.out.println("res="+Utils.Brackets(res));
         return (data.length > 0) ? data[data.length - 1] : result.toString();
     }
     public void getSingleFile(String src, String dst) throws Exception {
diff --git a/src/files/Planner/CompilationTask.h b/src/files/Planner/CompilationTask.h
index d96f60a1..588eb909 100644
--- a/src/files/Planner/CompilationTask.h
+++ b/src/files/Planner/CompilationTask.h
@@ -31,8 +31,7 @@ public:
 		File makeFileFile = File(makeFilePath, this->makefile_text);
 		String tests = userWorkspace + "/projects";
 		String testPath = tests + "/" + test_id;
-		String copyCommand = "cp -r " + String::DQuotes(testPath + "/.") + " " + String::DQuotes(workspace);
-		system(copyCommand.getCharArray());
+		Utils::CopyDirectory(testPath, workspace);
 	}
 	virtual String getLaunchScriptText() {
 		String modules = userWorkspace + "/modules";
diff --git a/src/files/Planner/Utils.h b/src/files/Planner/Utils.h
index c3658b9d..cb6fbb86 100644
--- a/src/files/Planner/Utils.h
+++ b/src/files/Planner/Utils.h
@@ -31,8 +31,13 @@ public:
 
 	//https://stackoverflow.com/questions/4568681/using-chmod-in-a-c-program
 	static void Chmod(const String& path) {
-		String command = "chmod 777 " + String::DQuotes(path);
-		system(command.getCharArray());
+	    #if __cplusplus >= 201703L
+        	std::filesystem::permissions(path.getCharArray(), std::filesystem::perms::all);
+        #else
+        	String command = "chmod 777 " + String::DQuotes(path);
+            int i=system(command.getCharArray());
+            printf("chmod 777 '%s' return code = %d\n", path.getCharArray(), i);
+      #endif
 	}
 
 	//https://stackoverflow.com/questions/230062/whats-the-best-way-to-check-if-a-file-exists-in-c
@@ -47,9 +52,23 @@ public:
 		std::this_thread::sleep_for(timespan);
 	}
 	static void Copy(const String& src, const String& dst) {
-		String command = "cp " + String::DQuotes(src) + " " + String::DQuotes(dst);
-		system(command.getCharArray());
+		#if __cplusplus >= 201703L
+	        std::filesystem::copy(src.getCharArray(), dst.getCharArray());
+	    #else
+		    String command = "cp " + String::DQuotes(src) + " " + String::DQuotes(dst);
+		    int i = system(command.getCharArray());
+		    printf("cp '%s' return code = %d\n",src.getCharArray(), i);
+		#endif
 	}
+	static void CopyDirectory(const String& src, const String& dst) {
+    	#if __cplusplus >= 201703L
+        	std::filesystem::copy((src+ "/.").getCharArray(), dst.getCharArray(), std::filesystem::copy_options::recursive);
+        #else
+        	String command = "cp -r " + String::DQuotes(src + "/.") + " " + String::DQuotes(dst);
+            int i = system(command.getCharArray());
+            printf("cp -r '%s' return code = %d\n",src.getCharArray(),i);
+        #endif
+    }
 	static time_t getAbsoluteTime() {
 		return time(NULL);
 	}
@@ -58,8 +77,4 @@ public:
 		String res(ctime(&ttime));
 		return res;
 	}
-	static void ZipFolder(const String& src, const String& dst) {
-		String command = "zip -r " + String::DQuotes(dst) + " " + String::DQuotes(src);
-		system(command.getCharArray());
-	}
 };