Fixed a bug inside the ZipArchiveExtensions class

A bug caused the ZipArchiveExtensions class to ignore EVERY file inside the archive and therefor didn't unpack any. Forgot to put a ! in front of the check if the filename is empty and that caused the problem
daredloco · Oct 24, 2020 · f8a78a3 · f8a78a3
1 parent c3dcfb1
commit f8a78a3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/GitInstaller/GitInstaller/GitInstaller.csproj b/GitInstaller/GitInstaller/GitInstaller.csproj
@@ -115,6 +115,7 @@
       <Generator>SettingsSingleFileGenerator</Generator>
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
+    <None Include="zipsettings.json" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />

diff --git a/GitInstaller/GitInstaller/Properties/AssemblyInfo.cs b/GitInstaller/GitInstaller/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 // indem Sie "*" wie unten gezeigt eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.4.0.0")]
-[assembly: AssemblyFileVersion("1.4.0.0")]
+[assembly: AssemblyVersion("1.4.1.0")]
+[assembly: AssemblyFileVersion("1.4.1.0")]
diff --git a/GitInstaller/GitInstaller/ZipArchiveExtensions.cs b/GitInstaller/GitInstaller/ZipArchiveExtensions.cs
@@ -26,7 +26,7 @@ public static void ExtractToDirectory(this ZipArchive archive, string destinatio
 				if (!Directory.Exists(directory))
 					Directory.CreateDirectory(directory);
 
-				if (string.IsNullOrEmpty(file.Name) && file.Name != "zipsettings.json")
+				if (!string.IsNullOrEmpty(file.Name) && file.Name != "zipsettings.json")
 					file.ExtractToFile(completeFileName, true);
 			}
 		}
@@ -37,18 +37,20 @@ public static void ExtractWithSettings(this ZipArchive archive, string destinati
 			ZipSettings settings = ZipSettings.FromStream(archive.GetEntry("zipsettings.json").Open());
 			if(settings == null)
 			{
+				Console.WriteLine("Settings is NULL!");
 				ExtractToDirectory(archive, destinationDirectoryName, overwrite);
 				return;
 			}
 			foreach(ZipArchiveEntry file in archive.Entries)
 			{
+				Console.WriteLine(file.Name);
 				string completeFileName = Path.Combine(destinationDirectoryName, settings.Subfolder, file.FullName);
 				string directory = Path.GetDirectoryName(completeFileName);
 
 				if (!Directory.Exists(directory))
 					Directory.CreateDirectory(directory);
 
-				if (string.IsNullOrEmpty(file.Name) && file.Name != "zipsettings.json")
+				if (!string.IsNullOrEmpty(file.Name) && file.Name != "zipsettings.json")
 					file.ExtractToFile(completeFileName, overwrite);
 			}
 		}