Convert to 'using' declaration in Housekeeping Tasks

Closes #3811
pull/3814/head
Bogdan 12 months ago
parent e6ceafa03b
commit 038b121c34

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
if (_database.DatabaseType == DatabaseType.PostgreSQL)
{
mapper.Execute(@"DELETE FROM ""MetadataFiles""
@ -44,5 +43,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
}
}
}
}
}

@ -14,13 +14,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""NamingConfig""
WHERE ""Id"" NOT IN (
SELECT ""Id"" FROM ""NamingConfig""
LIMIT 1)");
}
}
}
}

@ -14,13 +14,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""Users""
WHERE ""Id"" NOT IN (
SELECT ""Id"" FROM ""Users""
LIMIT 1)");
}
}
}
}

@ -22,8 +22,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
private void DeleteDuplicateArtistMetadata()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT MIN(""Id"") FROM ""MetadataFiles""
@ -32,12 +31,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
HAVING COUNT(""ArtistId"") > 1
)");
}
}
private void DeleteDuplicateAlbumMetadata()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT MIN(""Id"") FROM ""MetadataFiles""
@ -46,12 +43,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
HAVING COUNT(""AlbumId"") > 1
)");
}
}
private void DeleteDuplicateTrackMetadata()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT MIN(""Id"") FROM ""MetadataFiles""
@ -60,12 +55,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
HAVING COUNT(""TrackFileId"") > 1
)");
}
}
private void DeleteDuplicateTrackImages()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT MIN(""Id"") FROM ""MetadataFiles""
@ -75,5 +68,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""Albums""
WHERE ""Id"" IN (
SELECT ""Albums"".""Id"" FROM ""Albums""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Artists"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""ArtistMetadata""
WHERE ""Id"" IN (
SELECT ""ArtistMetadata"".""Id"" FROM ""ArtistMetadata""
@ -25,5 +24,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Albums"".""Id"" IS NULL AND ""Tracks"".""Id"" IS NULL AND ""Artists"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""Blocklist""
WHERE ""Id"" IN (
SELECT ""Blocklist"".""Id"" FROM ""Blocklist""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Artists"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""DownloadClientStatus""
WHERE ""Id"" IN (
SELECT ""DownloadClientStatus"".""Id"" FROM ""DownloadClientStatus""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""DownloadClients"".""Id"" IS NULL)");
}
}
}
}

@ -20,8 +20,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
private void CleanupOrphanedByArtist()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""History""
WHERE ""Id"" IN (
SELECT ""History"".""Id"" FROM ""History""
@ -29,12 +28,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
ON ""History"".""ArtistId"" = ""Artists"".""Id""
WHERE ""Artists"".""Id"" IS NULL)");
}
}
private void CleanupOrphanedByAlbum()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""History""
WHERE ""Id"" IN (
SELECT ""History"".""Id"" FROM ""History""
@ -43,5 +40,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Albums"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""ImportListStatus""
WHERE ""Id"" IN (
SELECT ""ImportListStatus"".""Id"" FROM ""ImportListStatus""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""ImportLists"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""IndexerStatus""
WHERE ""Id"" IN (
SELECT ""IndexerStatus"".""Id"" FROM ""IndexerStatus""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Indexers"".""Id"" IS NULL)");
}
}
}
}

@ -23,8 +23,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
private void DeleteOrphanedByArtist()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
@ -32,12 +31,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
ON ""MetadataFiles"".""ArtistId"" = ""Artists"".""Id""
WHERE ""Artists"".""Id"" IS NULL)");
}
}
private void DeleteOrphanedByAlbum()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
@ -46,12 +43,10 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""MetadataFiles"".""AlbumId"" > 0
AND ""Albums"".""Id"" IS NULL)");
}
}
private void DeleteOrphanedByTrackFile()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT ""MetadataFiles"".""Id"" FROM ""MetadataFiles""
@ -60,24 +55,20 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""MetadataFiles"".""TrackFileId"" > 0
AND ""TrackFiles"".""Id"" IS NULL)");
}
}
private void DeleteWhereAlbumIdIsZero()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT ""Id"" FROM ""MetadataFiles""
WHERE ""Type"" IN (4, 6)
AND ""AlbumId"" = 0)");
}
}
private void DeleteWhereTrackFileIsZero()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""MetadataFiles""
WHERE ""Id"" IN (
SELECT ""Id"" FROM ""MetadataFiles""
@ -85,5 +76,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
AND ""TrackFileId"" = 0)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""PendingReleases""
WHERE ""Id"" IN (
SELECT ""PendingReleases"".""Id"" FROM ""PendingReleases""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Artists"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""AlbumReleases""
WHERE ""Id"" IN (
SELECT ""AlbumReleases"".""Id"" FROM ""AlbumReleases""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""Albums"".""Id"" IS NULL)");
}
}
}
}

@ -20,8 +20,8 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
private void CleanupOrphanedByAlbum()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
// Unlink where track no longer exists
mapper.Execute(@"UPDATE ""TrackFiles""
SET ""AlbumId"" = 0
@ -31,12 +31,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
ON ""TrackFiles"".""Id"" = ""Tracks"".""TrackFileId""
WHERE ""Tracks"".""Id"" IS NULL)");
}
}
private void CleanupOrphanedByTracks()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
// Unlink Tracks where the Trackfiles entry no longer exists
mapper.Execute(@"UPDATE ""Tracks""
SET ""TrackFileId"" = 0
@ -47,5 +46,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""TrackFiles"".""Id"" IS NULL)");
}
}
}
}

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"DELETE FROM ""Tracks""
WHERE ""Id"" IN (
SELECT ""Tracks"".""Id"" FROM ""Tracks""
@ -24,5 +23,4 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
WHERE ""AlbumReleases"".""Id"" IS NULL)");
}
}
}
}

@ -18,8 +18,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean()
{
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
var usedTags = new[] { "Artists", "Notifications", "DelayProfiles", "ReleaseProfiles", "ImportLists", "Indexers" }
.SelectMany(v => GetUsedTags(v, mapper))
.Distinct()
@ -43,7 +42,6 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
mapper.Execute("DELETE FROM \"Tags\"");
}
}
}
private int[] GetUsedTags(string table, IDbConnection mapper)
{

@ -24,13 +24,11 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
_logger.Debug("Not running scheduled task last execution cleanup during debug");
}
using (var mapper = _database.OpenConnection())
{
using var mapper = _database.OpenConnection();
mapper.Execute(@"UPDATE ""ScheduledTasks""
SET ""LastExecution"" = @time
WHERE ""LastExecution"" > @time",
new { time = DateTime.UtcNow });
}
}
}
}

Loading…
Cancel
Save