From dab1834960dafd652639ad360e1fcbf8bfcd6f01 Mon Sep 17 00:00:00 2001 From: Taloth Saldono Date: Thu, 20 May 2021 01:43:25 +0200 Subject: [PATCH] Fixed: Inversion of defaults in CDH migration. --- .../Migration/158_cdh_per_downloadclientFixture.cs | 12 ++++++------ .../Migration/158_cdh_per_downloadclient.cs | 12 ++++++------ 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/NzbDrone.Core.Test/Datastore/Migration/158_cdh_per_downloadclientFixture.cs b/src/NzbDrone.Core.Test/Datastore/Migration/158_cdh_per_downloadclientFixture.cs index e79b0b837..68d0439d1 100644 --- a/src/NzbDrone.Core.Test/Datastore/Migration/158_cdh_per_downloadclientFixture.cs +++ b/src/NzbDrone.Core.Test/Datastore/Migration/158_cdh_per_downloadclientFixture.cs @@ -37,8 +37,8 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = db.Query("SELECT * FROM DownloadClients"); items.Should().HaveCount(1); - items.First().RemoveCompletedDownloads.Should().BeTrue(); - items.First().RemoveFailedDownloads.Should().BeFalse(); + items.First().RemoveCompletedDownloads.Should().BeFalse(); + items.First().RemoveFailedDownloads.Should().BeTrue(); } [Test] @@ -49,7 +49,7 @@ namespace NzbDrone.Core.Test.Datastore.Migration c.Insert.IntoTable("Config").Row(new { Key = "removecompleteddownloads", - Value = "False" + Value = "True" }); c.Insert.IntoTable("DownloadClients").Row(new @@ -71,8 +71,8 @@ namespace NzbDrone.Core.Test.Datastore.Migration var items = db.Query("SELECT * FROM DownloadClients"); items.Should().HaveCount(1); - items.First().RemoveCompletedDownloads.Should().BeFalse(); - items.First().RemoveFailedDownloads.Should().BeFalse(); + items.First().RemoveCompletedDownloads.Should().BeTrue(); + items.First().RemoveFailedDownloads.Should().BeTrue(); } [Test] @@ -100,7 +100,7 @@ namespace NzbDrone.Core.Test.Datastore.Migration items.Should().HaveCount(1); items.First().RemoveCompletedDownloads.Should().BeFalse(); - items.First().RemoveFailedDownloads.Should().BeFalse(); + items.First().RemoveFailedDownloads.Should().BeTrue(); } } diff --git a/src/NzbDrone.Core/Datastore/Migration/158_cdh_per_downloadclient.cs b/src/NzbDrone.Core/Datastore/Migration/158_cdh_per_downloadclient.cs index 00316fccb..14cb67df5 100644 --- a/src/NzbDrone.Core/Datastore/Migration/158_cdh_per_downloadclient.cs +++ b/src/NzbDrone.Core/Datastore/Migration/158_cdh_per_downloadclient.cs @@ -21,19 +21,19 @@ namespace NzbDrone.Core.Datastore.Migration private void MoveRemoveSettings(IDbConnection conn, IDbTransaction tran) { - var removeCompletedDownloads = true; - var removeFailedDownloads = false; + var removeCompletedDownloads = false; + var removeFailedDownloads = true; using (var removeCompletedDownloadsCmd = conn.CreateCommand(tran, "SELECT Value FROM Config WHERE Key = 'removecompleteddownloads'")) { - if ("False" == (removeCompletedDownloadsCmd.ExecuteScalar() as string)) - removeCompletedDownloads = false; + if ("true" == (removeCompletedDownloadsCmd.ExecuteScalar() as string)?.ToLower()) + removeCompletedDownloads = true; } using (var removeFailedDownloadsCmd = conn.CreateCommand(tran, "SELECT Value FROM Config WHERE Key = 'removefaileddownloads'")) { - if ("True" == (removeFailedDownloadsCmd.ExecuteScalar() as string)) - removeFailedDownloads = true; + if ("false" == (removeFailedDownloadsCmd.ExecuteScalar() as string)?.ToLower()) + removeFailedDownloads = false; } using (var updateClientCmd = conn.CreateCommand(tran, $"UPDATE DownloadClients SET RemoveCompletedDownloads = (CASE WHEN Implementation IN (\"RTorrent\", \"Flood\") THEN 0 ELSE ? END), RemoveFailedDownloads = ?"))