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

[DatFile] Hacky hack hack to get nodumps working in sort

Browse Source
This commit is contained in:
Matt Nadareski
2017-11-08 23:49:50 -08:00
parent 565c16efc3
commit 3ac2b6c074
1 changed files with 28 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1468,8 +1468,19 @@ namespace SabreTools.Library.DatFiles
// If the key is different, move the item to the new key // If the key is different, move the item to the new key
if (newkey != key) if (newkey != key)
{ {
Add(newkey, rom); // We have to circumvent the proper process here because of issues with nodumps
Remove(key, rom); // TODO: Properly handle nodumps in key-to-key transfers
if (_items.ContainsKey(newkey))
{
_items[newkey].Add(rom);
}
else
{
_items.Add(newkey, new List<DatItem>() { rom });
}
// Now remove the rom from its original location
roms.RemoveAt(i);
i--; // This make sure that the pointer stays on the correct since one was removed i--; // This make sure that the pointer stays on the correct since one was removed
} }
} }
@@ -2231,58 +2242,24 @@ namespace SabreTools.Library.DatFiles
public void Update(List<string> inputFileNames, string outDir, bool inplace, bool clean, bool remUnicode, bool descAsName, public void Update(List<string> inputFileNames, string outDir, bool inplace, bool clean, bool remUnicode, bool descAsName,
Filter filter, SplitType splitType, bool trim, bool single, string root) Filter filter, SplitType splitType, bool trim, bool single, string root)
{ {
for (int i = 0; i < inputFileNames.Count; i++) // Get only files from the input first
inputFileNames = Utilities.GetOnlyFilesFromInputs(inputFileNames);
// Iterate over the files
foreach (string file in inputFileNames)
{ {
// Get the input file name DatFile innerDatdata = new DatFile(this);
string inputPath = inputFileNames[i]; Globals.Logger.User("Processing '{0}'", Path.GetFileName(file));
innerDatdata.Parse(file, 0, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName,
keepext: ((innerDatdata.DatFormat & DatFormat.TSV) != 0 || (innerDatdata.DatFormat & DatFormat.CSV) != 0));
innerDatdata.Filter(filter, trim, single, root);
// Clean the input string // Get the correct output path
if (inputPath != "") string realOutDir = Utilities.GetOutputPath(outDir, file, inplace, splitpath: false);
{
inputPath = Path.GetFullPath(inputPath);
}
if (File.Exists(inputPath)) // Try to output the file, overwriting only if it's not in the current directory
{ // TODO: Figure out if overwriting should always happen of if there should be a user flag
DatFile innerDatdata = new DatFile(this); innerDatdata.WriteToFile(realOutDir, overwrite: (realOutDir != Environment.CurrentDirectory));
Globals.Logger.User("Processing '{0}'", Path.GetFileName(inputPath));
innerDatdata.Parse(inputPath, 0, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName,
keepext: ((innerDatdata.DatFormat & DatFormat.TSV) != 0 || (innerDatdata.DatFormat & DatFormat.CSV) != 0));
innerDatdata.Filter(filter, trim, single, root);
// Get the correct output path
string realOutDir = Utilities.GetOutputPath(outDir, inputPath, inplace, splitpath: false);
// Try to output the file, overwriting only if it's not in the current directory
// TODO: Figure out if overwriting should always happen of if there should be a user flag
innerDatdata.WriteToFile(realOutDir, overwrite: (realOutDir != Environment.CurrentDirectory));
}
else if (Directory.Exists(inputPath))
{
inputPath = Path.GetFullPath(inputPath) + Path.DirectorySeparatorChar;
List<string> subFiles = Directory.EnumerateFiles(inputPath, "*", SearchOption.AllDirectories).ToList();
Parallel.ForEach(subFiles, Globals.ParallelOptions, file =>
{
Globals.Logger.User("Processing '{0}'", Path.GetFullPath(file).Remove(0, inputPath.Length));
DatFile innerDatdata = new DatFile(this);
innerDatdata.Parse(file, 0, 0, splitType, keep: true, clean: clean, remUnicode: remUnicode, descAsName: descAsName,
keepext: ((innerDatdata.DatFormat & DatFormat.TSV) != 0 || (innerDatdata.DatFormat & DatFormat.CSV) != 0));
innerDatdata.Filter(filter, trim, single, root);
// Get the correct output path
string realOutDir = Utilities.GetOutputPath(outDir, file, inplace, splitpath: false);
// Try to output the file, overwriting only if it's not in the current directory
// TODO: Figure out if overwriting should always happen of if there should be a user flag
innerDatdata.WriteToFile(realOutDir, overwrite: (realOutDir != Environment.CurrentDirectory));
});
}
else
{
Globals.Logger.Error("I'm sorry but '{0}' doesn't exist!", inputPath);
return;
}
} }
} }