SharpBSABA2

ModAnalyzer/Domain/AssetArchiveAnalyzer.cs

@@ -1,5 +1,5 @@
-using BA2Lib;
-using libbsa;
+using SharpBSABA2.BA2Util;
+using SharpBSABA2.BSAUtil;
 using ModAnalyzer.Utils;
 using SharpCompress.Archive;
 using SharpCompress.Common;
@@ -9,7 +9,9 @@
 using System.IO;
 using System.Linq;
 
+
 namespace ModAnalyzer.Domain {
+
     internal class AssetArchiveAnalyzer {
         private readonly BackgroundWorker _backgroundWorker;
 
@@ -68,10 +70,12 @@ private string[] GetBSAAssets(string bsaPath) {
             string[] entries = null;
 
             // create BSAManager and use it to get the assets from the BSA
-            BSANET bsaManager = new BSANET();
-            if (bsaManager.bsa_open(bsaPath) == 0)
-                entries = bsaManager.bsa_get_assets(".*");
-            bsaManager.bsa_close();
+            if (BSA.IsSupportedVersion(bsaPath))
+            {
+                BSA bsaManager = new BSA(bsaPath);
+                entries = bsaManager.Files.Select(file => file.FullPath).ToArray();
+                bsaManager.Close();
+            }
 
             // return the entries we found
             return entries;
@@ -81,10 +85,9 @@ private string[] GetBA2Assets(string ba2Path) {
             string[] entries = null;
 
             // create ba2Manager and use it to get the assets from the BA2
-            using (BA2NET ba2Manager = new BA2NET()) {
-                if (ba2Manager.Open(ba2Path))
-                    entries = ba2Manager.GetNameTable();
-            }
+            BA2 bsaManager = new BA2(ba2Path);
+            entries = bsaManager.Files.Select(file => file.FullPath).ToArray();
+            bsaManager.Close();
 
             // return the entries we found
             return entries;

ModAnalyzer/ModAnalyzer.csproj

@@ -102,10 +102,6 @@
     <ApplicationIcon>favicon.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="BA2Lib, Version=1.0.5941.16591, Culture=neutral, processorArchitecture=x86">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>lib\BA2Lib.dll</HintPath>
-    </Reference>
     <Reference Include="GalaSoft.MvvmLight, Version=5.3.0.19026, Culture=neutral, PublicKeyToken=e7570ab207bcb616, processorArchitecture=MSIL">
       <HintPath>..\packages\MvvmLightLibs.5.3.0.0\lib\net45\GalaSoft.MvvmLight.dll</HintPath>
       <Private>True</Private>
@@ -122,9 +118,6 @@
       <HintPath>..\packages\ini-parser.2.3.0\lib\net20\INIFileParser.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="libbsa">
-      <HintPath>lib\libbsa.dll</HintPath>
-    </Reference>
     <Reference Include="MaterialDesignColors, Version=1.1.2.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\packages\MaterialDesignColors.1.1.2\lib\net45\MaterialDesignColors.dll</HintPath>
       <Private>True</Private>
@@ -145,6 +138,10 @@
       <HintPath>..\packages\Octokit.0.22.0\lib\net45\Octokit.dll</HintPath>
       <Private>True</Private>
     </Reference>
+    <Reference Include="Sharp.BSA.BA2, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>lib\Sharp.BSA.BA2.dll</HintPath>
+    </Reference>
     <Reference Include="SharpCompress, Version=0.11.6.0, Culture=neutral, PublicKeyToken=beaf6f427e128133, processorArchitecture=MSIL">
       <HintPath>..\packages\sharpcompress.0.11.6\lib\net40\SharpCompress.dll</HintPath>
       <Private>True</Private>
@@ -272,12 +269,6 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="lib\BA2Lib.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
-    <None Include="lib\libbsa.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </None>
     <None Include="ModDumpLib.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -299,6 +290,21 @@
     <Content Include="borlndmm.dll">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
+    <None Include="lib\ICSharpCode.SharpZipLib.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="lib\lz4.AnyCPU.loader.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="lib\lz4.x64.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="lib\lz4.x86.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Include="lib\Sharp.BSA.BA2.dll">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <!--<Resource Include="FodyWeavers.xml" />-->
   </ItemGroup>
   <ItemGroup>