SabreTools/MPF
1
0
Fork 0
mirror of https://github.com/SabreTools/MPF.git synced 2026-07-02 17:24:48 +00:00
Code Issues 392 Packages Projects Releases 20 Wiki Activity

Inline all of those params during logging

Browse Source
This commit is contained in:
Matt Nadareski
2021-01-25 10:02:34 -08:00
parent 47b5bbe7e7
commit 5dd36d7b06
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
MPF/ViewModels.cs
View File

@@ -219,8 +219,7 @@ namespace MPF
_logWindow.AppendToTextBox(text, Brushes.Yellow);
}
public void VerboseLog(string format, params object[] args) => VerboseLog(string.Format(format, args));
public void VerboseLogLn(string format, params object[] args) => VerboseLog(string.Format(format, args) + "\n");
public void VerboseLogLn(string format) => VerboseLog(format + "\n");
}
public static class ViewModels

6
MPF/Windows/DiscInformationWindow.xaml.cs
View File

@@ -151,7 +151,7 @@ namespace MPF.Windows
{
var categories = Enum.GetValues(typeof(DiscCategory)).OfType<DiscCategory?>().ToList();
ViewModels.LoggerViewModel.VerboseLogLn("Populating categories, {0} categories found.", categories.Count);
ViewModels.LoggerViewModel.VerboseLogLn($"Populating categories, {categories.Count} categories found.");
Categories = new List<CategoryComboBoxItem>();
foreach (var category in categories)
@@ -170,7 +170,7 @@ namespace MPF.Windows
{
var languages = Enum.GetValues(typeof(Language)).OfType<Language?>().ToList();
ViewModels.LoggerViewModel.VerboseLogLn("Populating languages, {0} languages found.", languages.Count);
ViewModels.LoggerViewModel.VerboseLogLn($"Populating languages, {languages.Count} languages found.");
Languages = new List<LanguageComboBoxItem>();
foreach (var language in languages)
@@ -189,7 +189,7 @@ namespace MPF.Windows
{
var regions = Enum.GetValues(typeof(Region)).OfType<Region?>().ToList();
ViewModels.LoggerViewModel.VerboseLogLn("Populating regions, {0} regions found.", regions.Count);
ViewModels.LoggerViewModel.VerboseLogLn($"Populating regions, {regions.Count} regions found.");
Regions = new List<RegionComboBoxItem>();
foreach (var region in regions)

18
MPF/Windows/MainWindow.xaml.cs
View File

@@ -141,7 +141,7 @@ namespace MPF.Windows
}
else if (drive.MarkedActive)
{
ViewModels.LoggerViewModel.VerboseLog("Trying to detect media type for drive {0}.. ", drive.Letter);
ViewModels.LoggerViewModel.VerboseLog($"Trying to detect media type for drive {drive.Letter}.. ");
string errorMessage;
(CurrentMediaType, errorMessage) = Validators.GetMediaType(drive);
@@ -203,7 +203,7 @@ namespace MPF.Windows
{
if (!UIOptions.Options.SkipSystemDetection && DriveLetterComboBox.SelectedIndex > -1)
{
ViewModels.LoggerViewModel.VerboseLog("Trying to detect system for drive {0}.. ", Drives[DriveLetterComboBox.SelectedIndex].Letter);
ViewModels.LoggerViewModel.VerboseLog($"Trying to detect system for drive {Drives[DriveLetterComboBox.SelectedIndex].Letter}.. ");
var currentSystem = Validators.GetKnownSystem(Drives[DriveLetterComboBox.SelectedIndex]) ?? Converters.ToKnownSystem(UIOptions.Options.DefaultSystem);
ViewModels.LoggerViewModel.VerboseLogLn(currentSystem == null || currentSystem == KnownSystem.NONE ? "unable to detect." : ("detected " + currentSystem.LongName() + "."));
@@ -293,7 +293,7 @@ namespace MPF.Windows
if (DriveLetterComboBox.Items.Count > 0)
{
ViewModels.LoggerViewModel.VerboseLogLn("Found {0} drives: {1}", Drives.Count, string.Join(", ", Drives.Select(d => d.Letter)));
ViewModels.LoggerViewModel.VerboseLogLn($"Found {Drives.Count} drives: {string.Join(", ", Drives.Select(d => d.Letter))}");
// Check for active optical drives first
int index = Drives.FindIndex(d => d.MarkedActive && d.InternalDriveType == InternalDriveType.Optical);
@@ -358,7 +358,7 @@ namespace MPF.Windows
{
var knownSystems = Validators.CreateListOfSystems();
ViewModels.LoggerViewModel.VerboseLogLn("Populating systems, {0} systems found.", knownSystems.Count);
ViewModels.LoggerViewModel.VerboseLogLn($"Populating systems, {knownSystems.Count} systems found.");
Dictionary<KnownSystemCategory, List<KnownSystem?>> mapping = knownSystems
.GroupBy(s => s.Category())
@@ -484,7 +484,7 @@ namespace MPF.Windows
var drive = DriveLetterComboBox.SelectedItem as Drive;
if (drive.Letter != default(char))
{
ViewModels.LoggerViewModel.VerboseLogLn("Scanning for copy protection in {0}", drive.Letter);
ViewModels.LoggerViewModel.VerboseLogLn($"Scanning for copy protection in {drive.Letter}");
var tempContent = StatusLabel.Content;
StatusLabel.Content = "Scanning for copy protection... this might take a while!";
@@ -506,7 +506,7 @@ namespace MPF.Windows
if (!ViewModels.LoggerViewModel.WindowVisible)
MessageBox.Show(protections, "Detected Protection", MessageBoxButton.OK, MessageBoxImage.Information);
ViewModels.LoggerViewModel.VerboseLog("Detected the following protections in {0}:\r\n\r\n{1}", drive.Letter, protections);
ViewModels.LoggerViewModel.VerboseLog($"Detected the following protections in {drive.Letter}:\r\n\r\n{protections}");
StatusLabel.Content = tempContent;
StartStopButton.IsEnabled = true;
@@ -540,11 +540,11 @@ namespace MPF.Windows
// Set the drive speed list that's appropriate
var values = Interface.GetSpeedsForMediaType(CurrentMediaType);
DriveSpeedComboBox.ItemsSource = values;
ViewModels.LoggerViewModel.VerboseLogLn("Supported media speeds: {0}", string.Join(",", values));
ViewModels.LoggerViewModel.VerboseLogLn($"Supported media speeds: {string.Join(", ", values)}");
// Set the selected speed
int speed = UIOptions.GetPreferredDumpSpeedForMediaType(CurrentMediaType);
ViewModels.LoggerViewModel.VerboseLogLn("Setting drive speed to: {0}", speed);
ViewModels.LoggerViewModel.VerboseLogLn($"Setting drive speed to: {speed}");
DriveSpeedComboBox.SelectedValue = speed;
}
@@ -933,7 +933,7 @@ namespace MPF.Windows
return;
}
ViewModels.LoggerViewModel.VerboseLogLn("Changed system to: {0}", (SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem).Name);
ViewModels.LoggerViewModel.VerboseLogLn($"Changed system to: {(SystemTypeComboBox.SelectedItem as KnownSystemComboBoxItem).Name}");
PopulateMediaType();
GetOutputNames(false);
EnsureDiscInformation();