Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compression.BSA nullable enabled. Some heavy files disabled

Browse Source
This commit is contained in:
Justin Swanson 2020-08-11 10:28:25 -05:00
parent a6169988c1
commit 56fe093618
9 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Compression.BSA/BA2Builder.cs
View File

@ -8,6 +8,7 @@ using System.Threading.Tasks;
using ICSharpCode.SharpZipLib.Zip.Compression; using ICSharpCode.SharpZipLib.Zip.Compression;
using ICSharpCode.SharpZipLib.Zip.Compression.Streams; using ICSharpCode.SharpZipLib.Zip.Compression.Streams;
using Wabbajack.Common; using Wabbajack.Common;
#nullable disable
namespace Compression.BSA namespace Compression.BSA
{ {

1
Compression.BSA/BA2Reader.cs
View File

@ -8,6 +8,7 @@ using ICSharpCode.SharpZipLib.Zip.Compression;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json; using Wabbajack.Common.Serialization.Json;
using File = Alphaleonis.Win32.Filesystem.File; using File = Alphaleonis.Win32.Filesystem.File;
#nullable disable
namespace Compression.BSA namespace Compression.BSA
{ {

1
Compression.BSA/BSA/Builder/BSABuilder.cs
View File

@ -10,6 +10,7 @@ using K4os.Compression.LZ4.Streams;
using Wabbajack.Common; using Wabbajack.Common;
using File = Alphaleonis.Win32.Filesystem.File; using File = Alphaleonis.Win32.Filesystem.File;
using Path = Alphaleonis.Win32.Filesystem.Path; using Path = Alphaleonis.Win32.Filesystem.Path;
#nullable disable
namespace Compression.BSA namespace Compression.BSA
{ {

4
Compression.BSA/BSA/Reader/BSAReader.cs
View File

@ -18,8 +18,8 @@ namespace Compression.BSA
internal AbsolutePath _fileName; internal AbsolutePath _fileName;
internal uint _folderCount; internal uint _folderCount;
internal uint _folderRecordOffset; internal uint _folderRecordOffset;
private Lazy<FolderRecord[]> _folders; private Lazy<FolderRecord[]> _folders = null!;
internal string _magic; internal string _magic = string.Empty;
internal uint _totalFileNameLength; internal uint _totalFileNameLength;
internal uint _totalFolderNameLength; internal uint _totalFolderNameLength;

5
Compression.BSA/BSA/Reader/BSAStateObject.cs
View File

@ -10,13 +10,13 @@ namespace Compression.BSA
[JsonName("BSAState")] [JsonName("BSAState")]
public class BSAStateObject : ArchiveStateObject public class BSAStateObject : ArchiveStateObject
{ {
public string Magic { get; set; } public string Magic { get; set; } = string.Empty;
public uint Version { get; set; } public uint Version { get; set; }
public uint ArchiveFlags { get; set; } public uint ArchiveFlags { get; set; }
public uint FileFlags { get; set; } public uint FileFlags { get; set; }
public BSAStateObject() public BSAStateObject()
{ {
} }
public BSAStateObject(BSAReader bsaReader) public BSAStateObject(BSAReader bsaReader)
@ -25,7 +25,6 @@ namespace Compression.BSA
Version = (uint)bsaReader.HeaderType; Version = (uint)bsaReader.HeaderType;
ArchiveFlags = (uint)bsaReader.ArchiveFlags; ArchiveFlags = (uint)bsaReader.ArchiveFlags;
FileFlags = (uint)bsaReader.FileFlags; FileFlags = (uint)bsaReader.FileFlags;
} }
public override async Task<IBSABuilder> MakeBuilder(long size) public override async Task<IBSABuilder> MakeBuilder(long size)

6
Compression.BSA/BSA/Reader/FolderRecord.cs
View File

@ -13,11 +13,11 @@ namespace Compression.BSA
{ {
internal readonly BSAReader BSA; internal readonly BSAReader BSA;
private readonly ReadOnlyMemorySlice<byte> _data; private readonly ReadOnlyMemorySlice<byte> _data;
internal Lazy<FileRecord[]> _files; internal Lazy<FileRecord[]> _files = null!;
private int _prevFileCount; private int _prevFileCount;
internal FileNameBlock FileNameBlock; internal FileNameBlock FileNameBlock = null!;
internal int Index { get; } internal int Index { get; }
public string Name { get; private set; } public string? Name { get; private set; }
public IEnumerable<IFile> Files => _files.Value; public IEnumerable<IFile> Files => _files.Value;

2
Compression.BSA/Compression.BSA.csproj
View File

@ -6,6 +6,8 @@
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<RuntimeIdentifier>win10-x64</RuntimeIdentifier> <RuntimeIdentifier>win10-x64</RuntimeIdentifier>
<Version>3.0</Version> <Version>3.0</Version>
<Nullable>enable</Nullable>
<WarningsAsErrors>nullable</WarningsAsErrors>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder>
</PropertyGroup> </PropertyGroup>

2
Compression.BSA/Interfaces/IFolder.cs
View File

@ -6,7 +6,7 @@ namespace Compression.BSA
{ {
public interface IFolder public interface IFolder
{ {
string Name { get; } string? Name { get; }
IEnumerable<IFile> Files { get; } IEnumerable<IFile> Files { get; }
int FileCount { get; } int FileCount { get; }
} }

1
Compression.BSA/TES3Reader.cs
View File

@ -5,6 +5,7 @@ using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Wabbajack.Common; using Wabbajack.Common;
using Wabbajack.Common.Serialization.Json; using Wabbajack.Common.Serialization.Json;
#nullable disable
namespace Compression.BSA namespace Compression.BSA
{ {