From 848e3f2c4f328ec87a9f45636e43c8f784cb5174 Mon Sep 17 00:00:00 2001
From: jocloud <dhkq92@icloud.com>
Date: Fri, 22 May 2020 06:49:54 +0000
Subject: [PATCH] =?utf8?q?f2=20=EC=9D=B4=EB=A6=84=EB=B3=80=EA=B2=BD?=
 =?utf8?q?=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80,=20=EA=B0=81=EC=A2=85=20?=
 =?utf8?q?=EC=97=90=EB=9F=AC=20=ED=94=BD=EC=8A=A4,=20zipexplore=20?=
 =?utf8?q?=EC=9D=B4=EB=A6=84=EA=B8=B8=EA=B2=8C=20=EB=B3=80=EA=B2=BD=20?=
 =?utf8?q?=ED=9B=84=20=EB=A7=88=EC=9A=B0=EC=8A=A4=EB=A1=9C=20=EB=95=85?=
 =?utf8?q?=EC=B0=8D=EC=97=88=EC=9D=84=EB=95=8C=20label=EC=97=90=20dir?=
 =?utf8?q?=EB=A1=9C=20=EC=95=88=EB=93=A4=EC=96=B4=EA=B0=90.=20=EC=88=98?=
 =?utf8?q?=EC=A0=95=EC=A4=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 ZipProject/Models/ZipModel.cs              |  9 ++++++++-
 ZipProject/Views/WebZip/Index.cshtml       |  7 +++++++
 ZipProject/Views/WebZip/partial_zip.cshtml |  4 ++--
 ZipProject/wwwroot/Language/en.json        |  9 ++++++---
 ZipProject/wwwroot/Language/kr.json        |  7 +++++--
 ZipProject/wwwroot/js/Zip/partial_zip.js   | 21 ++++++++++++++-------
 6 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs
index 02cb861..c170715 100644
--- a/ZipProject/Models/ZipModel.cs
+++ b/ZipProject/Models/ZipModel.cs
@@ -76,7 +76,14 @@ namespace ZipProject {
         if (per != (double) (e.BytesTransferred * 100 / e.TotalBytesToTransfer) / (double) 100) {
           per = (double) (e.BytesTransferred * 100 / e.TotalBytesToTransfer) / (double) 100;
           nows = Math.Truncate (nows) + per;
-          SimpleLongPolling.Publish (uuid, nows + "");
+          try{
+            SimpleLongPolling.Publish (uuid, nows + "");
+          }
+          catch(InvalidOperationException ee){
+            ee.Data["result"]= "complate";
+            Console.WriteLine("error fix");
+            SimpleLongPolling.Publish(uuid, "-1");
+          }
         }
       }
     }
diff --git a/ZipProject/Views/WebZip/Index.cshtml b/ZipProject/Views/WebZip/Index.cshtml
index 3af6306..fe3918a 100644
--- a/ZipProject/Views/WebZip/Index.cshtml
+++ b/ZipProject/Views/WebZip/Index.cshtml
@@ -50,6 +50,13 @@
   
   <script src="/static/js:Zip:Index.js" asp-append-version="true"></script>
 
+  <script>
+    $(document).bind('keydown', function(e){
+      if (e.keyCode == 113 && selected_nameChange != undefined){
+        NameFormToggle();
+      }
+    });
+  </script>
 <!-- #region 모바일 클릭, 더블클릭, 드래그(메뉴소환) 이벤트 -->
   <script>
     var bStartEvent= false;
diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml
index 056e808..a85494e 100644
--- a/ZipProject/Views/WebZip/partial_zip.cshtml
+++ b/ZipProject/Views/WebZip/partial_zip.cshtml
@@ -74,7 +74,7 @@
     <i class="fas fa-circle" style="color: rgb(70, 186, 33);"></i>
   </div>
   <div class="modal">
-    <span>@LanguagePack.GetText(lang, "pleasewait") <div><progress value="0" max="1"></progress></div></span>
+    <span><label>@LanguagePack.GetText(lang, "readyforcompress1")<br>@LanguagePack.GetText(lang, "readyforcompress2")</label><div><progress value="0" max="1"></progress></div></span>
   </div>
   <div class="webzip-btn-complate">
     <div class="webzip-btn" onclick="$('.modal').css('display', 'table');RequestCompress();">
@@ -88,7 +88,7 @@
   <directory>
     <bullet is="zip"></bullet>
     <label onmousedown="Clicked($(this))" key="0" id="zip_default">
-      example
+      @LanguagePack.GetText(lang, "newzipfile")
     </label>
     <input type="text" value="example" onkeypress="ChangeKeypress($(this));" style="display:none; line-height:1" onblur="ChangeInput($(this));" onfocus="var a= this.value;this.value= null;this.value= a;" />
     <ul class="sort-disabled">
diff --git a/ZipProject/wwwroot/Language/en.json b/ZipProject/wwwroot/Language/en.json
index 501574a..9e2a8ae 100644
--- a/ZipProject/wwwroot/Language/en.json
+++ b/ZipProject/wwwroot/Language/en.json
@@ -24,15 +24,18 @@
   "renameZip": "Rename zipfile",
   "usersguide": "User's Guide",
   "guide1": "1. Click on the file to select it.",
-  "guide2": "2. The file can be dragged into the folder. <br> ",
+  "guide2": "2. The file can be dragged into the folder.",
   "guide3": "3. Folder is folded when double-clicked and opens when double-clicking again.",
   "guide4": "4. Right-click contextmenu appears.",
   "guide5": "5. For mobile users, the directory function is not possible, and the menu is dragged to the right.",
   "complate": "Complate",
-  "pleasewait": "Compressing files Please wait.",
+  "pleasewait": "Compressing files...",
+  "readyforcompress1": "We are preparing for compression, so please wait ...",
+  "readyforcompress2": "The larger the capacity, the longer it may take to prepare.",
   "iscompress": "proceed with compression? FileSize: ",
   "toolargesize": "The capacity of the files exceeds the maximum file size of 2 GB and can not proceed.",
   "nofilesadded": "No files added.",
   "footIntroduce": "Easy and convenient file compression! Please find NiceZip.",
-  "removefilefolder": "remove file,directory"
+  "removefilefolder": "remove file,directory",
+  "newzipfile": "New zipfile"
 }
diff --git a/ZipProject/wwwroot/Language/kr.json b/ZipProject/wwwroot/Language/kr.json
index a7fa587..db850e4 100644
--- a/ZipProject/wwwroot/Language/kr.json
+++ b/ZipProject/wwwroot/Language/kr.json
@@ -29,10 +29,13 @@
   "guide4": "4. 우클릭시 메뉴가 나타납니다",
   "guide5": "5. 모바일사용자는 디렉토리이동은 불가하며, 메뉴는 오른쪽으로 드래그하시면 나옵니다",
   "complate": "완료",
-  "pleasewait": "압축중입니다 잠시만 기다려주세요.",
+  "pleasewait": "압축중입니다...",
+  "readyforcompress1": "압축을 준비중이니 잠시 기다려주세요...",
+  "readyforcompress2": "용량이 많을수록 준비가 오래걸릴 수 있습니다",
   "iscompress": "압축을 진행하시겠습니까? FileSize: ",
   "toolargesize": "파일들의 용량이 최대파일크기인 2GB를 넘어가서 진행할 수 없습니다.",
   "nofilesadded": "추가된 파일이 없습니다.",
   "footIntroduce": "쉽고 편리한 압축! NiceZip을 찾아주세요.",
-  "removefilefolder": "파일,폴더 제거"
+  "removefilefolder": "파일,폴더 제거",
+  "newzipfile": "새 압축파일"
 }
diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js
index f015ddd..b1ff912 100644
--- a/ZipProject/wwwroot/js/Zip/partial_zip.js
+++ b/ZipProject/wwwroot/js/Zip/partial_zip.js
@@ -362,9 +362,11 @@ function RequestCompress() {
         success: function(data2) {
           $("progress").attr("value", data2);
           if (data2 != "-1") {
+            $(".modal span label").text(_Language["pleasewait"]);
             Getprogress();
           } else {
             //modal display none바꾸고
+            $(".modal span label").html(_Language["readyforcompress1"]+"<br>"+_Language["readyforcompress2"]);
             $(".modal").css("display", "none");
             //파일다운로드 요청.
             var a = document.createElement("a");
@@ -391,19 +393,24 @@ function ChangeKeypress($elem) {
 }
 
 function ChangeInput($elem) {
-  if ($elem.val() == "") {
+  input= $elem.val();
+  input= input.replace(/  /gi, " ");
+  input= input.replace(/　/gi, " ");
+  input= $.trim(input);
+  if (input == "") {
     NotEmptyOrSame($elem.prev());
   }
-  if (isErrFileName($elem.val())) {
+  if (isErrFileName(input)) {
+    $elem.val("dir " + ++sameDir);
     alert(_Language["err_violationFileName"]);
+  } else if (isTooLongFileName(input)) {
     $elem.val("dir " + ++sameDir);
-  } else if (isTooLongFileName($elem.val())) {
     alert(_Language["err_tooLongFileName"]);
-    $elem.val("dir " + ++sameDir);
   } else {
-    directories.put($elem.prev().attr("key"), $elem.val());
+    $elem.val(input);
+    directories.put($elem.prev().attr("key"), input);
   }
-  $elem.prev().text($elem.val());
+  $elem.prev().text(input);
   $elem.css("display", "none");
   $elem.prev().css("display", "");
 }
@@ -486,7 +493,7 @@ document.getElementById("zipExplore").addEventListener("contextmenu", event => {
 //초기세팅(bullet, sort, 기본 zip label 세팅)
 SetBulletIcon();
 SetSortable();
-directories.put(0, "example");
+directories.put(0, _Language["newzipfile"]);
 
 //웹소켓(안씀)
 // var protocol = location.protocol === "https:" ? "wss:" : "ws:";
-- 
2.43.0