claunia/SabreTools
1
0
Fork 0
mirror of https://github.com/claunia/SabreTools.git synced 2025-12-16 19:14:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge Filtering into DatTools

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-30 11:26:56 -04:00
parent 9e637021b1
commit 0e5572ff18
19 changed files with 19 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
RombaSharp/RombaSharp.csproj
View File

@@ -40,7 +40,6 @@
<ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
<ProjectReference Include="..\SabreTools.DatTools\SabreTools.DatTools.csproj" />
<ProjectReference Include="..\SabreTools.FileTypes\SabreTools.FileTypes.csproj" />
<ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
<ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
</ItemGroup>

2
SabreTools.Filtering/Cleaner.cs → SabreTools.DatTools/Cleaner.cs
View File

@@ -6,7 +6,7 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
/// <summary>
/// Represents the cleaning operations that need to be performed on a set of items, usually a DAT

1
SabreTools.DatTools/DatFileTool.cs
View File

@@ -6,7 +6,6 @@ using System.Threading.Tasks;
#endif
using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.Filtering;
using SabreTools.IO;
using SabreTools.IO.Logging;

2
SabreTools.Filtering/ExtraIni.cs → SabreTools.DatTools/ExtraIni.cs
View File

@@ -5,7 +5,7 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
public class ExtraIni
{

4
SabreTools.Filtering/Splitter.cs → SabreTools.DatTools/MergeSplit.cs
View File

@@ -4,9 +4,9 @@ using SabreTools.DatFiles;
using SabreTools.DatItems;
using SabreTools.IO.Logging;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
public class Splitter
public class MergeSplit
{
#region Fields

2
SabreTools.Filtering/Remover.cs → SabreTools.DatTools/Remover.cs
View File

@@ -3,7 +3,7 @@ using SabreTools.Core.Filter;
using SabreTools.DatFiles;
using SabreTools.IO.Logging;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
/// <summary>
/// Represents the removal operations that need to be performed on a set of items, usually a DAT

2
SabreTools.Filtering/Replacer.cs → SabreTools.DatTools/Replacer.cs
View File

@@ -4,7 +4,7 @@ using SabreTools.Core.Tools;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
/// <summary>
/// Replace fields in DatItems

5
SabreTools.DatTools/SabreTools.DatTools.csproj
View File

@@ -33,12 +33,15 @@
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="SabreTools.Test" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
<ProjectReference Include="..\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
<ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
<ProjectReference Include="..\SabreTools.FileTypes\SabreTools.FileTypes.csproj" />
<ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
<ProjectReference Include="..\SabreTools.Reports\SabreTools.Reports.csproj" />
</ItemGroup>

2
SabreTools.Filtering/Setter.cs → SabreTools.DatTools/Setter.cs
View File

@@ -7,7 +7,7 @@ using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.IO.Logging;
namespace SabreTools.Filtering
namespace SabreTools.DatTools
{
/// <summary>
/// Set fields on DatItems

50
SabreTools.Filtering/SabreTools.Filtering.csproj
View File

@@ -1,50 +0,0 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<!-- Assembly Properties -->
<TargetFrameworks>net20;net35;net40;net452;net462;net472;net48;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0</TargetFrameworks>
<CheckEolTargetFramework>false</CheckEolTargetFramework>
<IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
<LangVersion>latest</LangVersion>
<Nullable>enable</Nullable>
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<Version>1.1.2</Version>
<!-- Package Properties -->
<Authors>Matt Nadareski</Authors>
<Copyright>Copyright (c)2016-2024 Matt Nadareski</Copyright>
<PackageProjectUrl>https://github.com/SabreTools/</PackageProjectUrl>
<RepositoryUrl>https://github.com/SabreTools/SabreTools</RepositoryUrl>
<RepositoryType>git</RepositoryType>
</PropertyGroup>
<!-- Support All Frameworks -->
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
<RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`))">
<RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
</PropertyGroup>
<PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
<TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<InternalsVisibleTo Include="SabreTools.Test" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\SabreTools.Core\SabreTools.Core.csproj" />
<ProjectReference Include="..\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
<ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.4.13" />
</ItemGroup>
</Project>

2
SabreTools.Test/DatFiles/SetterTests.cs
View File

@@ -1,7 +1,7 @@
using SabreTools.Core.Filter;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.DatFiles

2
SabreTools.Test/Filtering/CleaningTests.cs
View File

@@ -1,6 +1,6 @@
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering

2
SabreTools.Test/Filtering/PopulationTests.cs
View File

@@ -1,5 +1,5 @@
using System.Collections.Generic;
using SabreTools.Filtering;
using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering

2
SabreTools.Test/Filtering/ReplacerTests.cs
View File

@@ -1,7 +1,7 @@
using System.Collections.Generic;
using SabreTools.DatItems;
using SabreTools.DatItems.Formats;
using SabreTools.Filtering;
using SabreTools.DatTools;
using Xunit;
namespace SabreTools.Test.Filtering

1
SabreTools.Test/SabreTools.Test.csproj
View File

@@ -13,7 +13,6 @@
<ProjectReference Include="..\SabreTools.DatItems\SabreTools.DatItems.csproj" />
<ProjectReference Include="..\SabreTools.DatTools\SabreTools.DatTools.csproj" />
<ProjectReference Include="..\SabreTools.FileTypes\SabreTools.FileTypes.csproj" />
<ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
</ItemGroup>
<ItemGroup>

10
SabreTools.sln
View File

@@ -20,8 +20,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Core", "SabreToo
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Help", "SabreTools.Help\SabreTools.Help.csproj", "{55364167-844F-4B58-8280-F5327FA3D8E7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.Filtering", "SabreTools.Filtering\SabreTools.Filtering.csproj", "{35129634-0F13-416A-8D4D-35B71DFECFFD}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.FileTypes", "SabreTools.FileTypes\SabreTools.FileTypes.csproj", "{0B36F39B-69CB-4E8A-B251-D063CB08B247}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SabreTools.DatItems", "SabreTools.DatItems\SabreTools.DatItems.csproj", "{90ADE461-33B1-4E0D-925F-C99913665F0C}"
@@ -80,14 +78,6 @@ Global
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|Any CPU.Build.0 = Release|Any CPU
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|x64.ActiveCfg = Release|Any CPU
{55364167-844F-4B58-8280-F5327FA3D8E7}.Release|x64.Build.0 = Release|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.ActiveCfg = Debug|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Debug|x64.Build.0 = Debug|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|Any CPU.Build.0 = Release|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.ActiveCfg = Release|Any CPU
{35129634-0F13-416A-8D4D-35B71DFECFFD}.Release|x64.Build.0 = Release|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0B36F39B-69CB-4E8A-B251-D063CB08B247}.Debug|x64.ActiveCfg = Debug|Any CPU

7
SabreTools/Features/BaseFeature.cs
View File

@@ -5,7 +5,6 @@ using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
using SabreTools.FileTypes;
using SabreTools.Filtering;
using SabreTools.Hashing;
using SabreTools.Help;
using SabreTools.IO.Logging;
@@ -1792,7 +1791,7 @@ Some special strings that can be used:
/// <summary>
/// Pre-configured Splitter
/// </summary>
protected Filtering.Splitter? Splitter { get; set; }
protected MergeSplit? Splitter { get; set; }
#endregion
@@ -2252,9 +2251,9 @@ Some special strings that can be used:
/// <summary>
/// Get Splitter from feature list
/// </summary>
private static Filtering.Splitter GetSplitter(Dictionary<string, Feature?> features)
private static MergeSplit GetSplitter(Dictionary<string, Feature?> features)
{
Filtering.Splitter splitter = new()
MergeSplit splitter = new()
{
SplitType = GetSplitType(features),
};

3
SabreTools/Features/Batch.cs
View File

@@ -7,7 +7,6 @@ using SabreTools.Core.Filter;
using SabreTools.Core.Tools;
using SabreTools.DatFiles;
using SabreTools.DatTools;
using SabreTools.Filtering;
using SabreTools.Hashing;
using SabreTools.Help;
using SabreTools.IO;
@@ -583,7 +582,7 @@ Reset the internal state: reset();";
MergingFlag mergingFlag = Arguments[0].AsEnumValue<MergingFlag>();
// Apply the merging flag
Filtering.Splitter splitter = new() { SplitType = mergingFlag };
MergeSplit splitter = new() { SplitType = mergingFlag };
splitter.ApplySplitting(batchState.DatFile, false, false);
}
}

1
SabreTools/SabreTools.csproj
View File

@@ -38,7 +38,6 @@
<ItemGroup>
<ProjectReference Include="..\SabreTools.DatFiles\SabreTools.DatFiles.csproj" />
<ProjectReference Include="..\SabreTools.DatTools\SabreTools.DatTools.csproj" />
<ProjectReference Include="..\SabreTools.Filtering\SabreTools.Filtering.csproj" />
<ProjectReference Include="..\SabreTools.Help\SabreTools.Help.csproj" />
</ItemGroup>