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

Update packages

Browse Source
This commit is contained in:
Matt Nadareski
2024-03-12 16:47:21 -04:00
parent 93c8dce1ea
commit 76e3b0d83a
20 changed files with 46 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
RombaSharp/Features/Diffdat.cs
View File

@@ -45,7 +45,7 @@ in -old DAT file. Ignores those entries in -old that are not in -new.";
string? outdat = GetString(features, OutStringValue); string? outdat = GetString(features, OutStringValue);
// Ensure the output directory // Ensure the output directory
outdat = (outdat ?? string.Empty).Ensure(create: true); outdat = outdat.Ensure(create: true);
// Check that all required files exist // Check that all required files exist
if (!File.Exists(olddat)) if (!File.Exists(olddat))

2
RombaSharp/Features/Dir2Dat.cs
View File

@@ -44,7 +44,7 @@ namespace RombaSharp.Features
string? outdat = GetString(features, OutStringValue); string? outdat = GetString(features, OutStringValue);
// Ensure the output directory // Ensure the output directory
outdat = (outdat ?? string.Empty).Ensure(create: true); outdat = outdat.Ensure(create: true);
// Check that all required directories exist // Check that all required directories exist
if (!Directory.Exists(source)) if (!Directory.Exists(source))

2
RombaSharp/Features/EDiffdat.cs
View File

@@ -40,7 +40,7 @@ namespace RombaSharp.Features
string? newdat = GetString(features, NewStringValue); string? newdat = GetString(features, NewStringValue);
// Ensure the output directory // Ensure the output directory
outdat = (outdat ?? string.Empty).Ensure(create: true); outdat = outdat.Ensure(create: true);
// Check that all required files exist // Check that all required files exist
if (!File.Exists(olddat)) if (!File.Exists(olddat))

2
RombaSharp/RombaSharp.csproj
View File

@@ -23,7 +23,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

2
SabreTools.Core/SabreTools.Core.csproj
View File

@@ -37,7 +37,7 @@
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.4" /> <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
<PackageReference Include="SabreTools.Matching" Version="1.3.1" /> <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
<PackageReference Include="SabreTools.Models" Version="1.3.0" /> <PackageReference Include="SabreTools.Models" Version="1.4.0" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

21
SabreTools.DatFiles/DatFile.FromMetadata.cs
View File

@@ -138,17 +138,16 @@ namespace SabreTools.DatFiles
Default = infos.ReleaseNumber.Default.AsYesNo(), Default = infos.ReleaseNumber.Default.AsYesNo(),
}); });
} }
// TODO: Uncomment this when the change to both Models and Serialization is done if (infos.ImageNumber != null)
//if (infos.ImageNumber != null) {
//{ offlineListInfos.Add(new Formats.OfflineListInfo
// offlineListInfos.Add(new Formats.OfflineListInfo {
// { Name = "imageNumber",
// Name = "imageNumber", Visible = infos.ImageNumber.Visible.AsYesNo(),
// Visible = infos.ImageNumber.Visible.AsYesNo(), InNamingOption = infos.ImageNumber.InNamingOption.AsYesNo(),
// InNamingOption = infos.ImageNumber.InNamingOption.AsYesNo(), Default = infos.ImageNumber.Default.AsYesNo(),
// Default = infos.ImageNumber.Default.AsYesNo(), });
// }); }
//}
if (infos.LanguageNumber != null) if (infos.LanguageNumber != null)
{ {
offlineListInfos.Add(new Formats.OfflineListInfo offlineListInfos.Add(new Formats.OfflineListInfo

8
SabreTools.DatFiles/DatFile.ToMetadata.cs
View File

@@ -123,6 +123,14 @@ namespace SabreTools.DatFiles
Default = info.Default.FromYesNo(), Default = info.Default.FromYesNo(),
}; };
break; break;
case "imageNumber":
infoItem.ImageNumber = new Models.OfflineList.ImageNumber
{
Visible = info.Visible.FromYesNo(),
InNamingOption = info.InNamingOption.FromYesNo(),
Default = info.Default.FromYesNo(),
};
break;
case "languageNumber": case "languageNumber":
infoItem.LanguageNumber = new Models.OfflineList.LanguageNumber infoItem.LanguageNumber = new Models.OfflineList.LanguageNumber
{ {

8
SabreTools.DatFiles/SabreTools.DatFiles.csproj
View File

@@ -28,16 +28,16 @@
<!-- Support for old .NET versions --> <!-- Support for old .NET versions -->
<ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))"> <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Hashing" Version="1.1.4" /> <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
<PackageReference Include="SabreTools.IO" Version="1.3.1" /> <PackageReference Include="SabreTools.IO" Version="1.3.2" />
<PackageReference Include="SabreTools.Matching" Version="1.3.1" /> <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
<PackageReference Include="SabreTools.Models" Version="1.3.0" /> <PackageReference Include="SabreTools.Models" Version="1.4.0" />
<PackageReference Include="SabreTools.Serialization" Version="1.3.3" /> <PackageReference Include="SabreTools.Serialization" Version="1.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SabreTools.DatItems/SabreTools.DatItems.csproj
View File

@@ -30,7 +30,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="SabreTools.Matching" Version="1.3.1" /> <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
<PackageReference Include="SabreTools.Models" Version="1.3.0" /> <PackageReference Include="SabreTools.Models" Version="1.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SabreTools.DatTools/SabreTools.DatTools.csproj
View File

@@ -31,7 +31,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.3.1" /> <PackageReference Include="SabreTools.IO" Version="1.3.2" />
<PackageReference Include="SabreTools.Matching" Version="1.3.1" /> <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
<PackageReference Include="SabreTools.Skippers" Version="1.1.2" /> <PackageReference Include="SabreTools.Skippers" Version="1.1.2" />
</ItemGroup> </ItemGroup>

2
SabreTools.DatTools/Statistics.cs
View File

@@ -171,7 +171,7 @@ namespace SabreTools.DatTools
reportName = "report"; reportName = "report";
// Get the proper output directory name // Get the proper output directory name
outDir = (outDir ?? string.Empty).Ensure(); outDir = outDir.Ensure();
InternalStopwatch watch = new($"Writing out report data to '{outDir}'"); InternalStopwatch watch = new($"Writing out report data to '{outDir}'");

2
SabreTools.DatTools/Writer.cs
View File

@@ -53,7 +53,7 @@ namespace SabreTools.DatTools
} }
// Ensure the output directory is set and created // Ensure the output directory is set and created
outDir = (outDir ?? string.Empty).Ensure(create: true); outDir = outDir.Ensure(create: true);
InternalStopwatch watch = new($"Writing out internal dat to '{outDir}'"); InternalStopwatch watch = new($"Writing out internal dat to '{outDir}'");

6
SabreTools.FileTypes/SabreTools.FileTypes.csproj
View File

@@ -27,14 +27,14 @@
<!-- Support for old .NET versions --> <!-- Support for old .NET versions -->
<ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))"> <ItemGroup Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))">
<PackageReference Include="SharpCompress" Version="0.34.2" /> <PackageReference Include="SharpCompress" Version="0.36.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" /> <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0" />
<PackageReference Include="ZstdSharp.Port" Version="0.7.4" /> <PackageReference Include="ZstdSharp.Port" Version="0.7.5" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SabreTools.Hashing" Version="1.1.4" /> <PackageReference Include="SabreTools.Hashing" Version="1.1.4" />
<PackageReference Include="SabreTools.IO" Version="1.3.1" /> <PackageReference Include="SabreTools.IO" Version="1.3.2" />
<PackageReference Include="SabreTools.Matching" Version="1.3.1" /> <PackageReference Include="SabreTools.Matching" Version="1.3.1" />
<PackageReference Include="SabreTools.Skippers" Version="1.1.2" /> <PackageReference Include="SabreTools.Skippers" Version="1.1.2" />
</ItemGroup> </ItemGroup>

2
SabreTools.Filter/SabreTools.Filter.csproj
View File

@@ -25,7 +25,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SabreTools.Models" Version="1.3.0" /> <PackageReference Include="SabreTools.Models" Version="1.4.0" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SabreTools.Filtering/SabreTools.Filtering.csproj
View File

@@ -29,7 +29,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.3.1" /> <PackageReference Include="SabreTools.IO" Version="1.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

2
SabreTools.Logging/SabreTools.Logging.csproj
View File

@@ -25,7 +25,7 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="SabreTools.IO" Version="1.3.1" /> <PackageReference Include="SabreTools.IO" Version="1.3.2" />
</ItemGroup> </ItemGroup>
</Project> </Project>

12
SabreTools.Test/SabreTools.Test.csproj
View File

@@ -27,15 +27,15 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="coverlet.collector" Version="6.0.0"> <PackageReference Include="coverlet.collector" Version="6.0.1">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" /> <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
<PackageReference Include="SabreTools.Models" Version="1.3.0" /> <PackageReference Include="SabreTools.Models" Version="1.4.0" />
<PackageReference Include="SabreTools.Serialization" Version="1.3.3" /> <PackageReference Include="SabreTools.Serialization" Version="1.4.0" />
<PackageReference Include="xunit" Version="2.6.2" /> <PackageReference Include="xunit" Version="2.7.0" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.4"> <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
</PackageReference> </PackageReference>

2
SabreTools/Features/Split.cs
View File

@@ -68,7 +68,7 @@ namespace SabreTools.Features
Parser.ParseInto(internalDat, file); Parser.ParseInto(internalDat, file);
// Get the output directory // Get the output directory
OutputDir = (OutputDir ?? string.Empty).Ensure(); OutputDir = OutputDir.Ensure();
OutputDir = file.GetOutputPath(OutputDir, GetBoolean(features, InplaceValue)); OutputDir = file.GetOutputPath(OutputDir, GetBoolean(features, InplaceValue));
// Extension splitting // Extension splitting

2
SabreTools/Features/Update.cs
View File

@@ -149,7 +149,7 @@ namespace SabreTools.Features
List<ParentablePath> basePaths = PathTool.GetFilesOnly(GetList(features, BaseDatListValue)); List<ParentablePath> basePaths = PathTool.GetFilesOnly(GetList(features, BaseDatListValue));
// Ensure the output directory // Ensure the output directory
OutputDir = (OutputDir ?? string.Empty).Ensure(); OutputDir = OutputDir.Ensure();
// If we're in standard update mode, run through all of the inputs // If we're in standard update mode, run through all of the inputs
if (updateMode == UpdateMode.None) if (updateMode == UpdateMode.None)

2
SabreTools/SabreTools.csproj
View File

@@ -23,7 +23,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.0" /> <PackageReference Include="Microsoft.Data.Sqlite" Version="8.0.3" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>