From a97c30af7f69882180177ac543e1a0424b42d3db Mon Sep 17 00:00:00 2001 From: esoe Date: Sat, 12 Nov 2022 23:52:50 +0300 Subject: [PATCH] qqq --- options-home.json | 3 ++- out/repos | 2 +- .../www/html}/css/style.css | 0 .../www/html}/index.html | 0 .../www/html}/js/main.js | 0 out/zip/molokoin-client-master.zip | Bin 2141 -> 2141 bytes .../molokoin/sourceListener/GitListener.java | 18 +++++++++++++++++- .../molokoin/sourceListener/opt/Options.java | 8 ++++++++ .../molokoin/sourceListener/GitListener.class | Bin 6236 -> 7054 bytes .../molokoin/sourceListener/opt/Options.class | Bin 2224 -> 2509 bytes 10 files changed, 28 insertions(+), 3 deletions(-) rename out/{unzip/molokoin/molokoin-client => war/www/html}/css/style.css (100%) rename out/{unzip/molokoin/molokoin-client => war/www/html}/index.html (100%) rename out/{unzip/molokoin/molokoin-client => war/www/html}/js/main.js (100%) diff --git a/options-home.json b/options-home.json index d9c0b23..8a0d98f 100644 --- a/options-home.json +++ b/options-home.json @@ -4,5 +4,6 @@ "gitLocalPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\repos", "downloadPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\zip", "zipPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\zip\\molokoin-client-master.zip", - "unzipPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\unzip\\molokoin" + "unzipPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\unzip\\molokoin", + "destinationPath" : "C:\\Users\\Strannik\\Documents\\esoe\\code\\sourceListener\\out\\var\\www\\html" } \ No newline at end of file diff --git a/out/repos b/out/repos index e2da4b5..ab1d9fe 160000 --- a/out/repos +++ b/out/repos @@ -1 +1 @@ -Subproject commit e2da4b5e0f84dbd6604466f57a4821875a25b2f5 +Subproject commit ab1d9fe840340945098569399bb6ec50d5daccc0 diff --git a/out/unzip/molokoin/molokoin-client/css/style.css b/out/war/www/html/css/style.css similarity index 100% rename from out/unzip/molokoin/molokoin-client/css/style.css rename to out/war/www/html/css/style.css diff --git a/out/unzip/molokoin/molokoin-client/index.html b/out/war/www/html/index.html similarity index 100% rename from out/unzip/molokoin/molokoin-client/index.html rename to out/war/www/html/index.html diff --git a/out/unzip/molokoin/molokoin-client/js/main.js b/out/war/www/html/js/main.js similarity index 100% rename from out/unzip/molokoin/molokoin-client/js/main.js rename to out/war/www/html/js/main.js diff --git a/out/zip/molokoin-client-master.zip b/out/zip/molokoin-client-master.zip index 0016d9028cb6ebc3a7de7a3f7e02e2e8716c1eff..adefef5713fa1bef8f189ac265f7e89f23a54d68 100644 GIT binary patch delta 310 zcmcaBa94mQz?+$civa{07Ek0+7g%^bKN&^LSsO)+1Ej9bglXaRja#yqnHm;PR$ws% z@-_#vgfW7+t68;BG=L1A{FD`>X0imEJV=Qpo2d}Q9!4ex2AJ)W8`vz-gh7@~KF#KY zO<11Y9!(f*QvtgLHsM|D_D&EhS=m6IWdp)Xj0_CgK%NFeVv=EsWm>9*iGi_+fu)J5 gfu)71nWeF%Wm1w^YO<+8ifKw>a&of4WNQv30M8;&8~^|S delta 310 zcmcaBa94mQz?+$civa|rXHVo&7r1sJKN&^LSsO)+1Ej9bgz4Ieja#yqnWSe=R$ws% z@-_#vgfW7+t68;BG=L1A{FD`>X0imEJV=Qpo2d}Q9!4ex2AJ)W8`vz-gh7@~KF#KY zO<11Y9!(f*QvtgLHsM|D_D&EhS=m6IWdp)Xj0_CgK%NFes!>X!Ns?)*L7Ih0N>YlM gnSqIknOT~td7_Dhk)egTX`+#7l2MxJWNQv308n^LlmGw# diff --git a/src/main/java/ru/molokoin/sourceListener/GitListener.java b/src/main/java/ru/molokoin/sourceListener/GitListener.java index cfba7cc..d27e9d9 100644 --- a/src/main/java/ru/molokoin/sourceListener/GitListener.java +++ b/src/main/java/ru/molokoin/sourceListener/GitListener.java @@ -4,6 +4,10 @@ import java.io.BufferedInputStream; import java.io.File; import java.io.FileOutputStream; import java.io.IOException; +import java.nio.file.CopyOption; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import java.util.Enumeration; import java.util.concurrent.DelayQueue; import java.util.zip.ZipEntry; @@ -27,7 +31,7 @@ import ru.molokoin.sourceListener.opt.Options; public class GitListener { public Options opt; - public String optionsPath = "options-main.json"; + public String optionsPath = "options-home.json"; public GitListener(){ try { @@ -70,6 +74,7 @@ public class GitListener { try { NetService.download(opt.getZipLink(), opt.getDownloadPath()); extract(); + move(); } catch (IOException e) { System.out.println(e.getMessage()); } @@ -127,6 +132,16 @@ public class GitListener { System.out.println("Распаковка архива завершена."); } } + + /** + * + */ + 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"); + System.out.println("Перемещение контента ... "); + Files.move(source, target, StandardCopyOption.REPLACE_EXISTING); + } public static void main(String[] args) throws InvalidRemoteException, TransportException, GitAPIException, IOException { //создаем объект класса, читаем файл с опциями @@ -145,5 +160,6 @@ public class GitListener { git = GitServiceFace.copy(ear.getOpt().getGitLink(), ear.getOpt().getGitLocalPath()); } ear.live(git); + } } diff --git a/src/main/java/ru/molokoin/sourceListener/opt/Options.java b/src/main/java/ru/molokoin/sourceListener/opt/Options.java index 2dc40d4..cf48226 100644 --- a/src/main/java/ru/molokoin/sourceListener/opt/Options.java +++ b/src/main/java/ru/molokoin/sourceListener/opt/Options.java @@ -7,6 +7,7 @@ public class Options { private String downloadPath; private String zipPath; private String unzipPath; + private String destinationPath; public Options(){} public void setZipLink(String zipLink) { @@ -45,6 +46,12 @@ public class Options { public String getZipPath() { return zipPath; } + public void setDestinationPath(String destinationPath) { + this.destinationPath = destinationPath; + } + public String getDestinationPath() { + return destinationPath; + } @Override public String toString() { String s = "zipLink : " + getZipLink() + "\n"; @@ -53,6 +60,7 @@ public class Options { s = s + "downloadPath : " + getDownloadPath() + "\n"; s = s + "zipPath : " + getZipPath() + "\n"; s = s + "unzipPath : " + getUnzipPath() + "\n"; + s = s + "destinationPath : " + getDestinationPath() + "\n"; return s; } } diff --git a/target/classes/ru/molokoin/sourceListener/GitListener.class b/target/classes/ru/molokoin/sourceListener/GitListener.class index 1afaef123cb600dfdee239f2efb2f0ac8df76a6d..a493e9dd3f272de180440f1f50765fa26d55a7b3 100644 GIT binary patch delta 2952 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 diff --git a/target/classes/ru/molokoin/sourceListener/opt/Options.class b/target/classes/ru/molokoin/sourceListener/opt/Options.class index 714824485ce63de75ffdf36af90d43efb1a2684a..5b292d6a3bffbaed5dea6dc74b450ac106a0073e 100644 GIT binary patch literal 2509 zcma)-Yje{^6o%hTLhQI(9NdHu(zFSbV8;X(XiAAgN+CcmhCl;pL$69Kg1|@~Tc*?g zlm3f#rVYK!^aCIH2Oa)PhxcgZ*eI)+e$h(%o;~~QxvZZ5_t!rF&f|Ut0}6AkPUUgX z2p$EVUug%O*0x*o+M(;atxC`gD{IZr3;cElLkgo0ohMGE;rKh1wXKKlcBqi~$!pd; z|B*tW)>GHRmgnzODeripk+r-9+fL(_6FyMT_237;5jb`8DQ?W$NXOrM&)3~{==qKi z7tXhWENh9WU-bYiVNy3X>WKFii8EKJ&3+X}`U3dEJCZmcFHt=`M|@ zc^+;nAKk!-;W3S@80NW0zhwb+XpzpigV2kOz#%p4#>3C1rJGvx5 ztWIm>x}1!N$xDI0R$on)*q+tUVq2icgshMa15+m%yst2kte(pquTghfS$seQmV}hi z%+gE_i&&CuPvp44vc^$N$=r&@hq$CL>@=IMUsqVLC23zC;$5m)Tvkvy@wBS(p7^|m zk2ARbO4S=)jZg3?Yx{}Q=(ub58RPz~OlMRrDbJ!Nm0?mI9Yx`$#@m?6;+EvIFVV65 zxyEsk?@;dVm{{J>I4Sa%CPb2pSh=TB5#?*9bFZUf?OTnqXx}q2i4Kb`wlvORiUDDh z&I4X_@=AUBp*T}5E=WsNs@dn?uF~Atc`K53e6MV|z6>dHt*7N1xaiq687tJ0d zU_SD2*jU9L#Jix&#;l~+R}bVj9QlP#2hamKWCeNC4lav}fXpUArmZ0F*g;MtL1qXtn*t)$BOt7D3&@Ei$Z;!3 z(GF5dg3J-*WD1Cst$?s`EFh&MNXZIv$_}!S1UW^Jg%l9!BLQJ|TR;|)AQdafyLON> zNszMyIhO(=4J;tMC@dgnk|2v#5MH!qu`2T>k@kJ@Hx@Sw=bz%j{4T1yxLEjzk6m1; ziBSFnS1A=f;~e!HY5JPcZ>Q<&M!%b;e_`~^H2o{1f0L$vXLP4uFZV)njDK+80w%G< mXBC@R#*es&pLvV@$^Y2DxYQT*7x7&+iD%f3qh60LCHEy#U7T(J literal 2224 zcma);*-{fh6o&r}n1t8@hD{JPpkN?K6x>nV_XsG9f_gEK5eMQ-Dw$~Mn|SLJXqDnZ zl@H)US)MaJA>+_f<<0c+pFaKdSyK7^=jSf~=kOwdn80wQmVfP(oK45F^Hrx-Su+b( z)irIil6T5(ezxpdj$KWlS)hHxcw^*ChP|GjUEMI(T!F-Ut6Z?`O@VZwq0YM%%U+)% zdEIiAEP3Xv8KpVHeI+1^&Re_W7)7;YH)_^Wvv=n4OO|c9(*jM|ktKoV8&1(op$Y90 z68i+&$hA3Bd%bE_7L3)B$q;&ota*~n50 z1P(~-L7dFj1LmFCk=^#nBz z3y2hZx+0NhpVx3Bf$RU&tKyZoiCa{aZ;VpSoP9~vAG}J{^pqxjN!;NqtMqwK5x6ID z7=1}R;M@d~=F1Ny23ejZIauqy{77P$<#`n%j;pUMN{qAegi^E93%<52F^WEVE|qg? z-fPy|7T3M>+jN|BfdPtd6ZLo;F)mP=#kktMk&4M1sZ6|)vg?gh3pBRUNop(Sg-^fXSVyxn~S*6Mla zR#v_T_Rh$BG1Z6fs{!%_J)g*F3=NQWEyzJVNPiflgRbk00O6Q12<2G=(jNxt)`A?- zgJi-Wy#&%10m4aR5UMB*NG1%@uLU`(2RRl7IYJp`+% zkRbvYjsW3uWe{oy4M;W&lGTFb^dMtlkQ{-GMSyVsFbMUm24pM@GOh)oUoCZ5B&cz@ zYqqy>aydQm4W~!9aCQsl)0gP8h3Ntdx$n42Qu;RSk$yKyzpwN{ls=>MxhVay(ifui zC8a+N>bb^~57Vy>FhPwxi3>Q5Wt_n~oW%$F_wfVg0}i