Revert "Compression.BSA -> Wabbajack.Compression.BSA"

This reverts commit 4fc53ce7b2.
2024-08-30 18:42:17 +00:00 · 2020-06-27 11:04:59 -06:00 · 2020-06-27 11:04:59 -06:00 · 2855b1d1ca
commit 2855b1d1ca
parent 4fc53ce7b2
28 changed files with 26 additions and 87 deletions
--- a/Compression.BSA.Test/BSATests.cs
+++ b/Compression.BSA.Test/BSATests.cs
@ -5,7 +5,6 @@ using System.Linq;
 using System.Threading.Tasks;
 using Newtonsoft.Json;
 using Wabbajack.Common;
-using Wabbajack.Compression.BSA;
 using Wabbajack.Lib.Downloaders;
 using Wabbajack.Lib.NexusApi;
 using Wabbajack.VirtualFileSystem;
--- a/Compression.BSA.Test/Compression.BSA.Test.csproj
+++ b/Compression.BSA.Test/Compression.BSA.Test.csproj
@ -19,9 +19,9 @@


  <ItemGroup>
+    <ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" />
    <ProjectReference Include="..\Wabbajack.Common.CSP\Wabbajack.Common.CSP.csproj" />
    <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-    <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj" />
    <ProjectReference Include="..\Wabbajack.Lib\Wabbajack.Lib.csproj" />
  </ItemGroup>

--- a/Wabbajack.Compression.BSA/BA2Builder.cs
+++ b/Wabbajack.Compression.BSA/BA2Builder.cs
@ -9,7 +9,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
 using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
 using Wabbajack.Common;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    interface IFileBuilder
    {
--- a/Wabbajack.Compression.BSA/BA2Reader.cs
+++ b/Wabbajack.Compression.BSA/BA2Reader.cs
@ -9,7 +9,7 @@ using Wabbajack.Common;
 using Wabbajack.Common.Serialization.Json;
 using File = Alphaleonis.Win32.Filesystem.File;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public enum EntryType
    {
--- a/Wabbajack.Compression.BSA/BSABuilder.cs
+++ b/Wabbajack.Compression.BSA/BSABuilder.cs
@ -11,7 +11,7 @@ using Wabbajack.Common;
 using File = Alphaleonis.Win32.Filesystem.File;
 using Path = Alphaleonis.Win32.Filesystem.Path;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public class BSABuilder : IBSABuilder
    {
--- a/Wabbajack.Compression.BSA/BSADispatch.cs
+++ b/Wabbajack.Compression.BSA/BSADispatch.cs
@ -4,7 +4,7 @@ using System.Text;
 using System.Threading.Tasks;
 using Wabbajack.Common;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public static class BSADispatch
    {
--- a/Wabbajack.Compression.BSA/BSAReader.cs
+++ b/Wabbajack.Compression.BSA/BSAReader.cs
@ -9,7 +9,7 @@ using Wabbajack.Common;
 using Wabbajack.Common.Serialization.Json;
 using File = Alphaleonis.Win32.Filesystem.File;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public enum VersionType : uint
    {
--- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj
+++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.csproj
@ -5,15 +5,11 @@
      <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
      <Platforms>x64</Platforms>
      <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
-      <Version>2.1.0.0</Version>
+      <Version>3.0</Version>
      <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-      <PackageProjectUrl>https://github.com/wabbajack-tools/wabbajack</PackageProjectUrl>
-      <PackageLicenseUrl>https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt</PackageLicenseUrl>
-      <PackageIconUrl>https://www.wabbajack.org/favicon.ico</PackageIconUrl>
-      <RepositoryUrl>https://github.com/wabbajack-tools/wabbajack</RepositoryUrl>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
-      <DocumentationFile>Wabbajack.Compression.BSA.xml</DocumentationFile>
+      <DocumentationFile>Compression.BSA.xml</DocumentationFile>
    </PropertyGroup>
    <ItemGroup>
      <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
--- a/Wabbajack.Compression.BSA/DDS.cs
+++ b/Wabbajack.Compression.BSA/DDS.cs
@ -1,6 +1,6 @@
 using System.Runtime.InteropServices;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    /*
     * Copied from https://raw.githubusercontent.com/AlexxEG/BSA_Browser/master/Sharp.BSA.BA2/BA2Util/DDS.cs
--- a/Wabbajack.Compression.BSA/IBSAReader.cs
+++ b/Wabbajack.Compression.BSA/IBSAReader.cs
@ -4,7 +4,7 @@ using System.IO;
 using System.Threading.Tasks;
 using Wabbajack.Common;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public interface IBSAReader
    {
--- a/Wabbajack.Compression.BSA/Readme.md
+++ b/Wabbajack.Compression.BSA/Readme.md
--- a/Wabbajack.Compression.BSA/TES3Builder.cs
+++ b/Wabbajack.Compression.BSA/TES3Builder.cs
@ -5,7 +5,7 @@ using System.Threading.Tasks;
 using Wabbajack.Common;
 using File = Alphaleonis.Win32.Filesystem.File;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public class TES3Builder : IBSABuilder
    {
--- a/Wabbajack.Compression.BSA/TES3Reader.cs
+++ b/Wabbajack.Compression.BSA/TES3Reader.cs
@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Wabbajack.Common;
 using Wabbajack.Common.Serialization.Json;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    public class TES3Reader : IBSAReader
    {
--- a/Wabbajack.Compression.BSA/Utils.cs
+++ b/Wabbajack.Compression.BSA/Utils.cs
@ -6,7 +6,7 @@ using System.Threading.Tasks;
 using Wabbajack.Common;
 using Path = Alphaleonis.Win32.Filesystem.Path;

-namespace Wabbajack.Compression.BSA
+namespace Compression.BSA
 {
    internal static class Utils
    {
--- a/Wabbajack.CLI/Verbs/BSADump.cs
+++ b/Wabbajack.CLI/Verbs/BSADump.cs
@ -1,7 +1,7 @@
 using System;
 using System.Threading.Tasks;
 using CommandLine;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using Wabbajack.Common;

 namespace Wabbajack.CLI.Verbs
--- a/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf
+++ b/Wabbajack.Common/FileSignatures/Definitions/GKA_software_license.pdf
--- a/Wabbajack.Common/Wabbajack.Common.csproj
+++ b/Wabbajack.Common/Wabbajack.Common.csproj
@ -6,7 +6,7 @@
        <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
        <Nullable>enable</Nullable>
        <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <PackageVersion>2.1.0.0</PackageVersion>
+        <PackageVersion>3.0</PackageVersion>
        <Title>Wabbajack Common Lib</Title>
        <Authors>Wabbajack Team</Authors>
        <Copyright>2020</Copyright>
@ -14,7 +14,7 @@
        <PackageLicenseUrl>https://raw.githubusercontent.com/wabbajack-tools/wabbajack/master/LICENSE.txt</PackageLicenseUrl>
        <PackageIconUrl>https://www.wabbajack.org/favicon.ico</PackageIconUrl>
        <RepositoryUrl>https://github.com/wabbajack-tools/wabbajack</RepositoryUrl>
-        <Version>2.1.0.0</Version>
+        <Version>3.0</Version>
    </PropertyGroup>
    <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
      <DocumentationFile>Wabbajack.Common.xml</DocumentationFile>
--- a/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml
+++ b/Wabbajack.Compression.BSA/Wabbajack.Compression.BSA.xml
@ -1,56 +0,0 @@
-<?xml version="1.0"?>
-<doc>
-    <assembly>
-        <name>Wabbajack.Compression.BSA</name>
-    </assembly>
-    <members>
-        <member name="P:Wabbajack.Compression.BSA.IBSAReader.Files">
-            <summary>
-            The files defined by the archive
-            </summary>
-        </member>
-        <member name="P:Wabbajack.Compression.BSA.IFile.Path">
-            <summary>
-            The path of the file inside the archive
-            </summary>
-        </member>
-        <member name="P:Wabbajack.Compression.BSA.IFile.Size">
-            <summary>
-            The uncompressed file size
-            </summary>
-        </member>
-        <member name="P:Wabbajack.Compression.BSA.IFile.State">
-            <summary>
-            Get the metadata for the file.
-            </summary>
-        </member>
-        <member name="M:Wabbajack.Compression.BSA.IFile.CopyDataTo(System.IO.Stream)">
-            <summary>
-            Copies this entry to the given stream. 100% thread safe, the .bsa will be opened multiple times
-            in order to maintain thread-safe access. 
-            </summary>
-            <param name="output"></param>
-        </member>
-        <member name="M:Wabbajack.Compression.BSA.Utils.ToBZString(Wabbajack.Common.RelativePath,Wabbajack.Compression.BSA.VersionType)">
-            <summary>
-                Returns bytes for a \0 terminated string
-            </summary>
-            <param name="val"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Wabbajack.Compression.BSA.Utils.ToBSString(Wabbajack.Common.RelativePath)">
-            <summary>
-                Returns bytes for unterminated string with a count at the start
-            </summary>
-            <param name="val"></param>
-            <returns></returns>
-        </member>
-        <member name="M:Wabbajack.Compression.BSA.Utils.ToTermString(System.String,Wabbajack.Compression.BSA.VersionType)">
-            <summary>
-                Returns bytes for a \0 terminated string prefixed by a length
-            </summary>
-            <param name="val"></param>
-            <returns></returns>
-        </member>
-    </members>
-</doc>
--- a/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs
+++ b/Wabbajack.Lib/CompilationSteps/DeconstructBSAs.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading.Tasks;
 using Alphaleonis.Win32.Filesystem;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using Newtonsoft.Json;
 using Wabbajack.Common;
 using Wabbajack.Common.StatusFeed.Errors;
--- a/Wabbajack.Lib/Data.cs
+++ b/Wabbajack.Lib/Data.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using Newtonsoft.Json;
 using Wabbajack.Common;
 using Wabbajack.Common.Serialization.Json;
--- a/Wabbajack.Lib/MO2Compiler.cs
+++ b/Wabbajack.Lib/MO2Compiler.cs
@ -1,4 +1,4 @@
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using System;
 using System.Collections.Concurrent;
 using System.Collections.Generic;
--- a/Wabbajack.Lib/Wabbajack.Lib.csproj
+++ b/Wabbajack.Lib/Wabbajack.Lib.csproj
@ -72,8 +72,8 @@
      </PackageReference>
    </ItemGroup>
    <ItemGroup>
+      <ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" />
      <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-      <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj" />
      <ProjectReference Include="..\Wabbajack.VirtualFileSystem\Wabbajack.VirtualFileSystem.csproj" />
    </ItemGroup>
    <ItemGroup>
--- a/Wabbajack.Test/SanityTests.cs
+++ b/Wabbajack.Test/SanityTests.cs
@ -3,7 +3,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using Wabbajack.Common;
 using Wabbajack.Lib;
 using Wabbajack.Lib.CompilationSteps.CompilationErrors;
--- a/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs
+++ b/Wabbajack.VirtualFileSystem/ExtractedBSAFile.cs
@ -2,7 +2,7 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Threading.Tasks;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using Wabbajack.Common;

 namespace Wabbajack.VirtualFileSystem
--- a/Wabbajack.VirtualFileSystem/FileExtractor.cs
+++ b/Wabbajack.VirtualFileSystem/FileExtractor.cs
@ -5,7 +5,7 @@ using System.Linq;
 using System.Reactive.Linq;
 using System.Threading.Tasks;
 using Alphaleonis.Win32.Filesystem;
-using Wabbajack.Compression.BSA;
+using Compression.BSA;
 using OMODFramework;
 using Wabbajack.Common.StatusFeed;
 using Wabbajack.Common.StatusFeed.Errors;
--- a/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
+++ b/Wabbajack.VirtualFileSystem/Wabbajack.VirtualFileSystem.csproj
@ -9,8 +9,8 @@
      <DocumentationFile>Wabbajack.VirtualFileSystem.xml</DocumentationFile>
    </PropertyGroup>
    <ItemGroup>
+      <ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" />
      <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-      <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj" />
    </ItemGroup>
    <ItemGroup>
      <PackageReference Include="Genbox.AlphaFS" Version="2.2.2.1" />
--- a/Wabbajack.sln
+++ b/Wabbajack.sln
@ -5,7 +5,7 @@ VisualStudioVersion = 16.0.29102.190
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Common", "Wabbajack.Common\Wabbajack.Common.csproj", "{B3F3FB6E-B9EB-4F49-9875-D78578BC7AE5}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wabbajack.Compression.BSA", "Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Compression.BSA", "Compression.BSA\Compression.BSA.csproj", "{FF5D892F-8FF4-44FC-8F7F-CD58F307AD1B}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4EDEF6CC-2F5C-439B-BEAF-9D03895099F1}"
 	ProjectSection(SolutionItems) = preProject
--- a/Wabbajack/Wabbajack.csproj
+++ b/Wabbajack/Wabbajack.csproj
@ -80,9 +80,9 @@
  </ItemGroup>

  <ItemGroup>
+    <ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" />
    <ProjectReference Include="..\Wabbajack.CLI\Wabbajack.CLI.csproj" />
    <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
-    <ProjectReference Include="..\Wabbajack.Compression.BSA\Wabbajack.Compression.BSA.csproj" />
    <ProjectReference Include="..\Wabbajack.Lib\Wabbajack.Lib.csproj" />
  </ItemGroup>