From f66b06230f0a2f7a6df85bbd0eaf4a1f24712868 Mon Sep 17 00:00:00 2001 From: joinsang Date: Sun, 17 Feb 2019 20:35:47 +0900 Subject: [PATCH] =?utf8?q?=EB=B3=91=ED=95=A9=20=EC=9C=84=ED=95=9C=20?= =?utf8?q?=EC=BB=A4=EB=B0=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- MinZip/MinZip.cpp | Bin 388 -> 466 bytes ZipProject/Controllers/WebZipController.cs | 78 +++++++++------------ ZipProject/Models/LanguagePack.cs | 19 +++-- ZipProject/Models/ZipModel.cs | 22 +++--- ZipProject/Startup.cs | 34 ++++----- 5 files changed, 67 insertions(+), 86 deletions(-) diff --git a/MinZip/MinZip.cpp b/MinZip/MinZip.cpp index ee8c0d197da7099a22c195a7c7e06e33d9ec5edb..3f2a746f77061013f7625d3ab0a380a7c53822f4 100644 GIT binary patch delta 169 zcmZo+zQjCXj%^-8B10}iDnl_t0g#mpWGOKCGGsF3F+>5$0)}b^UIs1(P9Uq4A&DUe zD3%OVQ3O<%#-K29zPdC>st71t2Gm{x6t)6u0Bf3fS5^{LCz9l3en#ENR*WVJoD8*4 QJ8BuM!7KFz4l^$U*TkFZlbIMLCd)9&h!!xEG9)qNFk~_$GgvVIB|&&{AfxW&21X;X OTChkhgEdSBOalO0y9}uS diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs index 1968390..fe8fa1b 100644 --- a/ZipProject/Controllers/WebZipController.cs +++ b/ZipProject/Controllers/WebZipController.cs @@ -2,63 +2,53 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.Mvc; using ZipProject.Models; - // For more information on enabling MVC for empty projects, visit https://go.microsoft.com/fwlink/?LinkID=397860 -namespace ZipProject.Controllers -{ - public class WebZipController : Controller - { +namespace ZipProject.Controllers { + public class WebZipController : Controller { - private readonly ISession session; + private readonly ISession session; - public WebZipController(IHttpContextAccessor httpContextAccessor) - { - this.session = httpContextAccessor.HttpContext.Session; - } - - // GET: // - public IActionResult Index(string partial_name) - { + public WebZipController (IHttpContextAccessor httpContextAccessor) { + this.session = httpContextAccessor.HttpContext.Session; + } - ZipModel zmodel = new ZipModel(); - zmodel.MakeZip("test"); + // GET: // + public IActionResult Index (string partial_name) { + ZipModel zmodel = new ZipModel (); + zmodel.MakeZip ("test"); - if (string.IsNullOrEmpty(HttpContext.Session.GetString("lang"))) - { - session.SetString("lang", "kr"); - } + if (string.IsNullOrEmpty (HttpContext.Session.GetString ("lang"))) { + session.SetString ("lang", "kr"); + } - if (string.IsNullOrEmpty(partial_name)) - ViewData["partial_page"] = "partial_zip"; - else - ViewData["partial_page"] = partial_name; - return View(); - } + if (string.IsNullOrEmpty (partial_name)) + ViewData["partial_page"] = "partial_zip"; + else + ViewData["partial_page"] = partial_name; + return View (); + } - // Request files - public IActionResult ProcessingFiles() - { + // Request files + public IActionResult ProcessingFiles () { - return null; - } - - public IActionResult En() - { - session.SetString("lang", "en"); - return Redirect("/"); - } + return null; + } - public IActionResult Kr() - { - session.SetString("lang", "kr"); - return Redirect("/"); - } + public IActionResult En () { + session.SetString ("lang", "en"); + return Redirect ("/"); + } + public IActionResult Kr () { + session.SetString ("lang", "kr"); + return Redirect ("/"); } -} + } + +} \ No newline at end of file diff --git a/ZipProject/Models/LanguagePack.cs b/ZipProject/Models/LanguagePack.cs index 4282bb5..3e01bc7 100644 --- a/ZipProject/Models/LanguagePack.cs +++ b/ZipProject/Models/LanguagePack.cs @@ -1,24 +1,21 @@ using System; -using Newtonsoft.Json; using System.IO; +using Newtonsoft.Json; -namespace ZipProject.Models -{ - public static class LanguagePack - { +namespace ZipProject.Models { + public static class LanguagePack { - public static string GetText(string lang, string id) - { + public static string GetText (string lang, string id) { string path = Environment.CurrentDirectory + "/wwwroot/Language/" + lang + ".json"; - string json = File.OpenText(path).ReadToEnd(); + string json = File.OpenText (path).ReadToEnd (); - dynamic result = JsonConvert.DeserializeObject(json); + dynamic result = JsonConvert.DeserializeObject (json); - return (string)result[id]; + return (string) result[id]; } } -} +} \ No newline at end of file diff --git a/ZipProject/Models/ZipModel.cs b/ZipProject/Models/ZipModel.cs index 2fc12ea..ada818b 100644 --- a/ZipProject/Models/ZipModel.cs +++ b/ZipProject/Models/ZipModel.cs @@ -1,23 +1,17 @@ using Ionic.Zip; -namespace ZipProject -{ - public class ZipModel - { +namespace ZipProject { + public class ZipModel { private readonly string[] _FOTMAT = { "zip", "7z", "rar" }; - public ZipModel() - { - } + public ZipModel () { } - public void MakeZip(string name, string format = "zip") - { - using (ZipFile zip = new ZipFile()) - { - //zip.AddDirectory("_zip/test"); - //zip.Save("_zip/" + name + ".zip"); + public void MakeZip (string name, string format = "zip") { + using (ZipFile zip = new ZipFile ()) { + zip.AddDirectory("_zip/test"); + zip.Save("_zip/" + name + ".zip"); } } } -} +} \ No newline at end of file diff --git a/ZipProject/Startup.cs b/ZipProject/Startup.cs index a9547a2..f33d324 100644 --- a/ZipProject/Startup.cs +++ b/ZipProject/Startup.cs @@ -1,19 +1,19 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.HttpsPolicy; -using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; - -namespace ZipProject +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.AspNetCore.Http; +using Microsoft.AspNetCore.HttpsPolicy; +using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; + +namespace ZipProject { public class Startup - { + { public Startup(IConfiguration configuration) { Configuration = configuration; @@ -30,7 +30,7 @@ namespace ZipProject options.CheckConsentNeeded = context => false; options.MinimumSameSitePolicy = SameSiteMode.None; }); - services.AddSession(s => s.IdleTimeout = TimeSpan.FromMinutes(5)); + services.AddSession(s => s.IdleTimeout = TimeSpan.FromMinutes(5)); services.AddHttpContextAccessor(); services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1); } @@ -60,5 +60,5 @@ namespace ZipProject template: "{controller=WebZip}/{action=Index}/{id?}"); }); } - } -} + } +} -- 2.43.0