From ef7089598a9d31a043e79cd3066096ed45897d82 Mon Sep 17 00:00:00 2001 From: joinsang Date: Thu, 28 Mar 2019 14:04:16 +0900 Subject: [PATCH] =?utf8?q?=EC=95=95=EC=B6=95=ED=95=98=EA=B8=B0=20=EC=A7=84?= =?utf8?q?=ED=96=89=EB=A5=A0,=20=EB=8B=A4=EC=9A=B4=EB=A1=9C=EB=93=9C?= =?utf8?q?=EA=B9=8C=EC=A7=80=20=EC=99=84=EB=B2=BD=ED=95=98=EA=B2=8C=20?= =?utf8?q?=EC=99=84=EB=A3=8C.=20=EB=81=9D.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- ZipProject/Controllers/WebZipController.cs | 12 ++--- ZipProject/Models/SimpleLongPolling.cs | 2 +- ZipProject/Models/ZipModel.cs | 10 ++-- ZipProject/Views/WebZip/partial_zip.cshtml | 2 +- ZipProject/_publish/ZipProject.Views.dll | Bin 70656 -> 70656 bytes ZipProject/_publish/ZipProject.Views.pdb | Bin 5436 -> 5436 bytes ZipProject/_publish/ZipProject.dll | Bin 31232 -> 31232 bytes ZipProject/_publish/ZipProject.pdb | Bin 3864 -> 3876 bytes .../_publish/wwwroot/js/Zip/partial_zip.js | 47 ++++++++---------- ZipProject/wwwroot/js/Zip/partial_zip.js | 47 ++++++++---------- 10 files changed, 59 insertions(+), 61 deletions(-) diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs index 7cfb065..0a4aee5 100644 --- a/ZipProject/Controllers/WebZipController.cs +++ b/ZipProject/Controllers/WebZipController.cs @@ -63,14 +63,14 @@ namespace ZipProject.Controllers { public async Task FileUploadProgress (string uuid) { SimpleLongPolling longPolling = new SimpleLongPolling (uuid); var msg = await longPolling.WaitAsync (); - return Json (msg == null ? "-2" : msg); + return Json (msg); } - public ActionResult DownloadZip(string uuid){ - string path= Environment.CurrentDirectory+"/wwwroot/zipfiles/"+uuid+".zip"; - byte[] file= System.IO.File.ReadAllBytes(path); - System.IO.File.Delete(path); - return File(file, "application/zip"); + public ActionResult DownloadZip (string uuid) { + string path = Environment.CurrentDirectory + "/wwwroot/zipfiles/" + uuid + ".zip"; + byte[] file = System.IO.File.ReadAllBytes (path); + System.IO.File.Delete (path); + return File (file, "application/zip"); } public ActionResult Error () { diff --git a/ZipProject/Models/SimpleLongPolling.cs b/ZipProject/Models/SimpleLongPolling.cs index e178981..aa1bf47 100644 --- a/ZipProject/Models/SimpleLongPolling.cs +++ b/ZipProject/Models/SimpleLongPolling.cs @@ -33,7 +33,7 @@ public class SimpleLongPolling { } public async Task WaitAsync () { - await Task.WhenAny (_TaskCompleteion.Task, Task.Delay (100)); // blocking wait until event occurs or timeout + await Task.WhenAny (_TaskCompleteion.Task, Task.Delay (1200000)); // blocking wait until event occurs or timeout lock (_sSubscribers) { _sSubscribers.Remove (this); } diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs index 2f192af..76f11d9 100644 --- a/ZipProject/Models/ZipModel.cs +++ b/ZipProject/Models/ZipModel.cs @@ -20,6 +20,7 @@ namespace ZipProject { private JObject keypair; private string[] dirList; private List files; + private int now; private string zipname; public ZipModel () { } @@ -52,8 +53,8 @@ namespace ZipProject { zip.AddEntry (dir + filename, file.OpenReadStream ()); } - if (!Directory.Exists(Environment.CurrentDirectory+"/wwwroot/zipfiles/")){ - Directory.CreateDirectory(Environment.CurrentDirectory+"/wwwroot/zipfiles/"); + if (!Directory.Exists (Environment.CurrentDirectory + "/wwwroot/zipfiles/")) { + Directory.CreateDirectory (Environment.CurrentDirectory + "/wwwroot/zipfiles/"); } zip.Save (path); @@ -62,7 +63,10 @@ namespace ZipProject { public void SaveProgress (object sender, SaveProgressEventArgs e) { if (e.EventType == ZipProgressEventType.Saving_BeforeWriteEntry) { - SimpleLongPolling.Publish (uuid, (e.EntriesSaved + 1) + ""); + if (now != e.EntriesSaved + 1) { + now = e.EntriesSaved + 1; + SimpleLongPolling.Publish (uuid, (e.EntriesSaved + 1) + ""); + } } else if (e.EventType == ZipProgressEventType.Saving_Completed) { SimpleLongPolling.Publish (uuid, "-1"); } diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml index 437a386..31d6ac1 100644 --- a/ZipProject/Views/WebZip/partial_zip.cshtml +++ b/ZipProject/Views/WebZip/partial_zip.cshtml @@ -77,7 +77,7 @@ @LanguagePack.GetText(lang, "pleasewait")
-
+
@LanguagePack.GetText(lang, "complate")
diff --git a/ZipProject/_publish/ZipProject.Views.dll b/ZipProject/_publish/ZipProject.Views.dll index 085567c61cd421e77776b60c060eae968722241e..6da3caa5a2f2dbf316a7a4dc24d3ff3b3264fafb 100644 GIT binary patch delta 2141 zcmZ8ie`r-z9RHrX%`G?Qa%|;~+Q!Vyw&uO}-TU5ssl7zgy_vc&=lm<~yYD>+l&w{N zMCHUn3?v*!c+nq;XdodO-0}w+DFsqgDhN>+IVgLrdWY(=f_lAI?Oxd2 zqlCYH3`=U{y-|_gvm&bUdxOfvgVwdR4_$%oo{^;@b8E-cCK(-hfYXs>e77HK5NTW1 znyBl>j_D`Xx2*mQ!uIK^|J_b)zQgT86WsE%ZnfQ^$egi97RhMq*xT{Z^*bzeQ{U=e zV*NFwC-cp^FW+Fz+pbsT7pv9!M!rSw$~UTw`lWoEdY7Ffzt@*?H^DS># z%ZKBggZr(8>xM--w{4Xxhefa->D;g_zYgCU@w}}khsRxs#1>D|l9d4SEQW_C5LYr- zInel+J9s+5fBrd!& zK;f7a4)oj;v!|g+8C__!Hf(*#T9VP{P&y_l z%gDXj&^UPL6~!mdZ?4WUeF+akQ;|g|f@W`|5ISqVNmtmgV-L{BfhLktyy{|=m2)6s zZ?mW@0M8jSCPBy$&lh_>LCMBqS|&r!>)ju(KzkICFzI13k~C=mFE%C<2gt!FT zKE`H6(xyGQh2%W5p5%v&kYnBp$$h|@@ca-7+nC38f5M&>DYqIZ$ia6U0pH3_*T)ejVnJ^)#VCE%6o#0v4rG~HEN%?oX?xDk~m8^uv88_s+brFYf( zWc!gFl)X~mxV~HT{gj(7XY91=d2T^pndz+jJXf7)ZQfP&t*A|d7XDQBW7rQWu^TGy z)~nWYpmhTY38K1?o37Vb}f(nL?lp delta 2087 zcmZ8iZD>_x9REM(ZcgX6w&rG*?1e42rmlPL+d0=(my5b~SL(vt8WnNxc`4{+bI}Je zy~_`^LSo|xSFli0WmEASqk=RE(n-~aWw zXZ%#z_^GnViLx2{;K`|@8?_(1ral~0B~Pi2@?-ZXdDLswws^y;L%Uh&9Z`ojT20|G129{bBLADcu=^IXw`yUQTQ;lc%!{lVd*DtPZ5(^jf3J5~Q`6qxeH*oz zL2n^f?{(*@v~LEzp4?s9@8qoWp3l{&i1%`?S#9;M=NfLiiWr+~R-(Mm`vQ_-NZMK> zL$|nYLdMPQ|3&;P?Y(qA@%s9k)q#LM1o}1aX#WlMzQ6yWxrjRBZQe7j%@27O_q?Mm z4EfIuOlTYa8WL&Sw^t^nMUarRJ-9Eo1MlO0_1>AsiV5LkizR7s#KfKmmMMm~pbL1% zM3+4FJoNIC#L^+Np)YF+GJ?|qk!%!nI*=4#MSBB#9(ZxkR$ygI6!rz^*}$_!uap!H zX{b2<&eKb)it&Ib0E?C`gfR#iBQc|pQrQinieZm}>p(_tM3rnZ@RtBEAI4h1+X4bL zVxU4F#4y3tVPzt!6mTp}9PgaJxyV3GC^N}8-g@v33&nI2kTXaF8VrI-AqSipu4Gvt z=4FB7!rBPn9oW$_1#K5A1}ceD0%3+}vI)TQ+)vtyc_10EO(T-9xGX&rNn%gKp5?GW zv1LSv;xSG51Vgf{5`$vp42TUF z6#z~^p3MNz0Vf)0r156A-Q|EJOL)!>ohJi*TBQQ_Hmq4V6BbOCCB#$!!;%VSfeidN z&&-!+IEyTE6mmx5;xV9*0A*pZS#g}w;FD%FoK>cVE_=t$UIPZHJRTN530-Q36G}{$ z(1lADhaQsfWiW(*+hNggCey2cn}P{`t$M+Ro+?npZRYALGn1 z5cY@ay!M=EYVrE9iwuuLkq~+H53l>vMt|VS&kbtW&-~D$yt)O`|9&yD8l~dpV6j$i zd-#XT*q$K14TxO&`3n0DTdr%bDmFigvE>~yJat-7o?UAg{|s9ggZJ_Hk3i}>y? zt_?r4Acd!TtPZSEe11nubycdZwrR_u7w4w0^`3a+nPhG0WKU^Fl{y$(<}R&p3BLH! zxAo4Ef7U<#bXDg3^7k89@*U4DQ>~5Kg|68()v8>T2C7xxY)y^&Got;pZMN=q^^2N{ GR{RU`HIm-| diff --git a/ZipProject/_publish/ZipProject.Views.pdb b/ZipProject/_publish/ZipProject.Views.pdb index 274b147e93d790cecf51be1e96bf4be58f38ecc8..497df2cc72a9dfec25be90b683b2694937c43e8f 100644 GIT binary patch delta 57 zcmV-90LK5kD!eL?d=$M$5|I2ann1P)@K74zHTDy21KqKZEfN%Atnr~99tFUUPJtyY PRWfgIVni#m(GqI{$io*p delta 57 zcmV-90LK5kD!eL?d=wrmeRH{=+(w&1L=0DLG!P|NksyCG!C;g&w#XkE3?`x&h>i1h4-_}q_vSY< zZ}!d1+uh_{lDta}?G;B)B@Pc9$Ro`IAFOj)-v+1$yiNeLN&^A6;|l->vg05?16$Kx z#+pb8X=Od6JFp0y`L!Hx3KD!725>zAK#-jP^0iceZY50aiZ|O)2p7qZs9|$nOnG|2+<8FM_X_RS0^%1MWdLGEj-r*A-ajv7Lz>D%}8mtRun_w zijFp%lNqd1$tF%#r&Qq>Q&!^mwGzPb7o~qrKE~BRi02uz-ia&XxrXeG=in^IIGOE| z&35IoQ`V&a59|(BUZpYKRU3`*hTG+`^(h>w*dM(qY0&Xe^K2uori8HC5#}M#NN&BFa=(Fx81oG{&`VnRfAc z+KcDROq4IuWSwDbx1>sL(V~jc-AIlJzuUsIHNqOABn-i*(k?kcD>kXcK14F1(4fBTMu&{ql{})?B^S&!N$Ir4B^4H% z1jik{NFSx?jMy(}5Ww;R^eGQWn0TNxO;+jx4^(%j(MNl+P*0m=JkSd(4H|+;cZ7Js z9Wu9e#C=%u!HhH|-0wq&L%~XHGoM{ja?{)T?Uz33qqn4@N)@ffrHRz7<=&*n~;Jq{E)~kDFh>FdI4@rC2%!O zAvf81?=o_ZNm*^~F;5ej0~g)BP)c`dn@K4>&Ei>cQp+A> z<&(dd-&cd*!g}9zi_ddGn1lgVo*g0eESi0uRr@v4ldAQ5DalVY=GGFjjSc1vr9_rT^GG@(M1`7zkvMMJcWQ21z-0-Ir*~ NQz>=N9Wqd9`3GUvccuUU delta 2069 zcmY*adu&rx82`?F_4cuD_qKO!_h58gOV>RZV`CBo)(k~5L=+~1g1|PBKV}DG#Mref zF5xAQ%`-+K4^h;Bpd@wze}GYj1VV`7YbL;Ce_$k%NMQPhB#YlUy%4!c&-s4e?>pc5 zUiUUNMp9#>cdK+${rqU(jsh~P@8}Ze?VSM60X~NSTI4>z%kedU1M!_50E_9m_Hw$E zOd@mWCerOM+=T=_&)`o08IDH))X4w@u@gWUO#6j3q&x>e(jn{zuqCp&Y$TADlsH3n zoggUylwK0CzRAt7*{YTr31a#f+@y?CA=ymCXL6f%9+(u+{&Q4mA2~K$N37zKhJr_ zgkL~0!~(D*iWCcC!cHqKi;0)^SVD#ul}Wb5m!Tb(k{HyiU<{K~G4?9T zv6Z+)s*_l4Nr+)Ow#c*$5M!$udM$(8v1UZ3SqqAxNM%PW?kNXdsCr2jU8_#Pb)PyP z*FRK0t~TrTngaBzgP6$Yd$tZOzQ z&Khc0%A4paTdq*lLc455b&L|M35{)Cyvw2xwxF9E@8EGE&WJ3bi*4hE3m{)Gg0_T{ z{$OkD=4bgKO$l$oxJKMU(Kw%xj4w636}8w%f=LL_51wOyL9oXOC(nbg5UFVyTQR(i z*;aOxV#iW!1h7lt2~2lVOybS|pN%rsRm*lHgDDsN$X;J?4t?TGVX~|ym@F$BCfgvy z^WSxpbTh4>DG9t06Xo?&gs_TnoDbLMs1u;>Jj9k(6QqgX7BqcSz>jDj5u*o0v@IC6lG zqt|uDIUtW)Uba8bu0R${01+*pz))JzV+cfl4je!f1^ggD4|20Hq$qfxl3Om}mOe_f zTK_Hau;hnp!YPTs4&kt*L9u!UH8ZRiBn56rm+5jXN-op)wNA2`8v4@i?*c6O0r*yJ zmz^+XqLuamk`1JUahttO4h8eFK0+Ji9Pnn4+G$P58cfU}IOym>)N7&>(so$~f`vsd z>H`uXZm^ojD&&A0^llS+gdQwWaR%`V4JhYm07hL=V!(Y9?RE9b_<0C1rvs35y(fFY zX`*eeUNH~C9QAo$b}W+fp@t)t#0Q8LW)Nh#kH`gZKGe-)gD=z*av}U~l0VxRQgH|{ zZYUMLMATv;UB4g~!=Q;?vR#z}aMwh{@vB?{C1G}Mlnl8PD1mx>-x#XKE|kCmjxwPI zVOc5Q_tGqI5LR=t2S;Z_4nprkL~h9;peA||?#PqisEI1zz8r=#9Az#nh5hN7?gNDU zMz0xj$!QwMZFOC7FC{fFhlzmF=9Qp2gC~!D4CP>ngrBrLkpc=>d z$G`8+`{~%0#?Q#7H+T2ntxM0ZIVE`{MNjov6+=&55}dk&!K;Fzrt_x%Q#+-x`{2hw zo?VFldGI#=>hV9fK8Aw%;Ftq`r+^jv9CGJqG#1E7H;-*O`}D==-pSW*50AbzLN~-Z zs~;+dO(l2TaBSei;(JeivUkv`?J|AhR>tIseg0g0zpLA?6PjwDn0BuJR~G7LrL{Nz JB7Ies{{Z2udm;b; diff --git a/ZipProject/_publish/ZipProject.pdb b/ZipProject/_publish/ZipProject.pdb index 9e5729cc7cba50e8eaec695187f2f456a0f91aa2..0e2a1c860c126909f5758dc541906a780075d6fb 100644 GIT binary patch delta 710 zcmXAnTS!z<6o&tGW}k~Q&giH)BaAcA$mBgEAti&1v>u!$E%M290)wLRlHml2sgpjL zmu;btMiGcz=Aj{@3!w#xK|V=u5|kkLlvIZKQ0q(wzVrWk?{)sYHv5cwA9{ydca9l= z|M10@vj7&ZhR=P?cUJbVH2!`Q^fiw=>K8|b-Q*pa87Lw_ND&Hlse}?$!CTfPR=-Br zrzvP-?P0CZ2{p2T%DZ!f1to%WAyB0XoMsxBh^pcnv(Eff&2Fo3#d(*{}018;P+wXFdX@2JgevFeeQ|L1WydIEljXJWC7FFF7GX&KF!- zj0~iM;A9_>TVk;Oi^c4N@Liah9IYm?S`*%;C9~QSzDY}AO-=YsEsZsu32;-z@FPMN zoYCflK){&egGS>kYAa=Q{GCQ5G&Fws?(?HdTWtqE-`Lm_59=Q(5Ia~`upNJP|AWg{ zRxtF~d3<4h+QxxtS*pfe)M>(=Bsj95TQ=5qsir9fvt;+x@T?)WokZJR{ z`cS2Ag;x=&$Wnv@6$-LJ;+kAdx@EmYeZACokNV!p>sB{y%G=g;?|$m}LFE(;nv1;- zie8}TAVp(lVRS)G+T7%lv$jckB2OhBp=~*l?4xw~GC4@iQnz<|=E+Y*)W1wUvHwwK zNQ`=Osee^Iuot;K1GyQUPhYn;b^aNvn!1wx{*!AhG~KZ%*X*6U>#Frk>{Xy6TjAdz oV7`Fnpk8WTfCI3gGDj_xHywp)h-c2rSx2=#0gx7$Y5)KL delta 782 zcmZ9KYe-XJ7{{OI?A$ip=G1i7oW*Q5X%iv{@seo@qN1YZ2P>Mx7HMuRO%uFsPNAFf z8Wp65SWt)r3kpIQT_l7)L_`=F_N7Q9m_-qN>3P?e=)mv%|K~Z+inrekVFB@5`tY4-~s6~ z(hM2FAq(Io?Izu$Ae6GBm_M*p)PP;2z92$@BtkXOKy*kFtPpF&y2RhhP%JBOkzm9O zabH%UNm1b>F-A-hw-lbM!ZP_an({gR%wzl#Ay=h2L@80JssbE}qzfj*vWP?DL)>IH z#9Gr6N_9ahqyU16e31PTFEzc<@O2=35_wN*Eon)0agTB$sXp!x%SO_qxZjYINmB?r zEy@Kp=s^uM%281SiyEa5?TxHTeoX!CD4H)S_8Vqj#a`arAKvTV*k)fypoYn2Nv2igW|2?d#_F|MXk%xz<*rIgeHzpV;uc7f`&2-o zPXM3_K5xK%+T}T`&x2<7sm}hvk-?GR z2Ak2X?{nhNH_XRS8P6X!VCXo8f*6|PwV_2_L#I2?+2#MQc0|vj2~#-BjwK%45i?f1 zJG@zLT@sf4*()>0Ti$Zba;018$fG~vX^h00YC#q k*^+}@G3=JADRP2E4HcFg0nz|6_@ALe&o>kbiAKWp2iFj>hX4Qo diff --git a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js index 3ec8057..b5be10a 100644 --- a/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js +++ b/ZipProject/_publish/wwwroot/js/Zip/partial_zip.js @@ -306,7 +306,6 @@ function RequestCompress() { if (confirm(_Language["iscompress"] + size)) { var filelength = files.keys().length; $("progress").attr("max", filelength); - $(".modal").css("display", "table"); //디렉토리 리스트 var dirList = new Array(); for (var i = 0; i < directories.keys().length; i++) { @@ -330,7 +329,7 @@ function RequestCompress() { //데이터 폼 생성후 파일들과 각종 정포 담기 var formdata = new FormData(); - var uuid= GetUUID(); + var uuid = GetUUID(); for (var i = 0; i < files.keys().length; i++) { formdata.append("files", files.get(i).get("file")); } @@ -339,44 +338,41 @@ function RequestCompress() { formdata.append("format", format); formdata.append("uuid", uuid); - //압축요청, 압축이 완료되면 다운로드창 띄우기 + //압축요청 $.ajax({ type: "post", url: "/webzip/fileupload", data: formdata, processData: false, - contentType: false, + contentType: false }); - var progress = setInterval(() => { - $.ajax({ - type: "post", - url: "/webzip/fileuploadprogress", - data: "uuid="+uuid - }).done(function(data2) { - var iscomplate = false; - if (data2 == "-1" && iscomplate == false){ - clearInterval(progress); + var Getprogress = function() { + $.ajax({ + type: "post", + url: "/webzip/fileuploadprogress", + data: "uuid=" + uuid, + timeout: 1200000, + success: function(data2) { + $("progress").attr("value", data2); + if (data2 != "-1") { + Getprogress(); + } else { + //modal display none바꾸고 $(".modal").css("display", "none"); + //파일다운로드 요청. var a = document.createElement("a"); - var url = "/webzip/DownloadZip?uuid="+uuid; + var url = "/webzip/DownloadZip?uuid=" + uuid; a.href = url; a.download = directories.get(0) + "." + format; a.click(); window.URL.revokeObjectURL(url); - $("progress").attr("value", "0"); - iscomplate == true; } - else { - if (data2 != "-2"){ - $("progress").attr("value", data2); - } - } - }); - req; - }, 100); - progress; + } + }); + }; + Getprogress(); } } @@ -472,6 +468,7 @@ SetBulletIcon(); SetSortable(); directories.put(0, "example"); +//웹소켓(안씀) // var protocol = location.protocol === "https:" ? "wss:" : "ws:"; // var wsUri = protocol + "//" + window.location.host + "/ws"; // var socket = new WebSocket(wsUri); diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js index 3ec8057..b5be10a 100644 --- a/ZipProject/wwwroot/js/Zip/partial_zip.js +++ b/ZipProject/wwwroot/js/Zip/partial_zip.js @@ -306,7 +306,6 @@ function RequestCompress() { if (confirm(_Language["iscompress"] + size)) { var filelength = files.keys().length; $("progress").attr("max", filelength); - $(".modal").css("display", "table"); //디렉토리 리스트 var dirList = new Array(); for (var i = 0; i < directories.keys().length; i++) { @@ -330,7 +329,7 @@ function RequestCompress() { //데이터 폼 생성후 파일들과 각종 정포 담기 var formdata = new FormData(); - var uuid= GetUUID(); + var uuid = GetUUID(); for (var i = 0; i < files.keys().length; i++) { formdata.append("files", files.get(i).get("file")); } @@ -339,44 +338,41 @@ function RequestCompress() { formdata.append("format", format); formdata.append("uuid", uuid); - //압축요청, 압축이 완료되면 다운로드창 띄우기 + //압축요청 $.ajax({ type: "post", url: "/webzip/fileupload", data: formdata, processData: false, - contentType: false, + contentType: false }); - var progress = setInterval(() => { - $.ajax({ - type: "post", - url: "/webzip/fileuploadprogress", - data: "uuid="+uuid - }).done(function(data2) { - var iscomplate = false; - if (data2 == "-1" && iscomplate == false){ - clearInterval(progress); + var Getprogress = function() { + $.ajax({ + type: "post", + url: "/webzip/fileuploadprogress", + data: "uuid=" + uuid, + timeout: 1200000, + success: function(data2) { + $("progress").attr("value", data2); + if (data2 != "-1") { + Getprogress(); + } else { + //modal display none바꾸고 $(".modal").css("display", "none"); + //파일다운로드 요청. var a = document.createElement("a"); - var url = "/webzip/DownloadZip?uuid="+uuid; + var url = "/webzip/DownloadZip?uuid=" + uuid; a.href = url; a.download = directories.get(0) + "." + format; a.click(); window.URL.revokeObjectURL(url); - $("progress").attr("value", "0"); - iscomplate == true; } - else { - if (data2 != "-2"){ - $("progress").attr("value", data2); - } - } - }); - req; - }, 100); - progress; + } + }); + }; + Getprogress(); } } @@ -472,6 +468,7 @@ SetBulletIcon(); SetSortable(); directories.put(0, "example"); +//웹소켓(안씀) // var protocol = location.protocol === "https:" ? "wss:" : "ws:"; // var wsUri = protocol + "//" + window.location.host + "/ws"; // var socket = new WebSocket(wsUri); -- 2.43.0