From 2699ced133760960d11b75fc00e9aefaa83318de Mon Sep 17 00:00:00 2001 From: YoshiRulz Date: Thu, 4 Apr 2019 00:37:01 +1000 Subject: [PATCH] Use string interpolation --- BizHawk.Client.DBMan/DATTools/DATConverter.cs | 8 +++----- BizHawk.Client.DBMan/DATTools/NOINTROParser.cs | 6 +++--- BizHawk.Client.DBMan/DATTools/TOSECParser.cs | 6 +++--- BizHawk.Client.DBMan/DB.cs | 2 +- BizHawk.Client.DBMan/RomHasher.cs | 5 +---- BizHawk.Client.MultiHawk/Input/GamePad.cs | 10 +++++----- BizHawk.Client.MultiHawk/Input/Input.cs | 5 +---- BizHawk.Client.MultiHawk/Mainform.cs | 4 ++-- BizHawk.Client.MultiHawk/movie/PlayMovie.cs | 2 +- 9 files changed, 20 insertions(+), 28 deletions(-) diff --git a/BizHawk.Client.DBMan/DATTools/DATConverter.cs b/BizHawk.Client.DBMan/DATTools/DATConverter.cs index 8fc61718ec..686a826c46 100644 --- a/BizHawk.Client.DBMan/DATTools/DATConverter.cs +++ b/BizHawk.Client.DBMan/DATTools/DATConverter.cs @@ -112,7 +112,7 @@ namespace BizHawk.Client.DBMan { if (s.ToString().Trim() == "") { - MessageBox.Show("The selected file: " + s.ToString() + "Cannot be found.\n\nSort this out and try again"); + MessageBox.Show($"The selected file: {s}Cannot be found.\n\nSort this out and try again"); return; } @@ -132,9 +132,7 @@ namespace BizHawk.Client.DBMan res = dp.ParseDAT(files.ToArray()); } - string fName = "gamedb_" + - GameDB.GetSystemCode((SystemType)Enum.Parse(typeof(SystemType), comboBoxSystemSelect.SelectedValue.ToString())) + - "_DevExport_" + DateTime.UtcNow.ToString("yyyy-MM-dd_HH_mm_ss") + ".txt"; + string fName = $"gamedb_{GameDB.GetSystemCode((SystemType)Enum.Parse(typeof(SystemType), comboBoxSystemSelect.SelectedValue.ToString()))}_DevExport_{DateTime.UtcNow:yyyy-MM-dd_HH_mm_ss}.txt"; try { @@ -142,7 +140,7 @@ namespace BizHawk.Client.DBMan } catch (Exception ex) { - MessageBox.Show("Error writing file: " + fName + "\n\n" + ex.Message); + MessageBox.Show($"Error writing file: {fName}\n\n{ex.Message}"); } } diff --git a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs index 6ab083c29d..de710c70d2 100644 --- a/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs +++ b/BizHawk.Client.DBMan/DATTools/NOINTROParser.cs @@ -58,9 +58,9 @@ namespace BizHawk.Client.DBMan // start comment block List comments = new List { - "Type:\t" + "NO-INTRO", - "Source:\t" + description, - "FileGen:\t" + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss") + " (UTC)", + "Type:\tNO-INTRO", + $"Source:\t{description}", + $"FileGen:\t{DateTime.UtcNow:yyyy-MM-dd HH:mm:ss} (UTC)", }; AddCommentBlock(comments.ToArray()); diff --git a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs index 6a7af48079..7ab55b2036 100644 --- a/BizHawk.Client.DBMan/DATTools/TOSECParser.cs +++ b/BizHawk.Client.DBMan/DATTools/TOSECParser.cs @@ -59,9 +59,9 @@ namespace BizHawk.Client.DBMan // start comment block List comments = new List { - "Type:\t" + category, - "Source:\t" + description, - "FileGen:\t" + DateTime.UtcNow.ToString("yyyy-MM-dd HH:mm:ss") + " (UTC)", + $"Type:\t{category}", + $"Source:\t{description}", + $"FileGen:\t{DateTime.UtcNow:yyyy-MM-dd HH:mm:ss} (UTC)", }; AddCommentBlock(comments.ToArray()); diff --git a/BizHawk.Client.DBMan/DB.cs b/BizHawk.Client.DBMan/DB.cs index e10eea1e1b..c79cc2d95b 100644 --- a/BizHawk.Client.DBMan/DB.cs +++ b/BizHawk.Client.DBMan/DB.cs @@ -36,7 +36,7 @@ namespace BizHawk.Client.DBMan } } - public string SizeFriendly { get { return string.Format("{0} bytes ({1}k)", Size, Size / 1024); } } + public string SizeFriendly => $"{Size} bytes ({Size >> 10}k)"; public bool New { get { return (Created > Modified); } } public string NameWithTheFlipped diff --git a/BizHawk.Client.DBMan/RomHasher.cs b/BizHawk.Client.DBMan/RomHasher.cs index 8a8be1393a..b7a0f29f4a 100644 --- a/BizHawk.Client.DBMan/RomHasher.cs +++ b/BizHawk.Client.DBMan/RomHasher.cs @@ -190,10 +190,7 @@ namespace BizHawk.Client.DBMan } } - static string Hash_CRC32(byte[] data) - { - return string.Format("{0:X8}", CRC32.Calculate(data)); - } + static string Hash_CRC32(byte[] data) => $"{CRC32.Calculate(data):X8}"; static string Hash_SHA1(byte[] data) { diff --git a/BizHawk.Client.MultiHawk/Input/GamePad.cs b/BizHawk.Client.MultiHawk/Input/GamePad.cs index 2865cf89be..75e03c44a2 100644 --- a/BizHawk.Client.MultiHawk/Input/GamePad.cs +++ b/BizHawk.Client.MultiHawk/Input/GamePad.cs @@ -192,19 +192,19 @@ namespace BizHawk.Client.MultiHawk for (int i = 0; i < state.GetButtons().Length; i++) { int j = i; - AddItem(string.Format("B{0}", i + 1), () => state.IsPressed(j)); + AddItem($"B{i + 1}", () => state.IsPressed(j)); } for (int i = 0; i < state.GetPointOfViewControllers().Length; i++) { int j = i; - AddItem(string.Format("POV{0}U", i + 1), + AddItem($"POV{i + 1}U", () => { int t = state.GetPointOfViewControllers()[j]; return (t >= 0 && t <= 4500) || (t >= 31500 && t < 36000); }); - AddItem(string.Format("POV{0}D", i + 1), + AddItem($"POV{i + 1}D", () => { int t = state.GetPointOfViewControllers()[j]; return t >= 13500 && t <= 22500; }); - AddItem(string.Format("POV{0}L", i + 1), + AddItem($"POV{i + 1}L", () => { int t = state.GetPointOfViewControllers()[j]; return t >= 22500 && t <= 31500; }); - AddItem(string.Format("POV{0}R", i + 1), + AddItem($"POV{i + 1}R", () => { int t = state.GetPointOfViewControllers()[j]; return t >= 4500 && t <= 13500; }); } } diff --git a/BizHawk.Client.MultiHawk/Input/Input.cs b/BizHawk.Client.MultiHawk/Input/Input.cs index 4fa52538d1..9c3abc76f0 100644 --- a/BizHawk.Client.MultiHawk/Input/Input.cs +++ b/BizHawk.Client.MultiHawk/Input/Input.cs @@ -183,10 +183,7 @@ namespace BizHawk.Client.MultiHawk { public LogicalButton LogicalButton; public InputEventType EventType; - public override string ToString() - { - return string.Format("{0}:{1}", EventType.ToString(), LogicalButton.ToString()); - } + public override string ToString() => $"{EventType.ToString()}:{LogicalButton.ToString()}"; } private readonly WorkingDictionary ModifierState = new WorkingDictionary(); diff --git a/BizHawk.Client.MultiHawk/Mainform.cs b/BizHawk.Client.MultiHawk/Mainform.cs index 3001f38423..cf49fe3706 100644 --- a/BizHawk.Client.MultiHawk/Mainform.cs +++ b/BizHawk.Client.MultiHawk/Mainform.cs @@ -1083,11 +1083,11 @@ namespace BizHawk.Client.MultiHawk { if (Global.MovieSession.Movie.IsFinished) { - frame += string.Format(" / {0} (finished)", Global.MovieSession.Movie.FrameCount); + frame += $" / {Global.MovieSession.Movie.FrameCount} (finished)"; } else if (Global.MovieSession.Movie.IsPlaying) { - frame += string.Format(" / {0}", Global.MovieSession.Movie.FrameCount); + frame += $" / {Global.MovieSession.Movie.FrameCount}"; } } diff --git a/BizHawk.Client.MultiHawk/movie/PlayMovie.cs b/BizHawk.Client.MultiHawk/movie/PlayMovie.cs index 5c1d3464d2..711369ed27 100644 --- a/BizHawk.Client.MultiHawk/movie/PlayMovie.cs +++ b/BizHawk.Client.MultiHawk/movie/PlayMovie.cs @@ -435,7 +435,7 @@ namespace BizHawk.Client.MultiHawk } var FpsItem = new ListViewItem("Fps"); - FpsItem.SubItems.Add(string.Format("{0:0.#######}", Fps(_movieList[firstIndex]))); + FpsItem.SubItems.Add($"{Fps(_movieList[firstIndex]):0.#######}"); DetailsView.Items.Add(FpsItem); var FramesItem = new ListViewItem("Frames");