From: joinsang <dhkq92@icloud.com>
Date: Sun, 17 Feb 2019 11:35:47 +0000 (+0900)
Subject: 병합 위한 커밋
X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=f66b06230f0a2f7a6df85bbd0eaf4a1f24712868;p=ZipProject.git

병합 위한 커밋
---

diff --git a/MinZip/MinZip.cpp b/MinZip/MinZip.cpp
index ee8c0d1..3f2a746 100644
Binary files a/MinZip/MinZip.cpp and b/MinZip/MinZip.cpp differ
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: /<controller>/
-        public IActionResult Index(string partial_name)
-        {
+    public WebZipController (IHttpContextAccessor httpContextAccessor) {
+      this.session = httpContextAccessor.HttpContext.Session;
+    }
 
-            ZipModel zmodel = new ZipModel();
-            zmodel.MakeZip("test");
+    // GET: /<controller>/
+    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<dynamic>(json);
+      dynamic result = JsonConvert.DeserializeObject<dynamic> (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?}");
       });
     }
-  }
-}
+  }
+}