diff options
author | warwickmm <warwickmm@users.noreply.github.com> | 2021-05-16 20:33:36 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-05-16 20:33:36 +0300 |
commit | 0a43410535d89e3e8ca93e78f799b9cec8812310 (patch) | |
tree | 0983710211d37943327c963f137990cd9eb42b5d | |
parent | 7b4f475762928ae72575cb96279364f0784de4e4 (diff) | |
parent | a156c511da185fbf3bfd7fc58276f7ded7e54074 (diff) |
Merge pull request #4511 from marodev/cosmetics/technical-debt-use-string-interpolation
Simplify string formatting.
-rw-r--r-- | Duplicati/Library/Backend/Rclone/Rclone.cs | 14 | ||||
-rw-r--r-- | Duplicati/UnitTest/PurgeTesting.cs | 4 |
2 files changed, 9 insertions, 9 deletions
diff --git a/Duplicati/Library/Backend/Rclone/Rclone.cs b/Duplicati/Library/Backend/Rclone/Rclone.cs index a4bd84fca..97804dd58 100644 --- a/Duplicati/Library/Backend/Rclone/Rclone.cs +++ b/Duplicati/Library/Backend/Rclone/Rclone.cs @@ -103,7 +103,7 @@ namespace Duplicati.Library.Backend ProcessStartInfo psi = new ProcessStartInfo
{
- Arguments = String.Format("{0} {1}", arguments, opt_rclone),
+ Arguments = $"{arguments} {opt_rclone}",
CreateNoWindow = true,
FileName = command,
RedirectStandardError = true,
@@ -181,7 +181,7 @@ namespace Duplicati.Library.Backend if (errorBuilder.ToString().Contains(RCLONE_ERROR_CONFIG_NOT_FOUND))
{
- throw new Exception(String.Format("Missing config file? {0}", errorBuilder));
+ throw new Exception($"Missing config file? {errorBuilder}");
}
if (errorBuilder.Length > 0) {
@@ -199,7 +199,7 @@ namespace Duplicati.Library.Backend try
{
- str_result = RcloneCommandExecuter(rclone_executable, String.Format("lsjson {0}:{1}", remote_repo, remote_path), CancellationToken.None).Await();
+ str_result = RcloneCommandExecuter(rclone_executable, $"lsjson {remote_repo}:{remote_path}", CancellationToken.None).Await();
// this will give an error if the executable does not exist.
}
@@ -237,7 +237,7 @@ namespace Duplicati.Library.Backend {
try
{
- return RcloneCommandExecuter(rclone_executable, String.Format("copyto {0}:{1} {2}:{3}/{4}", local_repo, filename, remote_repo, remote_path, remotename), cancelToken);
+ return RcloneCommandExecuter(rclone_executable, $"copyto {local_repo}:{filename} {remote_repo}:{remote_path}/{remotename}", cancelToken);
}
catch (FolderMissingException ex)
{
@@ -249,7 +249,7 @@ namespace Duplicati.Library.Backend {
try
{
- RcloneCommandExecuter(rclone_executable, String.Format("copyto {2}:{3} {0}:{1}", local_repo, filename, remote_repo, Path.Combine(this.remote_path, remotename)), CancellationToken.None).Await();
+ RcloneCommandExecuter(rclone_executable, $"copyto {remote_repo}:{Path.Combine(this.remote_path, remotename)} {local_repo}:{filename}", CancellationToken.None).Await();
}
catch (FolderMissingException ex) {
throw new FileMissingException(ex);
@@ -262,7 +262,7 @@ namespace Duplicati.Library.Backend // Will give a "directory not found" error if the file does not exist, need to change that to a missing file exception
try
{
- RcloneCommandExecuter(rclone_executable, String.Format("delete {0}:{1}", remote_repo, Path.Combine(remote_path, remotename)), CancellationToken.None).Await();
+ RcloneCommandExecuter(rclone_executable, $"delete {remote_repo}:{Path.Combine(remote_path, remotename)}", CancellationToken.None).Await();
}
catch (FolderMissingException ex) {
throw new FileMissingException(ex);
@@ -308,7 +308,7 @@ namespace Duplicati.Library.Backend public void CreateFolder()
{
- RcloneCommandExecuter(rclone_executable, String.Format("mkdir {0}:{1}", remote_repo, remote_path), CancellationToken.None).Await();
+ RcloneCommandExecuter(rclone_executable, $"mkdir {remote_repo}:{remote_path}", CancellationToken.None).Await();
}
#endregion
diff --git a/Duplicati/UnitTest/PurgeTesting.cs b/Duplicati/UnitTest/PurgeTesting.cs index 97954e5a5..bca73159d 100644 --- a/Duplicati/UnitTest/PurgeTesting.cs +++ b/Duplicati/UnitTest/PurgeTesting.cs @@ -175,9 +175,9 @@ namespace Duplicati.UnitTest Console.WriteLine("Listing final version information");
Console.WriteLine("Versions:");
- Console.WriteLine(" " + string.Join(Environment.NewLine + " ", filesets.Select(x => string.Format("{0}: {1}, {2} {3}", x.Version, x.Time, x.FileCount, x.FileSizes))));
+ Console.WriteLine(" " + string.Join(Environment.NewLine + " ", filesets.Select(x => $"{x.Version}: {x.Time}, {x.FileCount} {x.FileSizes}")));
Console.WriteLine("Files:");
- Console.WriteLine(" " + string.Join(Environment.NewLine + " ", files.Select(x => string.Format("{0}: {1}", x.Path, string.Join(" - ", x.Sizes.Select(y => y.ToString()))))));
+ Console.WriteLine(" " + string.Join(Environment.NewLine + " ", files.Select(x => $"{x.Path}: {string.Join(" - ", x.Sizes.Select(y => y.ToString()))}")));
Assert.AreEqual(4, filesets.Length, "Incorrect number of filesets after final backup");
Assert.AreEqual(filenames.Count + 1, filecount, "Incorrect number of files after final backup");
|