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

Add Filter to DiffAgainst

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-01 14:17:57 -07:00
parent b6c1e9f5c7
commit 30a7e38b77
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
SabreTools.Library/DatFiles/DatFile.cs
View File

@@ -323,7 +323,7 @@ namespace SabreTools.Library.DatFiles
{ {
// Populate the combined data // Populate the combined data
PopulateUserData(baseFileNames, filter); PopulateUserData(baseFileNames, filter);
DiffAgainst(inputFileNames, outDir, inplace); DiffAgainst(inputFileNames, outDir, inplace, filter);
} }
// If we are in game diffing mode // If we are in game diffing mode
@@ -377,10 +377,11 @@ namespace SabreTools.Library.DatFiles
/// <param name="inputs">Names of the input files</param> /// <param name="inputs">Names of the input files</param>
/// <param name="outDir">Optional param for output directory</param> /// <param name="outDir">Optional param for output directory</param>
/// <param name="inplace">True if the output files should overwrite their inputs, false otherwise</param> /// <param name="inplace">True if the output files should overwrite their inputs, false otherwise</param>
public void DiffAgainst(List<string> inputs, string outDir, bool inplace) /// <param name="filter">Filter object to be passed to the DatItem level</param>
public void DiffAgainst(List<string> inputs, string outDir, bool inplace, Filter filter)
{ {
List<ParentablePath> paths = inputs.Select(i => new ParentablePath(i)).ToList(); List<ParentablePath> paths = inputs.Select(i => new ParentablePath(i)).ToList();
DiffAgainst(paths, outDir, inplace); DiffAgainst(paths, outDir, inplace, filter);
} }
/// <summary> /// <summary>
@@ -966,7 +967,8 @@ namespace SabreTools.Library.DatFiles
/// <param name="inputs">Names of the input files</param> /// <param name="inputs">Names of the input files</param>
/// <param name="outDir">Optional param for output directory</param> /// <param name="outDir">Optional param for output directory</param>
/// <param name="inplace">True if the output files should overwrite their inputs, false otherwise</param> /// <param name="inplace">True if the output files should overwrite their inputs, false otherwise</param>
internal void DiffAgainst(List<ParentablePath> inputs, string outDir, bool inplace) /// <param name="filter">Filter object to be passed to the DatItem level</param>
internal void DiffAgainst(List<ParentablePath> inputs, string outDir, bool inplace, Filter filter)
{ {
// For comparison's sake, we want to use CRC as the base ordering // For comparison's sake, we want to use CRC as the base ordering
Items.BucketBy(BucketedBy.CRC, DedupeType.Full); Items.BucketBy(BucketedBy.CRC, DedupeType.Full);
@@ -977,8 +979,9 @@ namespace SabreTools.Library.DatFiles
Globals.Logger.User($"Comparing '{path.CurrentPath}' to base DAT"); Globals.Logger.User($"Comparing '{path.CurrentPath}' to base DAT");
// First we parse in the DAT internally // First we parse in the DAT internally
DatFile intDat = Create(); DatFile intDat = Create(Header.CloneFiltering());
intDat.Parse(path, 1, keep: true); intDat.Parse(path, 1, keep: true);
filter.FilterDatFile(intDat, false /* useTags */);
// For comparison's sake, we want to use CRC as the base bucketing // For comparison's sake, we want to use CRC as the base bucketing
intDat.Items.BucketBy(BucketedBy.CRC, DedupeType.Full); intDat.Items.BucketBy(BucketedBy.CRC, DedupeType.Full);
@@ -1269,6 +1272,8 @@ namespace SabreTools.Library.DatFiles
DatFile intDat = Create(Header.CloneFiltering()); DatFile intDat = Create(Header.CloneFiltering());
intDat.Parse(path, 1, keep: true); intDat.Parse(path, 1, keep: true);
filter.FilterDatFile(intDat, false /* useTags */); filter.FilterDatFile(intDat, false /* useTags */);
// For comparison's sake, we want to use Game as the base bucketing
intDat.Items.BucketBy(BucketedBy.Game, DedupeType.None); intDat.Items.BucketBy(BucketedBy.Game, DedupeType.None);
// TODO: Do we need to include items in base NOT in compare? // TODO: Do we need to include items in base NOT in compare?