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

Empty the rest of Santizer into Utilities

Browse Source
This commit is contained in:
Matt Nadareski
2020-12-09 22:33:49 -08:00
parent 7e86b6914d
commit d4dce53906
24 changed files with 107 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
SabreTools.DatItems/Chip.cs
View File

@@ -88,7 +88,7 @@ namespace SabreTools.DatItems
ChipType = mappings[Field.DatItem_ChipType].AsChipType();
if (mappings.Keys.Contains(Field.DatItem_Clock))
Clock = Sanitizer.CleanLong(mappings[Field.DatItem_Clock]);
Clock = Utilities.CleanLong(mappings[Field.DatItem_Clock]);
}
#endregion

14
SabreTools.DatItems/Control.cs
View File

@@ -149,25 +149,25 @@ namespace SabreTools.DatItems
ControlType = mappings[Field.DatItem_Control_Type].AsControlType();
if (mappings.Keys.Contains(Field.DatItem_Control_Player))
Player = Sanitizer.CleanLong(mappings[Field.DatItem_Control_Player]);
Player = Utilities.CleanLong(mappings[Field.DatItem_Control_Player]);
if (mappings.Keys.Contains(Field.DatItem_Control_Buttons))
Buttons = Sanitizer.CleanLong(mappings[Field.DatItem_Control_Buttons]);
Buttons = Utilities.CleanLong(mappings[Field.DatItem_Control_Buttons]);
if (mappings.Keys.Contains(Field.DatItem_Control_RequiredButtons))
RequiredButtons = Sanitizer.CleanLong(mappings[Field.DatItem_Control_RequiredButtons]);
RequiredButtons = Utilities.CleanLong(mappings[Field.DatItem_Control_RequiredButtons]);
if (mappings.Keys.Contains(Field.DatItem_Control_Minimum))
Minimum = Sanitizer.CleanLong(mappings[Field.DatItem_Control_Minimum]);
Minimum = Utilities.CleanLong(mappings[Field.DatItem_Control_Minimum]);
if (mappings.Keys.Contains(Field.DatItem_Control_Maximum))
Maximum = Sanitizer.CleanLong(mappings[Field.DatItem_Control_Maximum]);
Maximum = Utilities.CleanLong(mappings[Field.DatItem_Control_Maximum]);
if (mappings.Keys.Contains(Field.DatItem_Control_Sensitivity))
Sensitivity = Sanitizer.CleanLong(mappings[Field.DatItem_Control_Sensitivity]);
Sensitivity = Utilities.CleanLong(mappings[Field.DatItem_Control_Sensitivity]);
if (mappings.Keys.Contains(Field.DatItem_Control_KeyDelta))
KeyDelta = Sanitizer.CleanLong(mappings[Field.DatItem_Control_KeyDelta]);
KeyDelta = Utilities.CleanLong(mappings[Field.DatItem_Control_KeyDelta]);
if (mappings.Keys.Contains(Field.DatItem_Control_Reverse))
Reverse = mappings[Field.DatItem_Control_Reverse].AsYesNo();

6
SabreTools.DatItems/DatItem.cs
View File

@@ -1406,10 +1406,10 @@ namespace SabreTools.DatItems
{
if (x.ItemType == y.ItemType)
{
if (Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)) == Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)))
return nc.Compare(Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)), Path.GetFileName(Sanitizer.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)));
if (Path.GetDirectoryName(Utilities.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)) == Path.GetDirectoryName(Utilities.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)))
return nc.Compare(Path.GetFileName(Utilities.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)), Path.GetFileName(Utilities.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)));
return nc.Compare(Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)), Path.GetDirectoryName(Sanitizer.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)));
return nc.Compare(Path.GetDirectoryName(Utilities.RemovePathUnsafeCharacters(x.GetName() ?? string.Empty)), Path.GetDirectoryName(Utilities.RemovePathUnsafeCharacters(y.GetName() ?? string.Empty)));
}
return x.ItemType - y.ItemType;

4
SabreTools.DatItems/DataArea.cs
View File

@@ -84,10 +84,10 @@ namespace SabreTools.DatItems
Name = mappings[Field.DatItem_AreaName];
if (mappings.Keys.Contains(Field.DatItem_AreaSize))
Size = Sanitizer.CleanLong(mappings[Field.DatItem_AreaSize]);
Size = Utilities.CleanLong(mappings[Field.DatItem_AreaSize]);
if (mappings.Keys.Contains(Field.DatItem_AreaWidth))
Width = Sanitizer.CleanLong(mappings[Field.DatItem_AreaWidth]);
Width = Utilities.CleanLong(mappings[Field.DatItem_AreaWidth]);
if (mappings.Keys.Contains(Field.DatItem_AreaEndianness))
Endianness = mappings[Field.DatItem_AreaEndianness].AsEndianness();

2
SabreTools.DatItems/Device.cs
View File

@@ -105,7 +105,7 @@ namespace SabreTools.DatItems
FixedImage = mappings[Field.DatItem_FixedImage];
if (mappings.Keys.Contains(Field.DatItem_Mandatory))
Mandatory = Sanitizer.CleanLong(mappings[Field.DatItem_Mandatory]);
Mandatory = Utilities.CleanLong(mappings[Field.DatItem_Mandatory]);
if (mappings.Keys.Contains(Field.DatItem_Interface))
Interface = mappings[Field.DatItem_Interface];

20
SabreTools.DatItems/Display.cs
View File

@@ -178,16 +178,16 @@ namespace SabreTools.DatItems
DisplayType = mappings[Field.DatItem_DisplayType].AsDisplayType();
if (mappings.Keys.Contains(Field.DatItem_Rotate))
Rotate = Sanitizer.CleanLong(mappings[Field.DatItem_Rotate]);
Rotate = Utilities.CleanLong(mappings[Field.DatItem_Rotate]);
if (mappings.Keys.Contains(Field.DatItem_FlipX))
FlipX = mappings[Field.DatItem_FlipX].AsYesNo();
if (mappings.Keys.Contains(Field.DatItem_Width))
Width = Sanitizer.CleanLong(mappings[Field.DatItem_Width]);
Width = Utilities.CleanLong(mappings[Field.DatItem_Width]);
if (mappings.Keys.Contains(Field.DatItem_Height))
Height = Sanitizer.CleanLong(mappings[Field.DatItem_Height]);
Height = Utilities.CleanLong(mappings[Field.DatItem_Height]);
if (mappings.Keys.Contains(Field.DatItem_Refresh))
{
@@ -196,25 +196,25 @@ namespace SabreTools.DatItems
}
if (mappings.Keys.Contains(Field.DatItem_PixClock))
PixClock = Sanitizer.CleanLong(mappings[Field.DatItem_PixClock]);
PixClock = Utilities.CleanLong(mappings[Field.DatItem_PixClock]);
if (mappings.Keys.Contains(Field.DatItem_HTotal))
HTotal = Sanitizer.CleanLong(mappings[Field.DatItem_HTotal]);
HTotal = Utilities.CleanLong(mappings[Field.DatItem_HTotal]);
if (mappings.Keys.Contains(Field.DatItem_HBEnd))
HBEnd = Sanitizer.CleanLong(mappings[Field.DatItem_HBEnd]);
HBEnd = Utilities.CleanLong(mappings[Field.DatItem_HBEnd]);
if (mappings.Keys.Contains(Field.DatItem_HBStart))
HBStart = Sanitizer.CleanLong(mappings[Field.DatItem_HBStart]);
HBStart = Utilities.CleanLong(mappings[Field.DatItem_HBStart]);
if (mappings.Keys.Contains(Field.DatItem_VTotal))
VTotal = Sanitizer.CleanLong(mappings[Field.DatItem_VTotal]);
VTotal = Utilities.CleanLong(mappings[Field.DatItem_VTotal]);
if (mappings.Keys.Contains(Field.DatItem_VBEnd))
VBEnd = Sanitizer.CleanLong(mappings[Field.DatItem_VBEnd]);
VBEnd = Utilities.CleanLong(mappings[Field.DatItem_VBEnd]);
if (mappings.Keys.Contains(Field.DatItem_VBStart))
VBStart = Sanitizer.CleanLong(mappings[Field.DatItem_VBStart]);
VBStart = Utilities.CleanLong(mappings[Field.DatItem_VBStart]);
}
#endregion

4
SabreTools.DatItems/Input.cs
View File

@@ -89,10 +89,10 @@ namespace SabreTools.DatItems
Tilt = mappings[Field.DatItem_Tilt].AsYesNo();
if (mappings.Keys.Contains(Field.DatItem_Players))
Players = Sanitizer.CleanLong(mappings[Field.DatItem_Players]);
Players = Utilities.CleanLong(mappings[Field.DatItem_Players]);
if (mappings.Keys.Contains(Field.DatItem_Coins))
Coins = Sanitizer.CleanLong(mappings[Field.DatItem_Coins]);
Coins = Utilities.CleanLong(mappings[Field.DatItem_Coins]);
if (ControlsSpecified)
{

2
SabreTools.DatItems/Location.cs
View File

@@ -72,7 +72,7 @@ namespace SabreTools.DatItems
Name = mappings[Field.DatItem_Location_Name];
if (mappings.Keys.Contains(Field.DatItem_Location_Number))
Number = Sanitizer.CleanLong(mappings[Field.DatItem_Location_Number]);
Number = Utilities.CleanLong(mappings[Field.DatItem_Location_Number]);
if (mappings.Keys.Contains(Field.DatItem_Location_Inverted))
Inverted = mappings[Field.DatItem_Location_Inverted].AsYesNo();

2
SabreTools.DatItems/Rom.cs
View File

@@ -372,7 +372,7 @@ namespace SabreTools.DatItems
Bios = mappings[Field.DatItem_Bios];
if (mappings.Keys.Contains(Field.DatItem_Size))
Size = Sanitizer.CleanLong(mappings[Field.DatItem_Size]);
Size = Utilities.CleanLong(mappings[Field.DatItem_Size]);
if (mappings.Keys.Contains(Field.DatItem_CRC))
CRC = mappings[Field.DatItem_CRC];

2
SabreTools.DatItems/Sound.cs
View File

@@ -43,7 +43,7 @@ namespace SabreTools.DatItems
// Handle Sound-specific fields
if (mappings.Keys.Contains(Field.DatItem_Channels))
Channels = Sanitizer.CleanLong(mappings[Field.DatItem_Channels]);
Channels = Utilities.CleanLong(mappings[Field.DatItem_Channels]);
}
#endregion