String interpolation sanitation.

mcneel · May 10, 2016 · 81f0e24 · 81f0e24
1 parent 0ed0f2b
commit 81f0e24
Show file tree

Hide file tree

Showing 8 changed files with 17 additions and 18 deletions.
diff --git a/Commands/ChangeSamples.cs b/Commands/ChangeSamples.cs
@@ -55,7 +55,7 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 					if (get_rc == GetResult.Number)
 					{
 						var nr = get_number.Number();
-						RhinoApp.WriteLine(string.Format("User changes samples to {0}", nr));
+						RhinoApp.WriteLine($"User changes samples to {nr}");
 						rvp.ChangeSamples(nr);
 						return Result.Success;
 					}

diff --git a/Commands/ListDevices.cs b/Commands/ListDevices.cs
@@ -46,14 +46,12 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 			Plugin.InitialiseCSycles();
 
 			var num_devices = Device.Count;
-			RhinoApp.WriteLine(String.Format("We have {0} device{1}", num_devices, num_devices != 1 ? "s" : ""));
+			var end_s = num_devices != 1 ? "s" : "";
+			RhinoApp.WriteLine($"We have {num_devices} device{end_s}");
 			RhinoApp.WriteLine("----------");
 			foreach (var dev in Device.Devices)
 			{
-				RhinoApp.WriteLine(String.Format("	Device {0}: {1} > {2} > {3} | {4} | {5} | {6} | {7}", dev.Id,
-					dev.Name, dev.Description, dev.Num,
-					dev.DisplayDevice, dev.AdvancedShading,
-					dev.PackImages, dev.Type));
+				RhinoApp.WriteLine($"	Device {dev.Id}: {dev.Name} > {dev.Description} > {dev.Num} | {dev.DisplayDevice} | {dev.AdvancedShading} | {dev.PackImages} | {dev.Type}");
 			}
 			RhinoApp.WriteLine("----------");
 			return Result.Success;

diff --git a/Commands/SetRenderOptions.cs b/Commands/SetRenderOptions.cs
@@ -122,7 +122,7 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 				switch (get_rc)
 				{
 					case GetResult.Number:
-						RhinoApp.WriteLine(String.Format("We got: {0}, {1}, {2}", get_number.Number(), min_bounce.CurrentValue, max_bounce.CurrentValue));
+						RhinoApp.WriteLine($"We got: {get_number.Number()}, {min_bounce.CurrentValue}, {max_bounce.CurrentValue}");
 						RcCore.It.EngineSettings.Samples = (int)get_number.Number();
 						RcCore.It.EngineSettings.UseCustomQualitySettings = use_custom_settings.CurrentValue;
 						RcCore.It.EngineSettings.Seed = seed.CurrentValue;

diff --git a/Commands/SetThreads.cs b/Commands/SetThreads.cs
@@ -49,13 +49,14 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 			get_number.SetLowerLimit(0, false);
 			get_number.SetUpperLimit(Environment.ProcessorCount, false);
 			get_number.SetDefaultInteger(RcCore.It.EngineSettings.Threads);
-			get_number.SetCommandPrompt(String.Format("Set CPU render threads (max {0}, 0 for automatic)", Environment.ProcessorCount));
+			get_number.SetCommandPrompt($"Set CPU render threads (max {Environment.ProcessorCount}, 0 for automatic)");
 			var get_rc = get_number.Get();
 			if (get_number.CommandResult() != Result.Success) return get_number.CommandResult();
 			if (get_rc == GetResult.Number)
 			{
 				var nr = get_number.Number();
-				RhinoApp.WriteLine(String.Format("User wants {0} CPU thread{1}", nr, nr > 0 ? "s" : ""));
+				var end_s = nr != 1 ? "s" : "";
+				RhinoApp.WriteLine($"User wants {nr} CPU thread{end_s}");
 				RcCore.It.EngineSettings.Threads = nr;
 				return Result.Success;
 			}

diff --git a/Commands/ShowDeviceCapabilities.cs b/Commands/ShowDeviceCapabilities.cs
@@ -44,7 +44,7 @@ public override string EnglishName
 		protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 		{
 			var capabilities = Device.Capabilities;
-			RhinoApp.WriteLine(String.Format("The following capabilities have been found by Cycles:\n----------\n{0}\n\n----------", capabilities));
+			RhinoApp.WriteLine($"The following capabilities have been found by Cycles:\n----------\n{capabilities}\n\n----------");
 			return Result.Success;
 		}
 	}

diff --git a/Commands/ShowInfo.cs b/Commands/ShowInfo.cs
@@ -50,8 +50,8 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 			var csycles_fvi = FileVersionInfo.GetVersionInfo(csycles_ass.Location);
 
 			RhinoApp.WriteLine("----------");
-			RhinoApp.WriteLine("RhinoCycles {0} @ {1}", RhinoBuildConstants.VERSION_STRING, rhcycles_ass.Location);
-			RhinoApp.WriteLine("CCSycles {0} @ {1}", csycles_fvi.FileVersion, csycles_ass.Location);
+			RhinoApp.WriteLine($"RhinoCycles {RhinoBuildConstants.VERSION_STRING} @ {rhcycles_ass.Location}");
+			RhinoApp.WriteLine($"CCSycles {csycles_fvi.FileVersion} @ {csycles_ass.Location}");
 			RhinoApp.WriteLine("----------");
 			return Result.Success;
 		}

diff --git a/Commands/ShowPaths.cs b/Commands/ShowPaths.cs
@@ -46,11 +46,11 @@ protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 			Plugin.InitialiseCSycles();
 
 			RhinoApp.WriteLine("----------");
-			RhinoApp.WriteLine("Absolute path {0}", RcCore.It.KernelPath);
-			RhinoApp.WriteLine("Relative path {0}", RcCore.It.KernelPathRelative);
-			RhinoApp.WriteLine("Plug-in path {0}", RcCore.It.PluginPath);
-			RhinoApp.WriteLine("App path {0}", RcCore.It.AppPath);
-			RhinoApp.WriteLine("User data path {0}", RcCore.It.DataUserPath);
+			RhinoApp.WriteLine($"Absolute path {RcCore.It.KernelPath}");
+			RhinoApp.WriteLine($"Relative path {RcCore.It.KernelPathRelative}");
+			RhinoApp.WriteLine($"Plug-in path {RcCore.It.PluginPath}");
+			RhinoApp.WriteLine($"App path {RcCore.It.AppPath}");
+			RhinoApp.WriteLine($"User data path {RcCore.It.DataUserPath}");
 			RhinoApp.WriteLine("----------");
 			return Result.Success;
 		}

diff --git a/Commands/ToggleShaders.cs b/Commands/ToggleShaders.cs
@@ -38,7 +38,7 @@ public override string EnglishName
 		protected override Result RunCommand(RhinoDoc doc, RunMode mode)
 		{
 			RcCore.It.EngineSettings.UseSimpleShaders = !RcCore.It.EngineSettings.UseSimpleShaders;
-			RhinoApp.WriteLine("UseSimpleShaders set to {0}", RcCore.It.EngineSettings.UseSimpleShaders);
+			RhinoApp.WriteLine($"UseSimpleShaders set to {RcCore.It.EngineSettings.UseSimpleShaders}");
 			return Result.Success;
 		}
 	}