UI: dispose CSV reader when done + use explicit types

This commit is contained in:
Evan Husted 2025-01-09 19:24:48 -06:00
parent 606e149bd3
commit 292e27f0da

View File

@ -39,8 +39,8 @@ namespace Ryujinx.Ava.Utilities.Compat
public static void LoadFromStream(Stream stream) public static void LoadFromStream(Stream stream)
{ {
var reader = Sep.Reader().From(stream); using SepReader reader = Sep.Reader().From(stream);
var columnIndices = new ColumnIndices(reader.Header); ColumnIndices columnIndices = new(reader.Header);
Entries = reader Entries = reader
.Enumerate(row => new CompatibilityEntry(ref columnIndices, row)) .Enumerate(row => new CompatibilityEntry(ref columnIndices, row))
@ -57,7 +57,7 @@ namespace Ryujinx.Ava.Utilities.Compat
{ {
public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row) public CompatibilityEntry(ref ColumnIndices indices, SepReader.Row row)
{ {
var titleIdRow = ColStr(row[indices.TitleId]); string titleIdRow = ColStr(row[indices.TitleId]);
TitleId = !string.IsNullOrEmpty(titleIdRow) TitleId = !string.IsNullOrEmpty(titleIdRow)
? titleIdRow ? titleIdRow
: default(Optional<string>); : default(Optional<string>);
@ -100,7 +100,7 @@ namespace Ryujinx.Ava.Utilities.Compat
public override string ToString() public override string ToString()
{ {
var sb = new StringBuilder("CompatibilityEntry: {"); StringBuilder sb = new("CompatibilityEntry: {");
sb.Append($"{nameof(GameName)}=\"{GameName}\", "); sb.Append($"{nameof(GameName)}=\"{GameName}\", ");
sb.Append($"{nameof(TitleId)}={TitleId}, "); sb.Append($"{nameof(TitleId)}={TitleId}, ");
sb.Append($"{nameof(Labels)}=\"{Labels}\", "); sb.Append($"{nameof(Labels)}=\"{Labels}\", ");
@ -161,8 +161,8 @@ namespace Ryujinx.Ava.Utilities.Compat
if (value == string.Empty) if (value == string.Empty)
return string.Empty; return string.Empty;
var firstChar = value[0]; char firstChar = value[0];
var rest = value[1..]; string rest = value[1..];
return $"{char.ToUpper(firstChar)}{rest}"; return $"{char.ToUpper(firstChar)}{rest}";
} }