mirror of
https://github.com/claunia/SabreTools.git
synced 2025-12-16 19:14:27 +00:00
Minor cleanup for readability
This commit is contained in:
@@ -155,7 +155,8 @@ namespace SabreTools.DatFiles
|
|||||||
// If the merge tag exists and the parent already contains it, skip
|
// If the merge tag exists and the parent already contains it, skip
|
||||||
if (mergeTag != null && GetItemsForBucket(cloneOf)
|
if (mergeTag != null && GetItemsForBucket(cloneOf)
|
||||||
.FindAll(i => i is Disk)
|
.FindAll(i => i is Disk)
|
||||||
.ConvertAll(i => (i as Disk)!.GetName()).Contains(mergeTag))
|
.ConvertAll(i => (i as Disk)!.GetName())
|
||||||
|
.Contains(mergeTag))
|
||||||
{
|
{
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -163,7 +164,8 @@ namespace SabreTools.DatFiles
|
|||||||
// If the merge tag exists but the parent doesn't contain it, add to parent
|
// If the merge tag exists but the parent doesn't contain it, add to parent
|
||||||
else if (mergeTag != null && !GetItemsForBucket(cloneOf)
|
else if (mergeTag != null && !GetItemsForBucket(cloneOf)
|
||||||
.FindAll(i => i is Disk)
|
.FindAll(i => i is Disk)
|
||||||
.ConvertAll(i => (i as Disk)!.GetName()).Contains(mergeTag))
|
.ConvertAll(i => (i as Disk)!.GetName())
|
||||||
|
.Contains(mergeTag))
|
||||||
{
|
{
|
||||||
disk.CopyMachineInformation(copyFrom);
|
disk.CopyMachineInformation(copyFrom);
|
||||||
Add(cloneOf!, disk);
|
Add(cloneOf!, disk);
|
||||||
@@ -398,7 +400,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
DatItem datItem = (DatItem)item.Clone();
|
DatItem datItem = (DatItem)item.Clone();
|
||||||
datItem.CopyMachineInformation(copyFrom);
|
datItem.CopyMachineInformation(copyFrom);
|
||||||
if (items.FindIndex(i => string.Equals(i.GetName(), datItem.GetName(), StringComparison.OrdinalIgnoreCase)) == -1
|
if (!items.Exists(i => string.Equals(i.GetName(), datItem.GetName(), StringComparison.OrdinalIgnoreCase))
|
||||||
&& !items.Contains(datItem))
|
&& !items.Contains(datItem))
|
||||||
{
|
{
|
||||||
Add(bucket, datItem);
|
Add(bucket, datItem);
|
||||||
@@ -832,7 +834,7 @@ namespace SabreTools.DatFiles
|
|||||||
{
|
{
|
||||||
DatItem datItem = (DatItem)item.Clone();
|
DatItem datItem = (DatItem)item.Clone();
|
||||||
datItem.CopyMachineInformation(copyFrom);
|
datItem.CopyMachineInformation(copyFrom);
|
||||||
if (items.FindIndex(i => i.GetName() == datItem.GetName()) == -1 && !items.Contains(datItem))
|
if (!items.Exists(i => i.GetName() == datItem.GetName()) && !items.Contains(datItem))
|
||||||
Add(bucket, datItem);
|
Add(bucket, datItem);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user