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

Consolidate NewDat

Browse Source
This commit is contained in:
Matt Nadareski
2024-10-30 14:11:35 -04:00
parent 895a98169c
commit b66835ea78
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -74,11 +74,7 @@ namespace SabreTools.DatFiles
{
var newDat = item.Read<Models.OfflineList.NewDat>(Models.Metadata.Header.NewDatKey);
if (newDat != null)
{
Header.SetFieldValue<string?>("DATVERSIONURL", newDat.DatVersionUrl);
Header.SetFieldValue<Models.OfflineList.DatUrl?>("DATURL", newDat.DatUrl);
Header.SetFieldValue<string?>("IMURL", newDat.ImUrl);
}
Header.SetFieldValue<Models.OfflineList.NewDat?>(Models.Metadata.Header.NewDatKey, newDat);
}
if (item.ContainsKey(Models.Metadata.Header.SearchKey))
{

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

@@ -87,15 +87,7 @@ namespace SabreTools.DatFiles
if (Header.InfosSpecified)
header[Models.Metadata.Header.InfosKey] = Header.GetFieldValue<Models.OfflineList.Infos>(Models.Metadata.Header.InfosKey);
if (Header.NewDatSpecified)
{
var newDat = new Models.OfflineList.NewDat
{
DatVersionUrl = Header.GetStringFieldValue("DATVERSIONURL"),
DatUrl = Header.GetFieldValue<Models.OfflineList.DatUrl?>("DATURL"),
ImUrl = Header.GetStringFieldValue("IMURL"),
};
header[Models.Metadata.Header.NewDatKey] = newDat;
}
header[Models.Metadata.Header.NewDatKey] = Header.GetFieldValue<Models.OfflineList.NewDat>(Models.Metadata.Header.NewDatKey);
if (Header.SearchSpecified)
header[Models.Metadata.Header.SearchKey] = Header.GetFieldValue<Models.OfflineList.Search>(Models.Metadata.Header.SearchKey);

7
SabreTools.DatFiles/DatHeader.cs
View File

@@ -106,8 +106,7 @@ namespace SabreTools.DatFiles
{
get
{
var infos = GetFieldValue<Models.OfflineList.InfoBase[]?>(Models.Metadata.Header.InfosKey);
return infos != null && infos.Length > 0;
return GetFieldValue<Models.OfflineList.Infos?>(Models.Metadata.Header.InfosKey) != null;
}
}
@@ -116,9 +115,7 @@ namespace SabreTools.DatFiles
{
get
{
return GetStringFieldValue("DATVERSIONURL") != null
&& GetFieldValue<Models.OfflineList.DatUrl?>("DATURL") != null
&& GetStringFieldValue("IMURL") != null;
return GetFieldValue<Models.OfflineList.NewDat?>(Models.Metadata.Header.NewDatKey) != null;
}
}