mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Make it an against flag instead
This commit is contained in:
@@ -263,6 +263,7 @@ namespace SabreTools.Library.DatFiles
|
||||
/// <param name="filter">Filter object to be passed to the DatItem level</param>
|
||||
/// <param name="updateFields">List of Fields representing what should be updated [only for base replacement]</param>
|
||||
/// <param name="onlySame">True if descriptions should only be replaced if the game name is the same, false otherwise [only for base replacement]</param>
|
||||
/// <param name="byGame">True if diffing is by Game, false if diffing is by hash [only for against]</param>
|
||||
public void DetermineUpdateType(
|
||||
List<string> inputPaths,
|
||||
List<string> basePaths,
|
||||
@@ -272,7 +273,8 @@ namespace SabreTools.Library.DatFiles
|
||||
bool skip,
|
||||
Filter filter,
|
||||
List<Field> updateFields,
|
||||
bool onlySame)
|
||||
bool onlySame,
|
||||
bool byGame)
|
||||
{
|
||||
// Ensure we only have files in the inputs
|
||||
List<ParentablePath> inputFileNames = DirectoryExtensions.GetFilesOnly(inputPaths, appendparent: true);
|
||||
@@ -319,12 +321,11 @@ namespace SabreTools.Library.DatFiles
|
||||
}
|
||||
|
||||
// If we have a diff against mode
|
||||
else if (updateMode.HasFlag(UpdateMode.DiffAgainst)
|
||||
|| updateMode.HasFlag(UpdateMode.DiffGame))
|
||||
else if (updateMode.HasFlag(UpdateMode.DiffAgainst))
|
||||
{
|
||||
// Populate the combined data
|
||||
PopulateUserData(baseFileNames, filter);
|
||||
DiffAgainst(inputFileNames, outDir, inplace, filter, updateMode.HasFlag(UpdateMode.DiffGame));
|
||||
DiffAgainst(inputFileNames, outDir, inplace, filter, byGame);
|
||||
}
|
||||
|
||||
// If we have one of the base replacement modes
|
||||
|
||||
@@ -257,12 +257,11 @@ namespace SabreTools.Library.Data
|
||||
|
||||
// Base diffs
|
||||
DiffAgainst = 1 << 5,
|
||||
DiffGame = 1 << 6,
|
||||
|
||||
// Special update modes
|
||||
Merge = 1 << 7,
|
||||
BaseReplace = 1 << 8,
|
||||
ReverseBaseReplace = 1 << 9,
|
||||
Merge = 1 << 6,
|
||||
BaseReplace = 1 << 7,
|
||||
ReverseBaseReplace = 1 << 8,
|
||||
|
||||
// Combinations
|
||||
AllDiffs = DiffDupesOnly | DiffNoDupesOnly | DiffIndividualsOnly,
|
||||
|
||||
@@ -1205,15 +1205,10 @@ Options:
|
||||
Add a DAT or folder of DATs to the base set to be used for all
|
||||
operations. Multiple instances of this flag are allowed.
|
||||
|
||||
-dga, --diff-game Diff all inputs by game against a set of base DATs
|
||||
This flag will enable a special type of diffing in which a set of base
|
||||
DATs are used as a comparison point for each of the input DATs by game.
|
||||
This allows users to get a slightly different output to cascaded
|
||||
diffing, which may be more useful in some cases.
|
||||
|
||||
-bd=, --base-dat= Add a base DAT for processing
|
||||
Add a DAT or folder of DATs to the base set to be used for all
|
||||
operations. Multiple instances of this flag are allowed.
|
||||
-bg, --by-game Diff against by game instead of hashes
|
||||
By default, diffing against uses hashes to determine similar files.
|
||||
This flag enables using using each game as a comparision point
|
||||
instead.
|
||||
|
||||
-br, --base-replace Replace from base DATs in order
|
||||
By default, no item names are changed except when there is a merge
|
||||
|
||||
Reference in New Issue
Block a user