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

Better sort, fix naming collisions

Browse Source
This commit is contained in:
Matt Nadareski
2020-08-31 16:46:04 -07:00
parent e98039ae38
commit 0c10eaa52f
3 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1415,7 +1415,7 @@ namespace SabreTools.Library.DatFiles
DatItem datItem = (DatItem)item.Clone(); DatItem datItem = (DatItem)item.Clone();
newdevs.AddRange((datItem.Machine.DeviceReferences ?? new List<ListXmlDeviceReference>()).Select(d => d.Name).ToList()); newdevs.AddRange((datItem.Machine.DeviceReferences ?? new List<ListXmlDeviceReference>()).Select(d => d.Name).ToList());
datItem.CopyMachineInformation(copyFrom); datItem.CopyMachineInformation(copyFrom);
if (Items[game].Where(i => i.Name.ToLowerInvariant() == datItem.Name.ToLowerInvariant()).Count() == 0) if (!Items[game].Contains(datItem))
{ {
foundnew = true; foundnew = true;
Items.Add(game, datItem); Items.Add(game, datItem);
@@ -1473,7 +1473,7 @@ namespace SabreTools.Library.DatFiles
newSlotOptions.AddRange(machineSlotOptions); newSlotOptions.AddRange(machineSlotOptions);
datItem.CopyMachineInformation(copyFrom); datItem.CopyMachineInformation(copyFrom);
if (Items[game].Where(i => i.Name.ToLowerInvariant() == datItem.Name.ToLowerInvariant()).Count() == 0) if (!Items[game].Contains(datItem))
{ {
foundnew = true; foundnew = true;
Items.Add(game, datItem); Items.Add(game, datItem);

5
SabreTools.Library/DatItems/DatItem.cs
View File

@@ -1225,6 +1225,8 @@ namespace SabreTools.Library.DatItems
if (x.Source.Index == y.Source.Index) if (x.Source.Index == y.Source.Index)
{ {
if (x.Machine.Name == y.Machine.Name) if (x.Machine.Name == y.Machine.Name)
{
if (x.ItemType == y.ItemType)
{ {
if (Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.Name)) == Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.Name))) if (Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.Name)) == Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.Name)))
return nc.Compare(Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(x.Name)), Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(y.Name))); return nc.Compare(Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(x.Name)), Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(y.Name)));
@@ -1232,6 +1234,9 @@ namespace SabreTools.Library.DatItems
return nc.Compare(Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.Name)), Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.Name))); return nc.Compare(Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.Name)), Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.Name)));
} }
return x.ItemType - y.ItemType;
}
return nc.Compare(x.Machine.Name, y.Machine.Name); return nc.Compare(x.Machine.Name, y.Machine.Name);
} }

13
SabreTools.Library/DatItems/Enums.cs
View File

@@ -453,14 +453,17 @@ namespace SabreTools.Library.DatItems
/// </summary> /// </summary>
public enum ItemType public enum ItemType
{ {
// "Actionable" item types
Rom = 0, Rom = 0,
Disk = 1, Disk = 1,
Sample = 2, Media = 2,
Release = 3,
// "Auxiliary" item types
Archive = 3,
BiosSet = 4, BiosSet = 4,
Archive = 5, Chip = 5,
Chip = 6, Release = 6,
Media = 7, Sample = 7,
Blank = 99, // This is not a real type, only used internally Blank = 99, // This is not a real type, only used internally
} }