result-classes: rename properties of RestoreResults to be consistent with BackupResults

Duplicati/CommandLine/Commands.cs

@@ -508,10 +508,10 @@ namespace Duplicati.CommandLine
                         string restorePath;
                         options.TryGetValue("restore-path", out restorePath);
 
-                        output.MessageEvent(string.Format("Restored {0} ({1}) files to {2}", res.FilesRestored, Library.Utility.Utility.FormatSizeString(res.SizeOfRestoredFiles), string.IsNullOrEmpty(restorePath) ? "original path" : restorePath));
+                        output.MessageEvent(string.Format("Restored {0} ({1}) files to {2}", res.RestoredFiles, Library.Utility.Utility.FormatSizeString(res.SizeOfRestoredFiles), string.IsNullOrEmpty(restorePath) ? "original path" : restorePath));
                         output.MessageEvent(string.Format("Duration of restore: {0:hh\\:mm\\:ss}", res.Duration));
 
-                        if (res.FilesRestored > 0 && !Library.Main.Utility.SuppressDonationMessages)
+                        if (res.RestoredFiles > 0 && !Library.Main.Utility.SuppressDonationMessages)
                         {
                             output.MessageEvent("***********************************************");
                             output.MessageEvent("Did we help save your files? If so, please support Duplicati with a donation. We suggest 10€ for private use and 100€ for commercial use.");

Duplicati/Library/Interface/ResultInterfaces.cs

@@ -148,14 +148,14 @@ namespace Duplicati.Library.Interface
     
     public interface IRestoreResults : IBasicResults
     {
-        long FilesRestored { get; }
+        long RestoredFiles { get; }
         long SizeOfRestoredFiles { get; }
-        long FoldersRestored { get; }
-        long SymlinksRestored { get; }
-        long FilesPatched { get; }
-        long FilesDeleted { get; }
-        long FoldersDeleted { get; }
-        long SymlinksDeleted { get; }
+        long RestoredFolders { get; }
+        long RestoredSymlinks { get; }
+        long PatchedFiles { get; }
+        long DeletedFiles { get; }
+        long DeletedFolders { get; }
+        long DeletedSymlinks { get; }
         
         IRecreateDatabaseResults RecreateDatabaseResults { get; }
     }

Duplicati/Library/Main/Controller.cs

@@ -128,7 +128,7 @@ namespace Duplicati.Library.Main
             return RunAction(new RestoreResults(), ref paths, ref filter, (result) => {
                 new Operation.RestoreHandler(m_backend, m_options, result).Run(paths, filter);
 
-                Library.UsageReporter.Reporter.Report("RESTORE_FILECOUNT", result.FilesRestored);
+                Library.UsageReporter.Reporter.Report("RESTORE_FILECOUNT", result.RestoredFiles);
                 Library.UsageReporter.Reporter.Report("RESTORE_FILESIZE", result.SizeOfRestoredFiles);
                 Library.UsageReporter.Reporter.Report("RESTORE_DURATION", (long)result.Duration.TotalSeconds);
             });

Duplicati/Library/Main/Operation/RestoreHandler.cs

@@ -444,7 +444,7 @@ namespace Duplicati.Library.Main.Operation
     
                                 if (key != file.Hash)
                                     throw new Exception(string.Format("Failed to restore file: \"{0}\". File hash is {1}, expected hash is {2}", file.Path, key, file.Hash));
-                                result.FilesRestored++;
+                                result.RestoredFiles++;
                                 result.SizeOfRestoredFiles += size;
                             }
                             catch (Exception ex)
@@ -461,7 +461,7 @@ namespace Duplicati.Library.Main.Operation
                     Logging.Log.WriteInformationMessage(LOGTAG, "RestoreFailures", "Failed to restore {0} files, additionally the following files failed to download, which may be the cause:{1}{2}", fileErrors, Environment.NewLine, string.Join(Environment.NewLine, brokenFiles));
                 else if (fileErrors > 0)
                     Logging.Log.WriteInformationMessage(LOGTAG, "RestoreFailures", "Failed to restore {0} files", fileErrors);
-                else if (result.FilesRestored == 0)
+                else if (result.RestoredFiles == 0)
                     Logging.Log.WriteWarningMessage(LOGTAG, "NoFilesRestored", null, "Restore completed without errors but no files were restored");
 
                 // Drop the temp tables
@@ -797,7 +797,7 @@ namespace Duplicati.Library.Main.Operation
                     
                     if (!SystemIO.IO_OS.DirectoryExists(folder))
                     {
-                        result.FoldersRestored++;
+                        result.RestoredFolders++;
                         
                         Logging.Log.WriteVerboseMessage(LOGTAG, "CreateFolder", "Creating folder: {0}", folder);
                             

Duplicati/Library/Main/ResultClasses.cs

@@ -612,14 +612,14 @@ namespace Duplicati.Library.Main
 
     internal class RestoreResults : BasicResults, Library.Interface.IRestoreResults
     {
-        public long FilesRestored { get; internal set; }
+        public long RestoredFiles { get; internal set; }
         public long SizeOfRestoredFiles { get; internal set; }
-        public long FoldersRestored { get; internal set; }
-        public long SymlinksRestored { get; internal set; }
-        public long FilesPatched { get; internal set; }
-        public long FilesDeleted { get; internal set; }
-        public long FoldersDeleted { get; internal set; }
-        public long SymlinksDeleted { get; internal set; }
+        public long RestoredFolders { get; internal set; }
+        public long RestoredSymlinks { get; internal set; }
+        public long PatchedFiles { get; internal set; }
+        public long DeletedFiles { get; internal set; }
+        public long DeletedFolders { get; internal set; }
+        public long DeletedSymlinks { get; internal set; }
 
         public override OperationMode MainOperation { get { return OperationMode.Restore; } }
 

Duplicati/UnitTest/BorderTests.cs

@@ -330,7 +330,7 @@ namespace Duplicati.UnitTest
             using(var c = new Library.Main.Controller("file://" + TARGETFOLDER, testopts.Expand(new { restore_path = RESTOREFOLDER, no_local_blocks = true }), null))
             {
                 var r = c.Restore(null);
-                Assert.AreEqual(filenames.Count * 3, r.FilesRestored);
+                Assert.AreEqual(filenames.Count * 3, r.RestoredFiles);
             }
 
             TestUtils.VerifyDir(DATAFOLDER, RESTOREFOLDER, !Library.Utility.Utility.ParseBoolOption(testopts, "skip-metadata"));
@@ -340,7 +340,7 @@ namespace Duplicati.UnitTest
                 using(var c = new Library.Main.Controller("file://" + TARGETFOLDER, testopts.Expand(new { restore_path = (string)tf, no_local_blocks = true }), null))
                 {
                     var r = c.Restore(new string[] { Path.Combine(DATAFOLDER, "a") + "*" });
-                    Assert.AreEqual(filenames.Count, r.FilesRestored);
+                    Assert.AreEqual(filenames.Count, r.RestoredFiles);
                 }
             }
         }