From 46133ad4c36b69e3c13ba034c6db044c2742c845 Mon Sep 17 00:00:00 2001 From: esoe Date: Thu, 10 Nov 2022 00:20:25 +0300 Subject: [PATCH] json-works --- options.json | 7 ++ .../molokoin/molokoin-client/css/style.css | 45 ++++++++++ out/unzip/molokoin/molokoin-client/index.html | 23 ++++++ out/unzip/molokoin/molokoin-client/js/main.js | 1 + .../zip/molokoin-client-master.zip | Bin pom.xml | 5 ++ .../ru/molokoin/sourceListener/Options.java | 42 ++++++++++ .../sourceListener/SourceListener.java | 78 +++++++++--------- .../ru/molokoin/sourceListener/Options.class | Bin 0 -> 1686 bytes .../sourceListener/SourceListener.class | Bin 5521 -> 5744 bytes 10 files changed, 162 insertions(+), 39 deletions(-) create mode 100644 options.json create mode 100644 out/unzip/molokoin/molokoin-client/css/style.css create mode 100644 out/unzip/molokoin/molokoin-client/index.html create mode 100644 out/unzip/molokoin/molokoin-client/js/main.js rename molokoin-client-master.zip => out/zip/molokoin-client-master.zip (100%) create mode 100644 src/main/java/ru/molokoin/sourceListener/Options.java create mode 100644 target/classes/ru/molokoin/sourceListener/Options.class diff --git a/options.json b/options.json new file mode 100644 index 0000000..290cefa --- /dev/null +++ b/options.json @@ -0,0 +1,7 @@ +{ + "linkVC" : "http://molokoin.ru:3000/esoe/molokoin-client/archive/master.zip", + "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" + +} \ No newline at end of file diff --git a/out/unzip/molokoin/molokoin-client/css/style.css b/out/unzip/molokoin/molokoin-client/css/style.css new file mode 100644 index 0000000..50893ee --- /dev/null +++ b/out/unzip/molokoin/molokoin-client/css/style.css @@ -0,0 +1,45 @@ +body { + font-family: Arial; + padding: 20px; + background: #f1f1f1; +} +div { + background-color: rgb(181, 122, 236); + padding: 5px; + margin: 5px; +} +.header{ + display: block; + padding: 30px; + font-size: 40px; + text-align: center; + background: rgb(181, 122, 236); + /*position: relative; top: 20px;*/ +} +.controls{ + /*position: relative; left: 20px;*/ + list-style: none; /* Отключение отображения маркеров. */ + width: 25%; /* Ширина меню. */ + float: left; + /*padding-left: 20px;*/ +} +.controls li { + margin: 5px; /* Отступ между блоками по высоте, необходимый для того чтобы пункты меню не сливались */ + font-family: Verdana, Arial, Helvetica, sans-serif; /* Тип шрифта пунктов меню */ + font-size: 14px; /* Размер текста меню */ +} +.controls li a{ + display: block; /* Изменение отображения на блочное для того, чтобы иметь возможность задать внутренние отступы. */ + padding: 4px 15px; /* Отступы внутри блоков. */ + background: #0db5b5; /* Цвет блоков меню. */ + color: #3f3f3f; /* Цвет текста в блоках меню. */ + text-decoration: none; /* Устранение подчёркивания ссылок. */ + position: relative; /* Это необходимо при использовании Internet Explorer 6 для того, чтобы ссылка по всей своей площади была «кликабельной». */ +} +.controls li a:hover { + background: #92d3d3; /* Цвет фона при наведении курсора мыши */ + color: #6b6b6b; /* Цвет текста при наведении курсора мыши */ +} +.mainframe{ + background-color: aliceblue; +} \ No newline at end of file diff --git a/out/unzip/molokoin/molokoin-client/index.html b/out/unzip/molokoin/molokoin-client/index.html new file mode 100644 index 0000000..744949d --- /dev/null +++ b/out/unzip/molokoin/molokoin-client/index.html @@ -0,0 +1,23 @@ + + + + + + + molokoin.ru + + + +
+ molokoin.ru/ добавить картинку и кнопку авторизации +
+
+
  • gitea
    • +
  • apache
    • +
  • moodle
    • +
  • adminvps
    • + +
    + + + \ No newline at end of file diff --git a/out/unzip/molokoin/molokoin-client/js/main.js b/out/unzip/molokoin/molokoin-client/js/main.js new file mode 100644 index 0000000..1a90dbd --- /dev/null +++ b/out/unzip/molokoin/molokoin-client/js/main.js @@ -0,0 +1 @@ +console.log("qu") \ No newline at end of file diff --git a/molokoin-client-master.zip b/out/zip/molokoin-client-master.zip similarity index 100% rename from molokoin-client-master.zip rename to out/zip/molokoin-client-master.zip diff --git a/pom.xml b/pom.xml index a406b19..e1cbee1 100644 --- a/pom.xml +++ b/pom.xml @@ -23,6 +23,11 @@ 4.12 test + + com.fasterxml.jackson.core + jackson-databind + 2.14.0 + \ No newline at end of file diff --git a/src/main/java/ru/molokoin/sourceListener/Options.java b/src/main/java/ru/molokoin/sourceListener/Options.java new file mode 100644 index 0000000..08b5b1c --- /dev/null +++ b/src/main/java/ru/molokoin/sourceListener/Options.java @@ -0,0 +1,42 @@ +package ru.molokoin.sourceListener; + +public class Options { + private String linkVC; + private String downloadPath; + private String zipPath; + private String unzipPath; + + public Options(){} + public void setLinkVC(String linkVC) { + this.linkVC = linkVC; + } + public String getLinkVC() { + return linkVC; + } + public void setDownloadPath(String downloadPath) { + this.downloadPath = downloadPath; + } + public String getDownloadPath() { + return downloadPath; + } + public void setUnzipPath(String unzipPath) { + this.unzipPath = unzipPath; + } + public String getUnzipPath() { + return unzipPath; + } + public void setZipPath(String zipPath) { + this.zipPath = zipPath; + } + public String getZipPath() { + return zipPath; + } + @Override + public String toString() { + String s = "linkVC : " + getLinkVC() + "\n"; + s = s + "downloadPath : " + getDownloadPath() + "\n"; + s = s + "zipPath : " + getZipPath() + "\n"; + s = s + "unzipPath : " + getUnzipPath() + "\n"; + return s; + } +} diff --git a/src/main/java/ru/molokoin/sourceListener/SourceListener.java b/src/main/java/ru/molokoin/sourceListener/SourceListener.java index af97918..b816dfa 100644 --- a/src/main/java/ru/molokoin/sourceListener/SourceListener.java +++ b/src/main/java/ru/molokoin/sourceListener/SourceListener.java @@ -14,28 +14,53 @@ import java.util.Enumeration; import java.util.zip.ZipEntry; import java.util.zip.ZipFile; +import com.fasterxml.jackson.core.exc.StreamReadException; +import com.fasterxml.jackson.databind.DatabindException; +import com.fasterxml.jackson.databind.ObjectMapper; public class SourceListener { - private URI link = URI.create("http://molokoin.ru:3000/esoe/molokoin-client/archive/master.zip"); - private Path downloadPath = Path.of(System.getProperty("user.dir")); - + public Options opt; + public SourceListener(){ + try { + opt = readOptions(); + } catch (StreamReadException e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } catch (DatabindException e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } catch (IOException e) { + System.out.println(e.getMessage()); + e.printStackTrace(); + } + } + /** + * + * @return + * @throws StreamReadException + * @throws DatabindException + * @throws IOException + */ + public Options readOptions() throws StreamReadException, DatabindException, IOException{ + Options opt; + ObjectMapper mapper = new ObjectMapper(); + opt = mapper.readValue(new File("options.json"), Options.class); + return opt; + } + public Options getOpt() { + return opt; + } /** * извлечение данных архива */ public void extract()throws IOException{ - String fileZip = "C:\\Users\\devuser\\Documents\\code\\sourceListener\\molokoin-client-master.zip"; - File destDir = new File("src/main/resources/unzip"); - - try (ZipFile file = new ZipFile(fileZip)) - { + //считываем настройки извлечения + try (ZipFile file = new ZipFile(opt.getZipPath())){ Enumeration zipEntries = file.entries(); while (zipEntries.hasMoreElements()){ ZipEntry zipEntry = zipEntries.nextElement(); - File newFile = new File(destDir, zipEntry.getName()); - - //create sub directories + File newFile = new File(opt.getUnzipPath(), zipEntry.getName()); newFile.getParentFile().mkdirs(); - if (!zipEntry.isDirectory()){ try (FileOutputStream outputStream = new FileOutputStream(newFile)){ BufferedInputStream inputStream = new BufferedInputStream(file.getInputStream(zipEntry)); @@ -47,7 +72,6 @@ public class SourceListener { } } } - } /** * скачиваем архив проекта из системы контроля версий, @@ -56,12 +80,12 @@ public class SourceListener { public void download(){ HttpClient client = HttpClient.newHttpClient(); HttpRequest request = HttpRequest.newBuilder() - .uri(getLink()) + .uri(URI.create(opt.getLinkVC())) .build(); try { HttpResponse response = client.send(request, HttpResponse.BodyHandlers - .ofFileDownload(getDownloadPath(), StandardOpenOption.CREATE, StandardOpenOption.WRITE)); + .ofFileDownload(Path.of(opt.getDownloadPath()), StandardOpenOption.CREATE, StandardOpenOption.WRITE)); System.out.println(response.statusCode()); System.out.println(response.headers()); @@ -71,30 +95,6 @@ public class SourceListener { System.out.println(e.getMessage()); } } - /** - * @param link the link to set - */ - public void setLink(URI link) { - this.link = link; - } - /** - * @return the link - */ - public URI getLink() { - return link; - } - /** - * @param downloadPath the downloadPath to set - */ - public void setDownloadPath(Path downloadPath) { - this.downloadPath = downloadPath; - } - /** - * @return the downloadPath - */ - public Path getDownloadPath() { - return downloadPath; - } public static void main(String[] args) { SourceListener ear = new SourceListener(); diff --git a/target/classes/ru/molokoin/sourceListener/Options.class b/target/classes/ru/molokoin/sourceListener/Options.class new file mode 100644 index 0000000000000000000000000000000000000000..f40080388baacb32e9633e3dfd38a0808555e40a GIT binary patch literal 1686 zcmai!Yg5xe6o%g|rD?+|Pzw|kEQrvHQt!w`R6x9S#2K_R_${Ro0wL+7DUR}|bVk9^ z8U5~$ay%!Aw3c-IvYYHVd-mD)yveWM-+lm?#d8G_feEKk+_z18&o-=L-EKHrddaA} zx}`hC^_pwgR$W06VEH#50u47o+3j(rgzq3qR ztG?9S9RcNoQS+Y?4eR7NwrE&}yCl$+&6NeBD|S^^(S@@TDtZKZONOPtXzW*X=ap75 zbw119(#*2v82lbAM%^8wE-+d8|7D0QQP*9n>!A;1PqXLB2?z{IbR$OD+s*7$Hg`Im zD5>CT%WZl4c?pHL_tN&(7zsn!um4KGsTU;@oGK~xBp{$t-Wy*u&blNK=PZ@7f@OiY zYx{yLm=+jnZ^LrKFsr%~M~?2{cPlfWQ89%A3!GA^?p28)q&?^?Z>A2?%z~0}X_WL71oj=BzPhMItjWKUAfj)YceggWD zq&Im*0AY<7ggO%fGSUu`3I!Pr2N`Pz86uE$2M}%!gHW?WK*riZMnXZx z!$Bt6K}HE=tOE$Ug+a)XAs`d&Aem4Q`m}=0KgpKtk;Ctp+DvATkHg%pu|(pjnDo7#BCXh literal 0 HcmV?d00001 diff --git a/target/classes/ru/molokoin/sourceListener/SourceListener.class b/target/classes/ru/molokoin/sourceListener/SourceListener.class index 4630a79ec47b8245b7d00e8fb0ec998ee5d99a41..f73638d573e3fbaf7d3c390193b287bd23156161 100644 GIT binary patch literal 5744 zcma)A349z?8UMdzliA%&lQ!wKz0#Hz(kAIbsUS&OXwpEVo2DcokW#>DcG7IS*=#TC6DjQ3`B)%!XKDAmi0x4< z8QyNi5}BS1)ebiY5yD~(ixk!mB!|O;2KlUg!}0JQV_%@&U3TGB~BWh%fU9m(oyv2Q(aza>F2hkw> zjUEF#x;!KeSWTsoSi;C#GaDI{N(s7JEomR%5^3<6@;{gCVExe#3@})t&l%uT0xwL z3Jn_-^nBJYjKxhq&gTegNh)RC9)c{07HpQfI88&F!pfH}FcICZ<3e1d5Rm%mGvZl> z@N5@3M7gMH_TZ>3Zlu%AUT`|L(&_SH+g^pnmkOoVJz*sBS-Hfnxi3Q;W;Ap%wzjv~ zOe`M0HkJzSh^54qAX?F-V|%`0IK17+3D#4;LiJ(xvlx$J$iR`dx z84|VT3S5eQ4VM+@@(}3Qfy>!h5;UtlZVprA%*u3~*Kmcx{1XgrrwyZG@l`rrB^K-S z^pXVKactg+T{;G2LgU0XW0>x>z?2*gDx6WIem$9Rn}Sqy3x;&Wu!q2-ob851OC?xr zW_joHsTAV4j$yDtln?KX#w>=2&2>i*JCV|HwM&qGbc|WSS!u4g_&4ZqxAgeE+l8z1|@!IU-Ct-hp>A zMMgB*lTD>8_Ii`*^QIOOH?Qdvc)m-=yCox4Lq@ujYlsWOv_Sm;O&qkdyug8lH&Axn za#11HBxZIcc*#64X9fCQvQe6IqAVxq1Zlz?abQ*H5amH7jmQHEg+&GPUcgXUMQj=X z3QMO*i{OLQ^9vV;(NuncSnn~^<4sGwXPjl9XclP zITrZLwp#IXgI2{;-uE+jnVOWe1XN2wPMo?MqZFd?o?1`IwQ)y zsN+j`j5V}N0zojGDh#&!U)J#zaleZ0Z*g-e%~Zoz3%73emZ<{A@O2GOa*yFSM8rzT zgoQ=NH}Fk`k|cX=bCKX&?f}WI%Y3tSh7w*e%^JQvg`)gKSISH{o6!Kii|=drp2G4% z6Szf4L=B63);y_>AK-_~SX+1d=H7N@Y=*WIIhsZKk9GV+_{uKr?&xg~;wk)G!_T;W z6w6^c#qEN*sx=uM-Aes&(@N|31%Ao?n;ewl&IeVY-;GJ3w{BFX2B*!>x8)g_KT#tS zc{hHg(N&7i7n2pzODr<@7vm16(i{%P-Y( zHMEh*{#umKO(J8IqVwE_&8Q6t3H7-fayxKS#&XP%@91Zbl5oTjCuS-a|lohm$bhV^jjtv~y#F194!kOe) zOAeZdvnT=NswCA0I0DAQgm02&D2?yDgf7-l$Nz>(zVllG9ez2f z{In`W8yoCE3{ZyzYUu>d>mNsRXTt zF^*_cd8j;x-8t;NRECmwa9iJ`sV4sfto~5>I5JIv35@hN%IxSku4@X8VOA&*3g&Qq z4zHK{{yQh1llv{9z+*Ts6v*MNV>qixlUKj}8q$t7`9s>{2!{Mk+8E}9w2=QUzVVjB z+c+&|-mY-RWOw6ZsHgSs5!~@vljr)Qo%N5y-w>hh`i8sUuWuk*{n3Mrz*X3f+Zlyk ze2hQvThB4BwcyOt{K;MLcOmBR+QivrX1;~U+sOQH;`MyaU4U)aOi8Us5NlUs3y&>r zxQR3SaS8}S zHMHdEERClZ1STmlcxpmh$_s2DWSuo@QV=_XLG;aq&pYZe`8Sg(5O|)JE9sBCvZ1Ix z#-)t*A2^IpL=NLK4%F^HjPWCQs02sws6uCbgERbi=|gzpFuqpy5Wdx4dI;a?>GvJN zk9rQ{r#U>mjs2zZ2!5-$A^xND{3m(-D+m7}Xg=0N>gov`@2`Gg9RCUVa`TQ}|P;RnE8mT@Vk1hy6-Z5``s5selSHm~H$NRH1aDVvrvgXQ@i+yMY-$ zTUBu^pLd69Hb*4y^HDO1>rrY){BDiM4T>!bBB17|YA43Hjk2Xz)lNY5kE@zUeNN5g z|9raL$%wEnq$!KrI@@IpTZPkr7uhC9nJkktyE!++?8fNwUQY+BRSQ*!;{7yw5nC=7 zV=)@%P_39)BPQ~qDSivIJ8T2JRZBQkqL!*vBkBUirTtw75AlTTh~@C{^u>p8%VSt@ZP+8&pr3Q=ltit z_wvv)ci#)(d1|qS5`}szA00_2)BDniR5Y8;TLWf$BAYW)rWNfe`qU6mSa6LoYDAMp zYAD*Z_Zo8`rw~XcQu`F($T?0(u_(g zt;#ngQi&j0g!bZka#kWW z)LdV@s1Otu>nKBc5D|r7KFb;62`h|cSfOEgQG9yF2w+6V*;uJiF=Xa;TIq~w<;D~) zn0qS!>>5@Td$d7S;9Q)q;XH*ZXF2|e>bL+GDwL!L6`E(6<*K>Y=y%gBE3Ma|A*e9F zJ&`gy^CNprYnQP%$xv0brw5E=uVE$R+ieWwh7(zZ#`b5;D5hUC59TaGXcTTeIACUS ziF7Kf;Ua}}m>m`{@-i`2P1v&XcixERZjNHkZV1+5yk6*=`8 z=-7@+$*vT`*qSsY2&^>Eov%!rHMA+zoPn&B7{(vSiPs1vy+N-e4 z8@n|>IA~gCye;J$-i){o6D*~9gzoE7h`Rp#S+-;8Nrn)2##eI~28IPof`DhR_)Y2= zECc&=Br!rEf2-;X&o8tS13DRB}A+Ob#0D)R!2_kL)7I&Qp!=hjOsXmFwF;& z=`36NF&f4pT&Lk$ud-}%>>9Sx2V{_rm*Qnikr9vg$uDwYhuJS}?2en+95Xq+b9gM^;$$S1)*0pxv80%) z5oTRUwC(EgoB2wEWG~Vc(+#+ zvKh)0 z;FBz#yv1@`@0OeA$hW6Y$L4fQGTEnfdOH>N0>E#0kK zcD3>>)|oRh%s1mc9rxn_%0$*oF)xNU znV;-#Lft*-|NEVt6b=A}Y8f8V@l||{oT5f>H=eHdojfPH`we&N6ZocvZ%{hs4xo;2 ziC%}ZIU|?PI>+5d@Er}`_LP}H^Lf?rT@ijQBNHW4GROCI`~W{>+c5VCreQ8_?r^#p zv`6q`@$-|@&MnRn-j?$dcvQ#FZ-`aKw;Ws#%VH@hsrh%xp9wByNdz0Z=Pv zHFUYc_+{+-jv@q?CdF7esjK=$h`L?>n_TZjr6a1ZWzC$Ujox8K#>-txE>82=>lL76 zhS~G#qR5kd$&$k@H>EnaB7NDQFVW*lK2*7mcOfjlf;!g7ueErR>ocq&Qm%TI!7LBc zpzzO>hwt#-tf>m7$hlNH8*X*+4Rej~joWZrinq^}q`@-?C(>NjY3eNAoaQbpzcO)u z_URN|`o6MQ#TAzF4qU=Nyvy0Yc+=rK$R1uh`K;jAE?OzR&u*B2-cU7f5)1A^O+(d^ zNh~eB2ep$p=PuM8vBx*?S%rZ6tVShomn+!P$QIr4g4Jl^my%d=<|uy$__bE%DtVB< zE7_@4t!tmchQ6xjPT=_+s#C=RQ)upMoWRAgvPfA0n`7nUI223KO>>zv2Y}GKf;l4EHsXVkx(Rjm|uJq zFve~{_;Q6?PVJ7A-G_Ao{gvZr=#;OZ{nd0l7HGO3p-7-}9P^tZfx`&#$>B}Mk1!kq zxPgZi;7Z)aKfrQ4j7RydqDVYu2Ty|DiE2KVGF8hMz!kJw$qRBV@4>6E4(DJC&c|iA z5Z$Pw$9iPZfKjI9dcI%JgxtV%JV5)0dFd?2dOKnLBmq<5CahEi@G88Tsj9@&cnx05 zaLr_P3@C-Uqb;OK8BB# z;21uo(9yV>4R@5?gFE|5kD}1i7dVQ~^-SV;0bl7niU*sH;p++oJna1bp8Wn18-FU) zKQ~6}2d8kduj&^Q_?0l{*9H8(fIp67o;|vNKlAGdvD9FM7pTX{D&fp#%;$3>zhcDK zj0M<)Mf_dEo+Z4UNBLflt+<4dzZ~1pi&l=`j{Ue4*P_kl$YxtOu5&pOz(M>Kf3s&A z#NY7`268<;{u57;nY~y{<^(z4en#eB_&3`;7C2V_VT-V!1|_EmwA7CC%^DBh%+KQz z&1XmfN0v6zcL{CF8yYD`Gx8&%BK1&4s)+2+msq(7<(G(^Q&~c7srbWCYM3-0rBae17r`UyJ`*~qPF6N$7R=-A4uKlK(3wzNJy0^ zk!JyNBY}vZubhJFn^1xF#)2y2KaE7_AV*dgRLCWQ&SY0pb4%@YF13>wCmNF_ImEtU z>UM(vXSdIuvet2{!b+wIVzJUG8T`KyNu#Rdw34)HNg5xTn#a6J#?~?fN;p=c7N~`M ai$0CxR#jCVQq?%27L|v{;1j9_q5lH=8J5og