Fixing the extraction of zip files.

Author: renemadsen

eFormAPI/eFormAPI/Controllers/TemplateFilesController.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Drawing;
 using System.IO;
-using System.IO.Compression;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
@@ -12,6 +11,7 @@
 using eFormApi.BasePn.Infrastructure.Helpers;
 using eFormApi.BasePn.Infrastructure.Messages;
 using eFormApi.BasePn.Infrastructure.Models.API;
+using Ionic.Zip;
 
 namespace eFormAPI.Web.Controllers
 {
@@ -237,14 +237,11 @@ public HttpResponseMessage UploadEformZip()
                 {
                     return Request.CreateResponse(HttpStatusCode.BadRequest, "Folder error");
                 }
-                if (!Directory.Exists(saveFolder))
-                {
-                    Directory.CreateDirectory(saveFolder);
-                }
-                if (!Directory.Exists(zipArchiveFolder))
-                {
-                    Directory.CreateDirectory(zipArchiveFolder);
-                }
+
+                Directory.CreateDirectory(saveFolder);
+
+                Directory.CreateDirectory(zipArchiveFolder);
+
                 var files = HttpContext.Current.Request.Files;
                 if (files.Count > 0)
                 {
@@ -253,22 +250,26 @@ public HttpResponseMessage UploadEformZip()
                     {
                         var filePath = Path.Combine(zipArchiveFolder, Path.GetFileName(httpPostedFile.FileName));
                         var extractPath = Path.Combine(saveFolder);
-                        if (!File.Exists(filePath))
+                        if (File.Exists(filePath))
                         {
-                            httpPostedFile.SaveAs(filePath);
+                            File.Delete(filePath);
                         }
+                        httpPostedFile.SaveAs(filePath);
                         if (File.Exists(filePath))
                         {
-                            if (!Directory.Exists(extractPath))
-                            {
-                                Directory.CreateDirectory(extractPath);
-                            }
-                            else
+                            Directory.CreateDirectory(extractPath);
+                            FoldersHelper.ClearFolder(extractPath);
+
+                            using (var zip = ZipFile.Read(filePath))
                             {
-                                FoldersHelper.ClearFolder(extractPath);
+                                foreach (var entry in zip.Entries)
+                                {
+                                    if (entry.FileName.Contains(".png") || entry.FileName.Contains("jrxml"))
+                                    {
+                                        entry.Extract(extractPath);
+                                    }
+                                }
                             }
-
-                            ZipFile.ExtractToDirectory(filePath, extractPath);
                             File.Delete(filePath);
                             _coreHelper.bus.SendLocal(new GenerateJasperFiles(templateId));
 
@@ -278,10 +279,12 @@ public HttpResponseMessage UploadEformZip()
                 }
                 return Request.CreateResponse(HttpStatusCode.BadRequest, LocaleHelper.GetString("InvalidRequest"));
             }
-            catch (Exception)
+            catch (Exception ex)
             {
                 return new HttpResponseMessage(HttpStatusCode.InternalServerError);
             }
         }
     }
+
+
 }

eFormAPI/eFormAPI/eFormAPI.Web.csproj

@@ -82,6 +82,9 @@
     <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
+    <Reference Include="DotNetZip, Version=1.11.0.0, Culture=neutral, PublicKeyToken=6583c7c814667745, processorArchitecture=MSIL">
+      <HintPath>..\packages\DotNetZip.1.11.0\lib\net20\DotNetZip.dll</HintPath>
+    </Reference>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
     </Reference>

eFormAPI/eFormAPI/packages.config

@@ -9,6 +9,7 @@
   <package id="Base32" version="1.0.0.26" targetFramework="net461" />
   <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
   <package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />
+  <package id="DotNetZip" version="1.11.0" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="EPPlus" version="4.5.2.1" targetFramework="net461" />
   <package id="Microsoft.AspNet.Cors" version="5.0.0" targetFramework="net46" />