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

Further improvements to SuperDAT handling

Browse Source
This commit is contained in:
Matt Nadareski
2016-05-17 17:21:31 -07:00
parent 8994cf6f4c
commit 2dc9e32353
1 changed files with 30 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
DATFromDir/DATFromDir.cs
View File

@@ -243,20 +243,15 @@ namespace SabreTools
string basePathBackup = _basePath; string basePathBackup = _basePath;
foreach (string item in Directory.EnumerateDirectories(_basePath)) foreach (string item in Directory.EnumerateDirectories(_basePath))
{ {
// If we're not in SuperDAT mode, then reset the base path _basePath = (File.Exists(item) ? item : item + Path.DirectorySeparatorChar);
if (!_superDat) _basePath = Path.GetFullPath(_basePath);
{
_basePath = (File.Exists(item) ? item : item + Path.DirectorySeparatorChar);
_basePath = Path.GetFullPath(_basePath);
}
foreach (string subitem in Directory.EnumerateFiles(_basePath, "*", SearchOption.AllDirectories)) foreach (string subitem in Directory.EnumerateFiles(item, "*", SearchOption.AllDirectories))
{ {
ProcessFile(subitem); ProcessFile(subitem);
} }
} }
_basePath = basePathBackup; _basePath = basePathBackup;
} }
// If this somehow skips past the original sensors // If this somehow skips past the original sensors
else else
@@ -336,8 +331,6 @@ namespace SabreTools
/// <param name="item">Filename of the item to be checked</param> /// <param name="item">Filename of the item to be checked</param>
private void ProcessFile(string item) private void ProcessFile(string item)
{ {
Console.WriteLine("basepath: " + _basePath);
// Create the temporary output directory // Create the temporary output directory
bool encounteredErrors = true; bool encounteredErrors = true;
if (!_archivesAsFiles) if (!_archivesAsFiles)
@@ -414,11 +407,27 @@ namespace SabreTools
continue; continue;
} }
string actualroot = (item == _basePath ? item.Split(Path.DirectorySeparatorChar).Last() : item.Remove(0, _basePath.Length).Split(Path.DirectorySeparatorChar)[0]);
actualroot = (actualroot == "" ? _basePath.Split(Path.DirectorySeparatorChar).Last() : actualroot);
actualroot += Path.DirectorySeparatorChar + Path.GetFileNameWithoutExtension(item);
string actualitem = entry.Remove(0, _tempDir.Length);
// If we're in SuperDAT mode, make sure the added item is by itself
if (_superDat)
{
actualroot += Path.DirectorySeparatorChar + Path.GetDirectoryName(actualitem);
actualroot = actualroot.TrimEnd(Path.DirectorySeparatorChar);
actualitem = Path.GetFileName(actualitem);
}
Console.WriteLine("actualroot: " + actualroot);
Console.WriteLine("actualitem: " + actualitem);
RomData rom = new RomData RomData rom = new RomData
{ {
Type = "rom", Type = "rom",
Game = Path.GetFileNameWithoutExtension(item), Game = actualroot, //Path.GetFileNameWithoutExtension(item),
Name = entry.Remove(0, _tempDir.Length), Name = actualitem, // entry.Remove(0, _tempDir.Length),
Size = (new FileInfo(entry)).Length, Size = (new FileInfo(entry)).Length,
CRC = fileCRC, CRC = fileCRC,
MD5 = fileMD5, MD5 = fileMD5,
@@ -486,7 +495,15 @@ namespace SabreTools
string actualroot = (item == _basePath ? item.Split(Path.DirectorySeparatorChar).Last() : item.Remove(0, _basePath.Length).Split(Path.DirectorySeparatorChar)[0]); string actualroot = (item == _basePath ? item.Split(Path.DirectorySeparatorChar).Last() : item.Remove(0, _basePath.Length).Split(Path.DirectorySeparatorChar)[0]);
actualroot = (actualroot == "" ? _basePath.Split(Path.DirectorySeparatorChar).Last() : actualroot); actualroot = (actualroot == "" ? _basePath.Split(Path.DirectorySeparatorChar).Last() : actualroot);
string actualitem = (item == _basePath ? item : item.Remove(0, _basePath.Length + 1)); //.Remove(0, actualroot.Length) string actualitem = (item == _basePath ? item : item.Remove(0, _basePath.Length + 1));
// If we're in SuperDAT mode, make sure the added item is by itself
if (_superDat)
{
actualroot += Path.DirectorySeparatorChar + Path.GetDirectoryName(actualitem);
actualroot = actualroot.TrimEnd(Path.DirectorySeparatorChar);
actualitem = Path.GetFileName(actualitem);
}
// Drag and drop is funny // Drag and drop is funny
if (actualitem == Path.GetFullPath(actualitem)) if (actualitem == Path.GetFullPath(actualitem))