Remove .NET Framework 4.6.2/4.7.2 (#24)

* Remove < .NET 4.8, general cleanup

* Abstract

* Tango

* Banner

* Scan no more

* Common

* Application

* Access

* Filter-feeder

* Graffiti

* Paint-over

* Law and Order

* XOR-o

* Unused staircase

* Maybe

* Maybe not

* Delete this

* The word is "no"

* Emit

* Improper

* Aye aye

* Fence

* Barrier

* Monkey

* Pail

* Lines
This commit is contained in:
Matt Nadareski
2020-07-15 09:41:59 -07:00
committed by GitHub
parent 1a718a3915
commit 4e406604c2
82 changed files with 8975 additions and 11172 deletions

View File

@@ -5,10 +5,10 @@ using System.Text;
using SabreTools.Library.Data;
using SabreTools.Library.DatItems;
using SabreTools.Library.Readers;
using SabreTools.Library.Tools;
using SabreTools.Library.Writers;
using NaturalSort;
using SabreTools.Library.Readers;
namespace SabreTools.Library.DatFiles
{
@@ -26,7 +26,7 @@ namespace SabreTools.Library.DatFiles
/// <param name="datFile">Parent DatFile to copy from</param>
/// <param name="delim">Delimiter for parsing individual lines</param>
public SeparatedValue(DatFile datFile, char delim)
: base(datFile, cloneHeader: false)
: base(datFile)
{
_delim = delim;
}
@@ -35,29 +35,25 @@ namespace SabreTools.Library.DatFiles
/// Parse a character-separated value DAT and return all found games and roms within
/// </summary>
/// <param name="filename">Name of the file to be parsed</param>
/// <param name="sysid">System ID for the DAT</param>
/// <param name="srcid">Source ID for the DAT</param>
/// <param name="indexId">Index ID for the DAT</param>
/// <param name="keep">True if full pathnames are to be kept, false otherwise (default)</param>
/// <param name="clean">True if game names are sanitized, false otherwise (default)</param>
/// <param name="remUnicode">True if we should remove non-ASCII characters from output, false otherwise (default)</param>
public override void ParseFile(
protected override void ParseFile(
// Standard Dat parsing
string filename,
int sysid,
int srcid,
int indexId,
// Miscellaneous
bool keep,
bool clean,
bool remUnicode)
bool keep)
{
// Open a file reader
Encoding enc = Utilities.GetEncoding(filename);
SeparatedValueReader svr = new SeparatedValueReader(Utilities.TryOpenRead(filename), enc);
svr.Header = true;
svr.Quotes = true;
svr.Separator = _delim;
svr.VerifyFieldCount = true;
Encoding enc = FileExtensions.GetEncoding(filename);
SeparatedValueReader svr = new SeparatedValueReader(FileExtensions.TryOpenRead(filename), enc)
{
Header = true,
Quotes = true,
Separator = _delim,
VerifyFieldCount = true
};
// If we're somehow at the end of the stream already, we can't do anything
if (svr.EndOfStream)
@@ -93,7 +89,9 @@ namespace SabreTools.Library.DatFiles
biosDescription = null,
crc = null,
md5 = null,
#if NET_FRAMEWORK
ripemd160 = null,
#endif
sha1 = null,
sha256 = null,
sha384 = null,
@@ -120,71 +118,71 @@ namespace SabreTools.Library.DatFiles
#region DatFile
case "DatFile.FileName":
FileName = (string.IsNullOrWhiteSpace(FileName) ? value : FileName);
DatHeader.FileName = (string.IsNullOrWhiteSpace(DatHeader.FileName) ? value : DatHeader.FileName);
break;
case "DatFile.Name":
Name = (string.IsNullOrWhiteSpace(Name) ? value : Name);
DatHeader.Name = (string.IsNullOrWhiteSpace(DatHeader.Name) ? value : DatHeader.Name);
break;
case "DatFile.Description":
Description = (string.IsNullOrWhiteSpace(Description) ? value : Description);
DatHeader.Description = (string.IsNullOrWhiteSpace(DatHeader.Description) ? value : DatHeader.Description);
break;
case "DatFile.RootDir":
RootDir = (string.IsNullOrWhiteSpace(RootDir) ? value : RootDir);
DatHeader.RootDir = (string.IsNullOrWhiteSpace(DatHeader.RootDir) ? value : DatHeader.RootDir);
break;
case "DatFile.Category":
Category = (string.IsNullOrWhiteSpace(Category) ? value : Category);
DatHeader.Category = (string.IsNullOrWhiteSpace(DatHeader.Category) ? value : DatHeader.Category);
break;
case "DatFile.Version":
Version = (string.IsNullOrWhiteSpace(Version) ? value : Version);
DatHeader.Version = (string.IsNullOrWhiteSpace(DatHeader.Version) ? value : DatHeader.Version);
break;
case "DatFile.Date":
Date = (string.IsNullOrWhiteSpace(Date) ? value : Date);
DatHeader.Date = (string.IsNullOrWhiteSpace(DatHeader.Date) ? value : DatHeader.Date);
break;
case "DatFile.Author":
Author = (string.IsNullOrWhiteSpace(Author) ? value : Author);
DatHeader.Author = (string.IsNullOrWhiteSpace(DatHeader.Author) ? value : DatHeader.Author);
break;
case "DatFile.Email":
Email = (string.IsNullOrWhiteSpace(Email) ? value : Email);
DatHeader.Email = (string.IsNullOrWhiteSpace(DatHeader.Email) ? value : DatHeader.Email);
break;
case "DatFile.Homepage":
Homepage = (string.IsNullOrWhiteSpace(Homepage) ? value : Homepage);
DatHeader.Homepage = (string.IsNullOrWhiteSpace(DatHeader.Homepage) ? value : DatHeader.Homepage);
break;
case "DatFile.Url":
Url = (string.IsNullOrWhiteSpace(Url) ? value : Url);
DatHeader.Url = (string.IsNullOrWhiteSpace(DatHeader.Url) ? value : DatHeader.Url);
break;
case "DatFile.Comment":
Comment = (string.IsNullOrWhiteSpace(Comment) ? value : Comment);
DatHeader.Comment = (string.IsNullOrWhiteSpace(DatHeader.Comment) ? value : DatHeader.Comment);
break;
case "DatFile.Header":
Header = (string.IsNullOrWhiteSpace(Header) ? value : Header);
DatHeader.Header = (string.IsNullOrWhiteSpace(DatHeader.Header) ? value : DatHeader.Header);
break;
case "DatFile.Type":
Type = (string.IsNullOrWhiteSpace(Type) ? value : Type);
DatHeader.Type = (string.IsNullOrWhiteSpace(DatHeader.Type) ? value : DatHeader.Type);
break;
case "DatFile.ForceMerging":
ForceMerging = (ForceMerging == ForceMerging.None ? Utilities.GetForceMerging(value) : ForceMerging);
DatHeader.ForceMerging = (DatHeader.ForceMerging == ForceMerging.None ? value.AsForceMerging() : DatHeader.ForceMerging);
break;
case "DatFile.ForceNodump":
ForceNodump = (ForceNodump == ForceNodump.None ? Utilities.GetForceNodump(value) : ForceNodump);
DatHeader.ForceNodump = (DatHeader.ForceNodump == ForceNodump.None ? value.AsForceNodump() : DatHeader.ForceNodump);
break;
case "DatFile.ForcePacking":
ForcePacking = (ForcePacking == ForcePacking.None ? Utilities.GetForcePacking(value) : ForcePacking);
DatHeader.ForcePacking = (DatHeader.ForcePacking == ForcePacking.None ? value.AsForcePacking() : DatHeader.ForcePacking);
break;
#endregion
@@ -228,20 +226,7 @@ namespace SabreTools.Library.DatFiles
break;
case "Machine.Supported":
switch (value.ToLowerInvariant())
{
case "yes":
machine.Supported = true;
break;
case "no":
machine.Supported = false;
break;
case "partial":
default:
machine.Supported = null;
break;
}
machine.Supported = value.AsYesNo();
break;
case "Machine.SourceFile":
@@ -249,19 +234,7 @@ namespace SabreTools.Library.DatFiles
break;
case "Machine.Runnable":
switch (value.ToLowerInvariant())
{
case "yes":
machine.Runnable = true;
break;
case "no":
machine.Runnable = false;
break;
default:
machine.Runnable = null;
break;
}
machine.Runnable = value.AsYesNo();
break;
case "Machine.Board":
@@ -304,7 +277,7 @@ namespace SabreTools.Library.DatFiles
break;
case "Machine.MachineType":
machine.MachineType = Utilities.GetMachineType(value);
machine.MachineType = value.AsMachineType();
break;
#endregion
@@ -312,7 +285,7 @@ namespace SabreTools.Library.DatFiles
#region DatItem
case "DatItem.Type":
itemType = Utilities.GetItemType(value) ?? ItemType.Rom;
itemType = value.AsItemType() ?? ItemType.Rom;
break;
case "DatItem.Name":
@@ -351,19 +324,7 @@ namespace SabreTools.Library.DatFiles
break;
case "DatItem.Default":
switch (value.ToLowerInvariant())
{
case "yes":
def = true;
break;
case "no":
def = false;
break;
default:
def = null;
break;
}
def = value.AsYesNo();
break;
case "DatItem.Description":
@@ -377,31 +338,33 @@ namespace SabreTools.Library.DatFiles
break;
case "DatItem.CRC":
crc = Utilities.CleanHashData(value, Constants.CRCLength);
crc = value;
break;
case "DatItem.MD5":
md5 = Utilities.CleanHashData(value, Constants.MD5Length);
md5 = value;
break;
#if NET_FRAMEWORK
case "DatItem.RIPEMD160":
ripemd160 = Utilities.CleanHashData(value, Constants.RIPEMD160Length);
ripemd160 = value;
break;
#endif
case "DatItem.SHA1":
sha1 = Utilities.CleanHashData(value, Constants.SHA1Length);
sha1 = value;
break;
case "DatItem.SHA256":
sha256 = Utilities.CleanHashData(value, Constants.SHA256Length);
sha256 = value;
break;
case "DatItem.SHA384":
sha384 = Utilities.CleanHashData(value, Constants.SHA384Length);
sha384 = value;
break;
case "DatItem.SHA512":
sha512 = Utilities.CleanHashData(value, Constants.SHA512Length);
sha512 = value;
break;
case "DatItem.Merge":
@@ -417,39 +380,15 @@ namespace SabreTools.Library.DatFiles
break;
case "DatItem.Writable":
switch (value.ToLowerInvariant())
{
case "yes":
writable = true;
break;
case "no":
writable = false;
break;
default:
writable = null;
break;
}
writable = value.AsYesNo();
break;
case "DatItem.Optional":
switch (value.ToLowerInvariant())
{
case "yes":
optional = true;
break;
case "no":
optional = false;
break;
default:
optional = null;
break;
}
optional = value.AsYesNo();
break;
case "DatItem.Status":
status = Utilities.GetItemStatus(value);
status = value.AsItemStatus();
break;
case "DatItem.Language":
@@ -489,10 +428,13 @@ namespace SabreTools.Library.DatFiles
Features = features,
AreaName = areaName,
AreaSize = areaSize,
IndexId = indexId,
IndexSource = filename,
};
archive.CopyMachineInformation(machine);
ParseAddHelper(archive, clean, remUnicode);
ParseAddHelper(archive);
break;
case ItemType.BiosSet:
@@ -507,10 +449,13 @@ namespace SabreTools.Library.DatFiles
Description = biosDescription,
Default = def,
IndexId = indexId,
IndexSource = filename,
};
biosset.CopyMachineInformation(machine);
ParseAddHelper(biosset, clean, remUnicode);
ParseAddHelper(biosset);
break;
case ItemType.Disk:
@@ -524,7 +469,9 @@ namespace SabreTools.Library.DatFiles
AreaSize = areaSize,
MD5 = md5,
#if NET_FRAMEWORK
RIPEMD160 = ripemd160,
#endif
SHA1 = sha1,
SHA256 = sha256,
SHA384 = sha384,
@@ -535,10 +482,13 @@ namespace SabreTools.Library.DatFiles
Writable = writable,
ItemStatus = status,
Optional = optional,
IndexId = indexId,
IndexSource = filename,
};
disk.CopyMachineInformation(machine);
ParseAddHelper(disk, clean, remUnicode);
ParseAddHelper(disk);
break;
case ItemType.Release:
@@ -555,10 +505,13 @@ namespace SabreTools.Library.DatFiles
Language = language,
Date = date,
Default = default,
IndexId = indexId,
IndexSource = filename,
};
release.CopyMachineInformation(machine);
ParseAddHelper(release, clean, remUnicode);
ParseAddHelper(release);
break;
case ItemType.Rom:
@@ -575,7 +528,9 @@ namespace SabreTools.Library.DatFiles
Size = size,
CRC = crc,
MD5 = md5,
#if NET_FRAMEWORK
RIPEMD160 = ripemd160,
#endif
SHA1 = sha1,
SHA256 = sha256,
SHA384 = sha384,
@@ -586,10 +541,13 @@ namespace SabreTools.Library.DatFiles
Date = date,
ItemStatus = status,
Optional = optional,
IndexId = indexId,
IndexSource = filename,
};
rom.CopyMachineInformation(machine);
ParseAddHelper(rom, clean, remUnicode);
ParseAddHelper(rom);
break;
case ItemType.Sample:
@@ -601,10 +559,13 @@ namespace SabreTools.Library.DatFiles
Features = features,
AreaName = areaName,
AreaSize = areaSize,
IndexId = indexId,
IndexSource = filename,
};
sample.CopyMachineInformation(machine);
ParseAddHelper(sample, clean, remUnicode);
ParseAddHelper(sample);
break;
}
}
@@ -898,7 +859,7 @@ namespace SabreTools.Library.DatFiles
try
{
Globals.Logger.User($"Opening file for writing: {outfile}");
FileStream fs = Utilities.TryCreate(outfile);
FileStream fs = FileExtensions.TryCreate(outfile);
// If we get back null for some reason, just log and return
if (fs == null)
@@ -907,10 +868,12 @@ namespace SabreTools.Library.DatFiles
return false;
}
SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false));
svw.Quotes = true;
svw.Separator = this._delim;
svw.VerifyFieldCount = true;
SeparatedValueWriter svw = new SeparatedValueWriter(fs, new UTF8Encoding(false))
{
Quotes = true,
Separator = this._delim,
VerifyFieldCount = true
};
// Write out the header
WriteHeader(svw);
@@ -1028,11 +991,11 @@ namespace SabreTools.Library.DatFiles
// Build the state based on excluded fields
// TODO: Can we have some way of saying what fields to write out? Support for read extends to all fields now
string[] fields = new string[14]; // 17;
fields[0] = FileName;
fields[1] = Name;
fields[2] = Description;
fields[3] = datItem.GetField(Field.MachineName, ExcludeFields);
fields[4] = datItem.GetField(Field.Description, ExcludeFields);
fields[0] = DatHeader.FileName;
fields[1] = DatHeader.Name;
fields[2] = DatHeader.Description;
fields[3] = datItem.GetField(Field.MachineName, DatHeader.ExcludeFields);
fields[4] = datItem.GetField(Field.Description, DatHeader.ExcludeFields);
switch (datItem.ItemType)
{
@@ -1040,32 +1003,32 @@ namespace SabreTools.Library.DatFiles
var disk = datItem as Disk;
fields[5] = "disk";
fields[6] = string.Empty;
fields[7] = disk.GetField(Field.Name, ExcludeFields);
fields[7] = disk.GetField(Field.Name, DatHeader.ExcludeFields);
fields[8] = string.Empty;
fields[9] = string.Empty;
fields[10] = disk.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//fields[11] = disk.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
fields[11] = disk.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
fields[12] = disk.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//fields[13] = disk.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//fields[14] = disk.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
fields[13] = disk.GetField(Field.Status, ExcludeFields);
fields[10] = disk.GetField(Field.MD5, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[11] = disk.GetField(Field.RIPEMD160, DatHeader.ExcludeFields).ToLowerInvariant();
fields[11] = disk.GetField(Field.SHA1, DatHeader.ExcludeFields).ToLowerInvariant();
fields[12] = disk.GetField(Field.SHA256, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[13] = disk.GetField(Field.SHA384, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[14] = disk.GetField(Field.SHA512, DatHeader.ExcludeFields).ToLowerInvariant();
fields[13] = disk.GetField(Field.Status, DatHeader.ExcludeFields);
break;
case ItemType.Rom:
var rom = datItem as Rom;
fields[5] = "rom";
fields[6] = rom.GetField(Field.Name, ExcludeFields);
fields[6] = rom.GetField(Field.Name, DatHeader.ExcludeFields);
fields[7] = string.Empty;
fields[8] = rom.GetField(Field.Size, ExcludeFields);
fields[9] = rom.GetField(Field.CRC, ExcludeFields).ToLowerInvariant();
fields[10] = rom.GetField(Field.MD5, ExcludeFields).ToLowerInvariant();
//fields[11] = rom.GetField(Field.RIPEMD160, ExcludeFields).ToLowerInvariant();
fields[11] = rom.GetField(Field.SHA1, ExcludeFields).ToLowerInvariant();
fields[12] = rom.GetField(Field.SHA256, ExcludeFields).ToLowerInvariant();
//fields[13] = rom.GetField(Field.SHA384, ExcludeFields).ToLowerInvariant();
//fields[14] = rom.GetField(Field.SHA512, ExcludeFields).ToLowerInvariant();
fields[13] = rom.GetField(Field.Status, ExcludeFields);
fields[8] = rom.GetField(Field.Size, DatHeader.ExcludeFields);
fields[9] = rom.GetField(Field.CRC, DatHeader.ExcludeFields).ToLowerInvariant();
fields[10] = rom.GetField(Field.MD5, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[11] = rom.GetField(Field.RIPEMD160, DatHeader.ExcludeFields).ToLowerInvariant();
fields[11] = rom.GetField(Field.SHA1, DatHeader.ExcludeFields).ToLowerInvariant();
fields[12] = rom.GetField(Field.SHA256, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[13] = rom.GetField(Field.SHA384, DatHeader.ExcludeFields).ToLowerInvariant();
//fields[14] = rom.GetField(Field.SHA512, DatHeader.ExcludeFields).ToLowerInvariant();
fields[13] = rom.GetField(Field.Status, DatHeader.ExcludeFields);
break;
}