github/lidarr
1
0
Fork 0
mirror of https://github.com/lidarr/lidarr.git synced 2025-08-20 21:43:33 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Convert to 'using' declaration in Housekeeping Tasks

Browse source 
Closes #3811
This commit is contained in:
Bogdan 2023-06-21 05:47:20 +03:00
commit 038b121c34
18 changed files with 220 additions and 272 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAbsolutePathMetadataFiles.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalNamingSpecs.cs
View file

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean() public void Clean()
{ {
using (var mapper = _database.OpenConnection()) using var mapper = _database.OpenConnection();
{
mapper.Execute(@"DELETE FROM ""NamingConfig"" mapper.Execute(@"DELETE FROM ""NamingConfig""
WHERE ""Id"" NOT IN ( WHERE ""Id"" NOT IN (
SELECT ""Id"" FROM ""NamingConfig"" SELECT ""Id"" FROM ""NamingConfig""
@ -23,4 +22,3 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
} }
} }
} }
}

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupAdditionalUsers.cs
View file

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean() public void Clean()
{ {
using (var mapper = _database.OpenConnection()) using var mapper = _database.OpenConnection();
{
mapper.Execute(@"DELETE FROM ""Users"" mapper.Execute(@"DELETE FROM ""Users""
WHERE ""Id"" NOT IN ( WHERE ""Id"" NOT IN (
SELECT ""Id"" FROM ""Users"" SELECT ""Id"" FROM ""Users""
@ -23,4 +22,3 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
} }
} }
} }
}

16
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupDuplicateMetadataFiles.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedAlbums.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedArtistMetadata.cs
View file

@ -14,8 +14,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
public void Clean() public void Clean()
{ {
using (var mapper = _database.OpenConnection()) using var mapper = _database.OpenConnection();
{
mapper.Execute(@"DELETE FROM ""ArtistMetadata"" mapper.Execute(@"DELETE FROM ""ArtistMetadata""
WHERE ""Id"" IN ( WHERE ""Id"" IN (
SELECT ""ArtistMetadata"".""Id"" FROM ""ArtistMetadata"" SELECT ""ArtistMetadata"".""Id"" FROM ""ArtistMetadata""
@ -26,4 +25,3 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
} }
} }
} }
}

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedBlacklist.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedDownloadClientStatus.cs
View file

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

8
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedHistoryItems.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedImportListStatus.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedIndexerStatus.cs
View file

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

20
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedMetadataFiles.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedPendingReleases.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedReleases.cs
View file

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

10
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTrackFiles.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupOrphanedTracks.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/CleanupUnusedTags.cs
View file

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

4
src/NzbDrone.Core/Housekeeping/Housekeepers/FixFutureRunScheduledTasks.cs
View file

@ -24,8 +24,7 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
_logger.Debug("Not running scheduled task last execution cleanup during debug"); _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"" mapper.Execute(@"UPDATE ""ScheduledTasks""
SET ""LastExecution"" = @time SET ""LastExecution"" = @time
WHERE ""LastExecution"" > @time", WHERE ""LastExecution"" > @time",
@ -33,4 +32,3 @@ namespace NzbDrone.Core.Housekeeping.Housekeepers
} }
} }
} }
}