From: min Date: Sun, 17 Feb 2019 10:12:31 +0000 (+0900) Subject: 2번째 커밋 테스트-모듈 추가 X-Git-Url: https://git.insang.kr/gitweb/?a=commitdiff_plain;h=344e777c0ab53c1066f98902b9163fae5e9604ee;p=ZipProject.git 2번째 커밋 테스트-모듈 추가 --- diff --git a/MinZip/MinZip.cpp b/MinZip/MinZip.cpp new file mode 100644 index 0000000..ee8c0d1 Binary files /dev/null and b/MinZip/MinZip.cpp differ diff --git a/MinZip/MinZip.vcxproj b/MinZip/MinZip.vcxproj new file mode 100644 index 0000000..7cc6cc2 --- /dev/null +++ b/MinZip/MinZip.vcxproj @@ -0,0 +1,166 @@ + + + + + Debug + Win32 + + + Release + Win32 + + + Debug + x64 + + + Release + x64 + + + + 15.0 + {D089DAE3-5308-4394-81A8-95811E4F2EC5} + Win32Proj + MinZip + 10.0.17134.0 + + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + DynamicLibrary + true + v141 + Unicode + + + DynamicLibrary + false + v141 + true + Unicode + + + + + + + + + + + + + + + + + + + + + true + + + true + + + false + + + false + + + + Use + Level3 + Disabled + true + WIN32;_DEBUG;MINZIP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + Disabled + true + _DEBUG;MINZIP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + + + + + Use + Level3 + MaxSpeed + true + true + true + WIN32;NDEBUG;MINZIP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + Use + Level3 + MaxSpeed + true + true + true + NDEBUG;MINZIP_EXPORTS;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) + true + + + Windows + true + true + true + + + + + + + + + + + Create + Create + Create + Create + + + + + + \ No newline at end of file diff --git a/MinZip/MinZip.vcxproj.filters b/MinZip/MinZip.vcxproj.filters new file mode 100644 index 0000000..f464954 --- /dev/null +++ b/MinZip/MinZip.vcxproj.filters @@ -0,0 +1,36 @@ + + + + + {4FC737F1-C7A5-4376-A066-2A32D752A2FF} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {93995380-89BD-4b04-88EB-625FBE52EBFB} + h;hh;hpp;hxx;hm;inl;inc;ipp;xsd + + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + 헤더 파일 + + + 헤더 파일 + + + + + 소스 파일 + + + 소스 파일 + + + 소스 파일 + + + \ No newline at end of file diff --git a/MinZip/dllmain.cpp b/MinZip/dllmain.cpp new file mode 100644 index 0000000..a842a5c Binary files /dev/null and b/MinZip/dllmain.cpp differ diff --git a/MinZip/stdafx.cpp b/MinZip/stdafx.cpp new file mode 100644 index 0000000..08343af Binary files /dev/null and b/MinZip/stdafx.cpp differ diff --git a/MinZip/stdafx.h b/MinZip/stdafx.h new file mode 100644 index 0000000..95a9ed4 Binary files /dev/null and b/MinZip/stdafx.h differ diff --git a/MinZip/targetver.h b/MinZip/targetver.h new file mode 100644 index 0000000..0d3b8f8 Binary files /dev/null and b/MinZip/targetver.h differ diff --git a/ZipProject.sln b/ZipProject.sln index 0272fc7..6149bd4 100644 --- a/ZipProject.sln +++ b/ZipProject.sln @@ -1,24 +1,55 @@ - Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ZipProject", "ZipProject\ZipProject.csproj", "{8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}" +VisualStudioVersion = 15.0.28010.2046 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ZipProject", "ZipProject\ZipProject.csproj", "{8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MinZip", "MinZip\MinZip.vcxproj", "{D089DAE3-5308-4394-81A8-95811E4F2EC5}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|x64.ActiveCfg = Debug|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|x64.Build.0 = Debug|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|x86.ActiveCfg = Debug|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Debug|x86.Build.0 = Debug|Any CPU {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|Any CPU.ActiveCfg = Release|Any CPU {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|Any CPU.Build.0 = Release|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x64.ActiveCfg = Release|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x64.Build.0 = Release|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x86.ActiveCfg = Release|Any CPU + {8DD9DB0B-FD7E-428A-B11E-BEB93D8FC50E}.Release|x86.Build.0 = Release|Any CPU + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|Any CPU.ActiveCfg = Debug|Win32 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x64.ActiveCfg = Debug|x64 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x64.Build.0 = Debug|x64 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x86.ActiveCfg = Debug|Win32 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Debug|x86.Build.0 = Debug|Win32 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|Any CPU.ActiveCfg = Release|Win32 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x64.ActiveCfg = Release|x64 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x64.Build.0 = Release|x64 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x86.ActiveCfg = Release|Win32 + {D089DAE3-5308-4394-81A8-95811E4F2EC5}.Release|x86.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {C551BC7A-D12E-4A97-9B4A-2A9172591DD5} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution Policies = $0 $0.DotNetNamingPolicy = $1 $1.DirectoryNamespaceAssociation = PrefixedHierarchical - $0.TextStylePolicy = $2 + $0.TextStylePolicy = $16 $2.FileWidth = 80 $2.TabWidth = 2 $2.TabsToSpaces = True @@ -26,51 +57,42 @@ Global $2.scope = text/x-csharp $0.CSharpFormattingPolicy = $3 $3.scope = text/x-csharp - $0.TextStylePolicy = $4 $4.FileWidth = 80 $4.TabsToSpaces = True $4.scope = text/plain - $0.TextStylePolicy = $5 $5.TabWidth = 2 $5.TabsToSpaces = True $5.IndentWidth = 2 $5.NoTabsAfterNonTabs = True $5.scope = text/x-cshtml-core-web - $0.HTMLFormattingPolicy = $6 + $0.HTMLFormattingPolicy = $10 $6.inheritsSet = null $6.scope = text/x-cshtml-core-web - $0.TextStylePolicy = $7 $7.TabWidth = 2 $7.TabsToSpaces = True $7.IndentWidth = 2 $7.NoTabsAfterNonTabs = True $7.scope = text/x-cshtml-web - $0.HTMLFormattingPolicy = $8 $8.inheritsSet = null $8.scope = text/x-cshtml-web - $0.TextStylePolicy = $9 $9.TabWidth = 2 $9.TabsToSpaces = True $9.IndentWidth = 2 $9.NoTabsAfterNonTabs = True $9.scope = text/x-html - $0.HTMLFormattingPolicy = $10 $10.FormatOnPaste = True $10.XHTMLCodingStyle = True $10.scope = text/x-html - $0.TextStylePolicy = $11 $11.FileWidth = 80 $11.TabWidth = 2 $11.TabsToSpaces = True $11.IndentWidth = 2 $11.scope = text/x-web - $0.TextStylePolicy = $12 $12.FileWidth = 80 $12.TabWidth = 2 $12.TabsToSpaces = True $12.IndentWidth = 2 $12.scope = text/x-vs - $0.TextStylePolicy = $13 $13.TabWidth = 2 $13.TabsToSpaces = True $13.IndentWidth = 2 @@ -82,13 +104,11 @@ Global $14.FormatOnPaste = True $14.HierarchicalIndentation = True $14.scope = text/x-css - $0.TextStylePolicy = $15 $15.FileWidth = 80 $15.TabWidth = 2 $15.TabsToSpaces = True $15.IndentWidth = 2 $15.scope = text/x-javascript - $0.TextStylePolicy = $16 $16.inheritsSet = null $16.scope = text/x-json $0.JSONFormattingPolicy = $17 diff --git "a/ZipProject/.\\result.zip" "b/ZipProject/.\\result.zip" deleted file mode 100644 index 15cb0ec..0000000 Binary files "a/ZipProject/.\\result.zip" and /dev/null differ diff --git a/ZipProject/Controllers/WebZipController.cs b/ZipProject/Controllers/WebZipController.cs index 15841da..2f5ea44 100644 --- a/ZipProject/Controllers/WebZipController.cs +++ b/ZipProject/Controllers/WebZipController.cs @@ -6,50 +6,60 @@ using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Http; 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 - { + public class WebZipController : Controller + { - private readonly ISession session; + private readonly ISession session; - public WebZipController(IHttpContextAccessor httpContextAccessor) - { - this.session = httpContextAccessor.HttpContext.Session; - } + public WebZipController(IHttpContextAccessor httpContextAccessor) + { + this.session = httpContextAccessor.HttpContext.Session; + } - // GET: // - public IActionResult Index(string partial_name) - { + // GET: // + public IActionResult Index(string partial_name) + { - ZipModel zmodel = new ZipModel(); - zmodel.MakeZip("test"); + 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(); + } - public IActionResult En() - { - session.SetString("lang", "en"); - return Redirect("/"); - } + // Request files + public IActionResult ProcessingFiles() + { + + return null; + } + + public IActionResult En() + { + session.SetString("lang", "en"); + return Redirect("/"); + } + + public IActionResult Kr() + { + session.SetString("lang", "kr"); + return Redirect("/"); + } - public IActionResult Kr() - { - session.SetString("lang", "kr"); - return Redirect("/"); } + [DllImport("test1.dll")] - } } diff --git a/ZipProject/wwwroot/js/Zip/partial_zip.js b/ZipProject/wwwroot/js/Zip/partial_zip.js index c683cd4..79319aa 100644 --- a/ZipProject/wwwroot/js/Zip/partial_zip.js +++ b/ZipProject/wwwroot/js/Zip/partial_zip.js @@ -163,7 +163,7 @@ function SetBulletIcon() { } function isDuplicateFile(frontfiles) { - for (var i = 0; i < frontfiles.length; i++) { + for (var i = 0; i < frontfiles.length; i++) { for (var o = 0; o < files.keys().length; o++) { if (frontfiles[i].name == files.get(o).get("file").name) { return true;