From e5154dad5b745ecdfcb97f2402b013ceb452f763 Mon Sep 17 00:00:00 2001 From: Matt Nadareski Date: Tue, 12 Apr 2022 10:10:07 -0700 Subject: [PATCH] Add multisession pseudo-tag --- CHANGELIST.md | 1 + MPF.Library/InfoTool.cs | 4 +++- MPF.UI.Core/ViewModels/DiscInformationViewModel.cs | 5 +++++ MPF.UI.Core/Windows/DiscInformationWindow.xaml | 2 ++ RedumpLib/Data/Enumerations.cs | 4 ++++ 5 files changed, 15 insertions(+), 1 deletion(-) diff --git a/CHANGELIST.md b/CHANGELIST.md index ebd7425b..e8caf148 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -50,6 +50,7 @@ - Add warning to tooltip - Create core UI library - Rename MPF.GUI to MPF.UI +- Add multisession pseudo-tag ### 2.3 (2022-02-05) - Start overhauling Redump information pulling, again diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 761d488f..6a675ec4 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -2049,7 +2049,9 @@ namespace MPF.Library sorted.Add(new KeyValuePair(SiteCode.InternalSerialName, tags[SiteCode.InternalSerialName])); if (tags.ContainsKey(SiteCode.VolumeLabel)) sorted.Add(new KeyValuePair(SiteCode.VolumeLabel, tags[SiteCode.VolumeLabel])); - + if (tags.ContainsKey(SiteCode.Multisession)) + sorted.Add(new KeyValuePair(SiteCode.Multisession, tags[SiteCode.Multisession])); + if (tags.ContainsKey(SiteCode.XMID)) sorted.Add(new KeyValuePair(SiteCode.XMID, tags[SiteCode.XMID])); if (tags.ContainsKey(SiteCode.XeMID)) diff --git a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs index f943d9e2..c6a0928b 100644 --- a/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs +++ b/MPF.UI.Core/ViewModels/DiscInformationViewModel.cs @@ -316,6 +316,8 @@ namespace MPF.UI.Core.ViewModels Parent.PIC.Visibility = Visibility.Collapsed; if (string.IsNullOrWhiteSpace(SubmissionInfo?.Extras?.PVD)) Parent.PVD.Visibility = Visibility.Collapsed; + if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.Multisession) != true) + Parent.Multisession.Visibility = Visibility.Collapsed; if (string.IsNullOrWhiteSpace(SubmissionInfo?.CopyProtection?.SecuROMData)) Parent.SecuROMData.Visibility = Visibility.Collapsed; if (SubmissionInfo?.CommonDiscInfo?.CommentsSpecialFields.Keys.Contains(SiteCode.SSHash) != true) @@ -451,6 +453,8 @@ namespace MPF.UI.Core.ViewModels Parent.DMIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash]; if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.InternalSerialName)) Parent.InternalSerialName.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName]; + if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.Multisession)) + Parent.Multisession.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession]; if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.PFIHash)) Parent.PFIHash.Text = SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash]; if (SubmissionInfo.CommonDiscInfo.CommentsSpecialFields.ContainsKey(SiteCode.SSHash)) @@ -565,6 +569,7 @@ namespace MPF.UI.Core.ViewModels // Read-Only Information SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.DMIHash] = Parent.DMIHash.Text; SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.InternalSerialName] = Parent.InternalSerialName.Text; + SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.Multisession] = Parent.Multisession.Text; SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.PFIHash] = Parent.PFIHash.Text; SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSHash] = Parent.SSHash.Text; SubmissionInfo.CommonDiscInfo.CommentsSpecialFields[SiteCode.SSVersion] = Parent.SSVersion.Text; diff --git a/MPF.UI.Core/Windows/DiscInformationWindow.xaml b/MPF.UI.Core/Windows/DiscInformationWindow.xaml index 51517d18..7030f8de 100644 --- a/MPF.UI.Core/Windows/DiscInformationWindow.xaml +++ b/MPF.UI.Core/Windows/DiscInformationWindow.xaml @@ -352,6 +352,8 @@ Text="{Binding SubmissionInfo.Extras.Header, Mode=TwoWay}" TextHeight="75" TextWrapping="NoWrap" VerticalContentAlignmentValue="Top" HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto"/> +