From e5ecd371c67de689401a085a47219ba3924f79a0 Mon Sep 17 00:00:00 2001 From: joinsang Date: Sun, 3 Mar 2019 19:14:56 +0900 Subject: [PATCH] =?utf8?q?=EC=95=95=EC=B6=95=20=ED=8E=98=EC=9D=B4=EC=A7=80?= =?utf8?q?=20=EC=99=84=EC=84=B1?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 디자인 나쁘지 않다. 압축풀기 페이지 하자 --- ZipProject/Models/ZipModel.cs | 11 +- ZipProject/Views/WebZip/partial_zip.cshtml | 4 +- ZipProject/_publish/ZipProject.Views.dll | Bin 72192 -> 72192 bytes ZipProject/_publish/ZipProject.Views.pdb | Bin 5440 -> 5440 bytes ZipProject/_publish/ZipProject.dll | Bin 26112 -> 26112 bytes ZipProject/_publish/ZipProject.pdb | Bin 2664 -> 2628 bytes .../_publish/_publish/ZipProject.deps.json | 5151 +++++++++++++++++ .../_publish/ZipProject.runtimeconfig.json | 12 + .../wwwroot/lib/jquery-validation/.bower.json | 41 + .../_publish/wwwroot/lib/jquery/.bower.json | 26 + .../_publish/wwwroot/Language/kr.json | 3 +- .../_publish/wwwroot/js/Zip/partial_zip.js | 105 +- ZipProject/wwwroot/js/Zip/partial_zip.js | 105 +- 13 files changed, 5353 insertions(+), 105 deletions(-) create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.deps.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/ZipProject.runtimeconfig.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery-validation/.bower.json create mode 100644 ZipProject/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/_publish/wwwroot/lib/jquery/.bower.json diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs index a1226aa..a543a48 100644 --- a/ZipProject/Models/ZipModel.cs +++ b/ZipProject/Models/ZipModel.cs @@ -16,24 +16,23 @@ namespace ZipProject { public ZipModel () { } public MemoryStream MakeZip (JObject keypair, string[] dirList, List files) { - MemoryStream memoryStream = new MemoryStream (); + using (var zip = new ZipFile (Encoding.UTF8)) { byte[] b = null; string filename = null; - string dir= null; + string dir = null; foreach (IFormFile file in files) { - //루프중 파일의 인덱스값 - int index= files.IndexOf(file); - dir= dirList[Int32.Parse((string)keypair[file.FileName])] +"/"; + //keypair 디렉토리 키값이 0(압축파일 최상단에 놓여야할 파일)일경우 "" 아닐경우 디렉토리명/파일 식으로 세팅 + dir = ((string) keypair[file.FileName] == "0") ? "" : dirList[Int32.Parse ((string) keypair[file.FileName])] + "/"; //시스템의 기본 인코딩 타입으로 읽어서 b = Encoding.Default.GetBytes (file.FileName); //utf8로 변환해 준다. filename = Encoding.UTF8.GetString (b); //파일을 zip엔트리에 추가 - zip.AddEntry (dir+filename, file.OpenReadStream ()); + zip.AddEntry (dir + filename, file.OpenReadStream ()); } //메모리스트림에 저장 diff --git a/ZipProject/Views/WebZip/partial_zip.cshtml b/ZipProject/Views/WebZip/partial_zip.cshtml index 0d37ac5..41403f0 100644 --- a/ZipProject/Views/WebZip/partial_zip.cshtml +++ b/ZipProject/Views/WebZip/partial_zip.cshtml @@ -7,7 +7,7 @@ margin-left: 20px; } .webzip-explore-placeholder { - margin-left: 10px; + margin-left: 20px; } .webzip-section-sidezip table tbody td{ line-height: 2; @@ -142,7 +142,7 @@ - +