From b21dc2b98bf9a1a68a8bcabd1c88ff009f2d6608 Mon Sep 17 00:00:00 2001
From: esoe <igor_nikulin@mail.ru>
Date: Tue, 15 Nov 2022 20:53:00 +0300
Subject: [PATCH] qqserver

---
 .vscode/settings.json                         |   3 +++
 options-main.json                             |   3 ++-
 pom.xml                                       |   5 +++++
 .../molokoin/sourceListener/GitListener.java  |  19 ++++++++++++------
 .../molokoin/sourceListener/GitListener.class | Bin 7054 -> 7249 bytes
 5 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 .vscode/settings.json

diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..c5f3f6b
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+    "java.configuration.updateBuildConfiguration": "interactive"
+}
\ No newline at end of file
diff --git a/options-main.json b/options-main.json
index 3dcb972..96fb58b 100644
--- a/options-main.json
+++ b/options-main.json
@@ -4,5 +4,6 @@
     "gitLocalPath" : "/home/esoe/Documents/repos-listen/molokoin/repo",
     "downloadPath" : "/home/esoe/Documents/repos-listen/molokoin/downloads",
     "zipPath" : "/home/esoe/Documents/repos-listen/molokoin/downloads/molokoin-client-master.zip",
-    "unzipPath" : "/var/www/html"
+    "unzipPath" : "/home/esoe/Documents/repos-listen/molokoin/unzip/",
+    "destinationPath" : "/home/esoe/Documents/repos-listen/molokoin/var/www/html"
 }
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index af9dec9..bbc9bd4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,6 +34,11 @@
             <artifactId>org.eclipse.jgit</artifactId>
             <version>6.3.0.202209071007-r</version>
         </dependency>
+        <dependency>
+            <groupId>commons-io</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>2.11.0</version>
+        </dependency>
     </dependencies>
     
 </project>
\ No newline at end of file
diff --git a/src/main/java/ru/molokoin/sourceListener/GitListener.java b/src/main/java/ru/molokoin/sourceListener/GitListener.java
index d27e9d9..12be418 100644
--- a/src/main/java/ru/molokoin/sourceListener/GitListener.java
+++ b/src/main/java/ru/molokoin/sourceListener/GitListener.java
@@ -20,6 +20,7 @@ import org.eclipse.jgit.api.errors.GitAPIException;
 import org.eclipse.jgit.api.errors.InvalidRemoteException;
 import org.eclipse.jgit.api.errors.NoHeadException;
 import org.eclipse.jgit.api.errors.TransportException;
+import org.eclipse.jgit.util.FileUtils;
 
 import com.fasterxml.jackson.core.exc.StreamReadException;
 import com.fasterxml.jackson.databind.DatabindException;
@@ -31,7 +32,7 @@ import ru.molokoin.sourceListener.opt.Options;
 
 public class GitListener {
     public Options opt;
-    public String optionsPath = "options-home.json";
+    public String optionsPath = "options-main.json";
 
     public GitListener(){
         try {
@@ -76,11 +77,11 @@ public class GitListener {
                     extract();
                     move();
                 } catch (IOException e) {
-                    System.out.println(e.getMessage());
+                    System.out.println("Ошибка move(): " + e.getMessage());
                 }
             }
             try {
-                Thread.sleep(2000);
+                Thread.sleep(10000);
             } catch (InterruptedException e) {
                 System.out.println("Проспал!!! Ошибка!!!");
                 e.printStackTrace();
@@ -137,10 +138,16 @@ public class GitListener {
      * 
      */
     public void move() throws IOException {
-        Path source = Path.of("C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\unzip\\molokoin\\molokoin-client");
-        Path target = Path.of("C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\war\\www\\html");
+        Path source = Path.of("/home/esoe/Documents/repos-listen/molokoin/unzip/molokoin-client");
+        Path target = Path.of(opt.getDestinationPath());
+        //освобождение target
+        System.out.println("освобождение target ...");
+        FileUtils.delete(target.toFile());
+        //перемещение контента
         System.out.println("Перемещение контента ... ");
-        Files.move(source, target, StandardCopyOption.REPLACE_EXISTING);
+        Files.move(source, target, StandardCopyOption.ATOMIC_MOVE);
+        System.out.println("Перемещение контента завершено. ");
+        
     }
     
     public static void main(String[] args) throws InvalidRemoteException, TransportException, GitAPIException, IOException {
diff --git a/target/classes/ru/molokoin/sourceListener/GitListener.class b/target/classes/ru/molokoin/sourceListener/GitListener.class
index a493e9dd3f272de180440f1f50765fa26d55a7b3..b673c51596dded8983edb2c606dd85a9d6c5d07b 100644
GIT binary patch
delta 2796
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

delta 2600
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
Xd3t$e$t_nE3bv(GAZlmNY1Hv=K1gr7