Proper stream usage + simpler archive open

indilo53 · Apr 27, 2019 · 9ca3afd · 9ca3afd
1 parent 84881eb
commit 9ca3afd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/RageLib.GTA5/ArchiveWrappers/RageArchiveWrapper7.cs b/RageLib.GTA5/ArchiveWrappers/RageArchiveWrapper7.cs
@@ -680,11 +680,8 @@ public void Import(Stream stream)
         {
             var binaryStream = GetStream();
             binaryStream.SetLength(stream.Length);
-
-            byte[] buf = new byte[stream.Length];
             stream.Position = 0;
-            stream.Read(buf, 0, buf.Length);
-            binaryStream.Write(buf, 0, buf.Length);
+            stream.CopyTo(binaryStream);
         }
 
         /// <summary>
@@ -702,10 +699,7 @@ public void Export(string fileName)
         public void Export(Stream stream)
         {
             var binaryStream = GetStream();
-
-            var buf = new byte[binaryStream.Length];
-            binaryStream.Read(buf, 0, buf.Length);
-            stream.Write(buf, 0, buf.Length);
+            binaryStream.CopyTo(stream);
         }
     }
 

diff --git a/RageLib.GTA5/Utilities/ArchiveUtilities.cs b/RageLib.GTA5/Utilities/ArchiveUtilities.cs
@@ -65,10 +65,7 @@ public static void ForEachFile(string gameDirectoryName, ProcessFileDelegate pro
                 try
                 {
                     var fileName = archiveFileNames[i];
-                    var fileInfo = new FileInfo(fileName);
-                    var fileStream = new FileStream(fileName, FileMode.Open);
-
-                    var inputArchive = RageArchiveWrapper7.Open(fileStream, fileInfo.Name);
+                    var inputArchive = RageArchiveWrapper7.Open(fileName);
                     ForEachFile(fileName.Replace(gameDirectoryName, ""), inputArchive.Root, inputArchive.archive_.Encryption, processDelegate);
                     inputArchive.Dispose();
                 }