diff --git a/Duplicati/Library/Main/Database/LocalDatabase.cs b/Duplicati/Library/Main/Database/LocalDatabase.cs index acdafb25c..883890aef 100644 --- a/Duplicati/Library/Main/Database/LocalDatabase.cs +++ b/Duplicati/Library/Main/Database/LocalDatabase.cs @@ -1571,14 +1571,14 @@ ORDER BY return new KeyValuePair(string.Empty, path); } + } - /// - /// Defines the backups types - /// - public static class BackupType - { - public const int PARTIAL_BACKUP = 0; - public const int FULL_BACKUP = 1; - } + /// + /// Defines the backups types + /// + public static class BackupType + { + public const int PARTIAL_BACKUP = 0; + public const int FULL_BACKUP = 1; } } diff --git a/Duplicati/Library/Main/Operation/ListControlFilesHandler.cs b/Duplicati/Library/Main/Operation/ListControlFilesHandler.cs index 6da503d86..9c8afeda7 100644 --- a/Duplicati/Library/Main/Operation/ListControlFilesHandler.cs +++ b/Duplicati/Library/Main/Operation/ListControlFilesHandler.cs @@ -69,7 +69,7 @@ namespace Duplicati.Library.Main.Operation if (Library.Utility.FilterExpression.Matches(filter, cf.Key)) files.Add(new ListResultFile(cf.Key, null)); - m_result.SetResult(new Library.Interface.IListResultFileset[] { new ListResultFileset(fileversion.Key, LocalDatabase.BackupType.PARTIAL_BACKUP, fileversion.Value.Time, -1, -1) }, files); + m_result.SetResult(new Library.Interface.IListResultFileset[] { new ListResultFileset(fileversion.Key, BackupType.PARTIAL_BACKUP, fileversion.Value.Time, -1, -1) }, files); lastEx = null; break; } diff --git a/Duplicati/Library/Main/Operation/ListFilesHandler.cs b/Duplicati/Library/Main/Operation/ListFilesHandler.cs index d6dc03f56..9ff3c619e 100644 --- a/Duplicati/Library/Main/Operation/ListFilesHandler.cs +++ b/Duplicati/Library/Main/Operation/ListFilesHandler.cs @@ -204,7 +204,7 @@ namespace Duplicati.Library.Main.Operation public static IEnumerable CreateResultSequence(IEnumerable> filteredList) { - return (from n in filteredList select (Library.Interface.IListResultFileset)(new ListResultFileset(n.Key, LocalDatabase.BackupType.PARTIAL_BACKUP, n.Value.Time.ToLocalTime(), -1, -1))).ToArray(); + return (from n in filteredList select (Library.Interface.IListResultFileset)(new ListResultFileset(n.Key, BackupType.PARTIAL_BACKUP, n.Value.Time.ToLocalTime(), -1, -1))).ToArray(); } } } diff --git a/Duplicati/UnitTest/DisruptionTests.cs b/Duplicati/UnitTest/DisruptionTests.cs index e41847e7c..60c7ddb80 100644 --- a/Duplicati/UnitTest/DisruptionTests.cs +++ b/Duplicati/UnitTest/DisruptionTests.cs @@ -6,6 +6,7 @@ using System.Threading; using System.Threading.Tasks; using Duplicati.Library.Interface; using Duplicati.Library.Main; +using Duplicati.Library.Main.Database; using NUnit.Framework; namespace Duplicati.UnitTest @@ -42,7 +43,7 @@ namespace Duplicati.UnitTest { c.Backup(new[] {this.DATAFOLDER}); Assert.AreEqual(1, c.List().Filesets.Count()); - Assert.AreEqual(1, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); + Assert.AreEqual(BackupType.FULL_BACKUP, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); } // Modify the source files and interrupt a backup. @@ -59,8 +60,8 @@ namespace Duplicati.UnitTest c.Stop(true); await backupTask; Assert.AreEqual(2, c.List().Filesets.Count()); - Assert.AreEqual(1, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); - Assert.AreEqual(0, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); + Assert.AreEqual(BackupType.FULL_BACKUP, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); + Assert.AreEqual(BackupType.PARTIAL_BACKUP, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); } // Recreating the database should preserve the backup types. @@ -69,8 +70,8 @@ namespace Duplicati.UnitTest { c.Repair(); Assert.AreEqual(2, c.List().Filesets.Count()); - Assert.AreEqual(1, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); - Assert.AreEqual(0, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); + Assert.AreEqual(BackupType.FULL_BACKUP, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); + Assert.AreEqual(BackupType.PARTIAL_BACKUP, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); } // Run a complete backup. Listing the Filesets should omit the previous partial backup. @@ -78,8 +79,8 @@ namespace Duplicati.UnitTest { c.Backup(new[] {this.DATAFOLDER}); Assert.AreEqual(2, c.List().Filesets.Count()); - Assert.AreEqual(1, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); - Assert.AreEqual(1, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); + Assert.AreEqual(BackupType.FULL_BACKUP, c.List().Filesets.Single(x => x.Version == 1).IsFullBackup); + Assert.AreEqual(BackupType.FULL_BACKUP, c.List().Filesets.Single(x => x.Version == 0).IsFullBackup); } } }