diff --git a/CHANGELIST.md b/CHANGELIST.md index cb58e1c2..38f57e3f 100644 --- a/CHANGELIST.md +++ b/CHANGELIST.md @@ -128,6 +128,7 @@ - Add important Redumper note - Update to DIC 20220909 - Possibly fix PIC parsing +- Add PS3 folder/file checks for detection ### 2.3 (2022-02-05) - Start overhauling Redump information pulling, again diff --git a/MPF.Core/Data/Drive.cs b/MPF.Core/Data/Drive.cs index a7ef5807..6e7a7e6a 100644 --- a/MPF.Core/Data/Drive.cs +++ b/MPF.Core/Data/Drive.cs @@ -284,6 +284,18 @@ namespace MPF.Core.Data return RedumpSystem.SonyPlayStation; } + // Sony PlayStation 3 + try + { + if (Directory.Exists(Path.Combine(drivePath, "PS3_GAME")) + || Directory.Exists(Path.Combine(drivePath, "PS3_UPDATE")) + || File.Exists(Path.Combine(drivePath, "PS3_DISC.SFB"))) + { + return RedumpSystem.MicrosoftXbox360; + } + } + catch { } + // V.Tech V.Flash / V.Smile Pro if (File.Exists(Path.Combine(drivePath, "0SYSTEM"))) { diff --git a/MPF.Library/InfoTool.cs b/MPF.Library/InfoTool.cs index 7aed69d8..71d06796 100644 --- a/MPF.Library/InfoTool.cs +++ b/MPF.Library/InfoTool.cs @@ -566,9 +566,9 @@ namespace MPF.Library } } -#endregion + #endregion -#region Information Output + #region Information Output /// /// Compress log files to save space @@ -1139,9 +1139,9 @@ namespace MPF.Library AddIfExists(output, key, string.Join(", ", value.Select(o => o.ToString())), indent); } -#endregion + #endregion -#region Normalization + #region Normalization /// /// Adjust the disc type based on size and layerbreak information @@ -1262,9 +1262,9 @@ namespace MPF.Library return (directory, filename); } -#endregion + #endregion -#region Web Calls + #region Web Calls /// /// Create a new SubmissionInfo object from a disc page @@ -1287,7 +1287,7 @@ namespace MPF.Library try { // Load the current disc page into an XML document - XmlDocument redumpPage = new XmlDocument() {PreserveWhitespace = true}; + XmlDocument redumpPage = new XmlDocument() { PreserveWhitespace = true }; redumpPage.LoadXml(discData); // If the current page isn't valid, we can't parse it @@ -2044,9 +2044,9 @@ namespace MPF.Library return localCount == remoteCount; } -#endregion + #endregion -#region Helpers + #region Helpers /// /// Format a single site tag to string @@ -2250,7 +2250,7 @@ namespace MPF.Library sorted.Add(new KeyValuePair(SiteCode.Games, tags[SiteCode.Games])); if (tags.ContainsKey(SiteCode.NetYarozeGames)) sorted.Add(new KeyValuePair(SiteCode.NetYarozeGames, tags[SiteCode.NetYarozeGames])); - + // Demos if (tags.ContainsKey(SiteCode.PlayableDemos)) sorted.Add(new KeyValuePair(SiteCode.PlayableDemos, tags[SiteCode.PlayableDemos])); @@ -2276,6 +2276,6 @@ namespace MPF.Library return sorted; } -#endregion + #endregion } }