Bump version to 2.6.1

CHANGELIST.md

@@ -1,4 +1,13 @@
-### 2.6 (2023-07-xx)
+### 2.6.1 (2023-07-19)
+
+- Simplify Redumper error value extraction
+- Don't pull comment fields that auto-populate
+- Set best compression levels for log files
+- Be more explicit about .NET 6 limitation
+- Set extensions for Redumper in UI
+- Fix comment field pulling again
+
+### 2.6 (2023-07-14)
 
 - Update README
 - Add warning to login tab

MPF.Check/MPF.Check.csproj

@@ -10,7 +10,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Core/MPF.Core.csproj

@@ -6,7 +6,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.CueSheets/MPF.CueSheets.csproj

@@ -6,7 +6,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Library/InfoTool.cs

@@ -615,7 +615,11 @@ namespace MPF.Library
                 foreach (string file in files)
                 {
                     string entryName = file.Substring(outputDirectory.Length).TrimStart(Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar);
-                    zf.CreateEntryFromFile(file, entryName);
+#if NET48 || NETSTANDARD2_1
+                    zf.CreateEntryFromFile(file, entryName, CompressionLevel.Optimal);
+#else
+                    zf.CreateEntryFromFile(file, entryName, CompressionLevel.SmallestSize);
+#endif
 
                     // If the file is MPF-specific, don't delete
                     if (mpfFiles.Contains(file))
@@ -1200,7 +1204,7 @@ namespace MPF.Library
             return files;
         }
 
-        #endregion
+#endregion
 
         #region Normalization
 
@@ -2048,28 +2052,47 @@ namespace MPF.Library
                         if (!commentLine.Contains(siteCode.ShortName()))
                             continue;
 
+                        // Mark as having found a tag
+                        foundTag = true;
+
+                        // Cache the current site code
+                        lastSiteCode = siteCode;
+
+                        // A subset of tags can be multiline
+                        addToLast = IsMultiLine(siteCode);
+
                         // Skip certain site codes because of data issues
                         switch (siteCode)
                         {
-                            // Audio CD
-                            case SiteCode.UniversalHash:
-                                foundTag = true;
+                            // Multiple
+                            case SiteCode.InternalSerialName:
+                            case SiteCode.Multisession:
+                            case SiteCode.VolumeLabel:
                                 continue;
 
-                            // Xbox and X360
+                            // Audio CD
+                            case SiteCode.RingNonZeroDataStart:
+                            case SiteCode.UniversalHash:
+                                continue;
+
+                            // Microsoft Xbox and Xbox 360
                             case SiteCode.DMIHash:
                             case SiteCode.PFIHash:
                             case SiteCode.SSHash:
                             case SiteCode.SSVersion:
                             case SiteCode.XMID:
                             case SiteCode.XeMID:
-                                foundTag = true;
+                                continue;
+
+                            // Microsoft Xbox One and Series X/S
+                            case SiteCode.Filename:
+                                continue;
+
+                            // Nintendo Gamecube
+                            case SiteCode.InternalName:
                                 continue;
                         }
 
-                        // Cache the current site code
-                        lastSiteCode = siteCode;
-
                         // If we don't already have this site code, add it to the dictionary
                         if (!info.CommonDiscInfo.CommentsSpecialFields.ContainsKey(siteCode))
                             info.CommonDiscInfo.CommentsSpecialFields[siteCode] = $"(VERIFY THIS) {commentLine.Replace(siteCode.ShortName(), string.Empty).Trim()}";
@@ -2078,11 +2101,6 @@ namespace MPF.Library
                         else
                             info.CommonDiscInfo.CommentsSpecialFields[siteCode] += $", {commentLine.Replace(siteCode.ShortName(), string.Empty).Trim()}";
 
-                        // A subset of tags can be multiline
-                        addToLast = IsMultiLine(siteCode);
-
-                        // Mark as having found a tag
-                        foundTag = true;
                         break;
                     }
 

MPF.Library/MPF.Library.csproj

@@ -7,7 +7,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Modules/MPF.Modules.csproj

@@ -6,7 +6,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF.Modules/Redumper/Converters.cs

@@ -13,8 +13,18 @@ namespace MPF.Modules.Redumper
         /// <returns>Valid extension (with leading '.'), null on error</returns>
         public static string Extension(MediaType? type)
         {
-            // TODO: Determine what extensions are used for each supported type
-            return ".bin";
+            switch (type)
+            {
+                case MediaType.CDROM:
+                    return ".bin";
+                case MediaType.DVD:
+                case MediaType.HDDVD:
+                case MediaType.BluRay:
+                    return ".iso";
+                case MediaType.NONE:
+                default:
+                    return null;
+            }
         }
 
         #endregion

MPF.Modules/Redumper/Parameters.cs

@@ -1340,7 +1340,6 @@ namespace MPF.Modules.Redumper
                         return 0;
 
                     // Now that we're at the relevant lines, find the error count
-                    long errorCount = 0;
                     while (!sr.EndOfStream)
                     {
                         // Skip forward to the "REDUMP.ORG" line
@@ -1352,12 +1351,12 @@ namespace MPF.Modules.Redumper
                         // REDUMP.ORG errors: <error count>
                         string[] parts = line.Split(' ');
                         if (long.TryParse(parts[2], out long redump))
-                            errorCount += redump;
+                            return redump;
                         else
                             return -1;
                     }
 
-                    return errorCount;
+                    return -1;
                 }
                 catch
                 {

MPF.UI.Core/MPF.UI.Core.csproj

@@ -9,7 +9,7 @@
     <AssemblyName>MPF.UI.Core</AssemblyName>
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF/MPF.csproj

@@ -13,7 +13,7 @@
     <Authors>Matt Nadareski;ReignStumble;Jakz</Authors>
     <Copyright>Copyright (c)2019-2023</Copyright>
     <RepositoryUrl>https://github.com/SabreTools/MPF</RepositoryUrl>
-    <Version>2.6</Version>
+    <Version>2.6.1</Version>
     <AssemblyVersion>$(Version)</AssemblyVersion>
     <FileVersion>$(Version)</FileVersion>
     <IncludeSource>true</IncludeSource>

MPF/ViewModels/MainViewModel.cs

@@ -795,13 +795,13 @@ namespace MPF.UI.ViewModels
             if (defaultMediaType == MediaType.NONE)
                 defaultMediaType = MediaType.CDROM;
 
+#if NET48 || NETSTANDARD2_1
             // If we're skipping detection, set the default value
             if (App.Options.SkipMediaTypeDetection)
             {
                 App.Logger.VerboseLogLn($"Media type detection disabled, defaulting to {defaultMediaType.LongName()}.");
                 CurrentMediaType = defaultMediaType;
             }
-
             // If the drive is marked active, try to read from it
             else if (drive.MarkedActive)
             {
@@ -831,6 +831,11 @@ namespace MPF.UI.ViewModels
                 App.Logger.VerboseLogLn($"Drive marked as empty, defaulting to {defaultMediaType.LongName()}.");
                 CurrentMediaType = defaultMediaType;
             }
+#else
+            // Media type detection on initialize is always disabled
+            App.Logger.VerboseLogLn($"Media type detection not available, defaulting to {defaultMediaType.LongName()}.");
+            CurrentMediaType = defaultMediaType;
+#endif
 
             // Ensure the UI gets updated
             App.Instance.UpdateLayout();

MPF/Windows/OptionsWindow.xaml

@@ -133,7 +133,7 @@
                     <StackPanel>
                         <GroupBox Margin="5,5,5,5" HorizontalAlignment="Stretch" VerticalAlignment="Stretch" Header="Dumping">
                             <UniformGrid Columns="2" Rows="9">
-                                <CheckBox VerticalAlignment="Center" Content="Skip Type Detect"
+                                <CheckBox x:Name="SkipMediaTypeDetectionCheckBox" VerticalAlignment="Center" Content="Skip Type Detect"
                                      IsChecked="{Binding Options.SkipMediaTypeDetection}"
                                      ToolTip="Disable trying to guess media type inserted (may improve performance at startup)" Margin="0,4"
                                      />

MPF/Windows/OptionsWindow.xaml.cs

@@ -20,6 +20,12 @@ namespace MPF.Windows
         {
             InitializeComponent();
             DataContext = new OptionsViewModel(this);
+
+#if NET6_0_OR_GREATER
+            this.SkipMediaTypeDetectionCheckBox.IsEnabled = false;
+            this.SkipMediaTypeDetectionCheckBox.IsChecked = false;
+            this.SkipMediaTypeDetectionCheckBox.ToolTip = "This feature is not enabled for .NET 6";
+#endif
         }
     }
 }

appveyor.yml

@@ -1,5 +1,5 @@
 # version format
-version: 2.6-{build}
+version: 2.6.1-{build}
 
 # pull request template
 pull_requests: