github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-21 05:43:19 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(database): Just some tweaks, shouldn't notice any difference, maybe a less error in the log

Browse source
This commit is contained in:
tidusjar 2023-01-08 19:26:02 +00:00
commit 67fb9921c0
7 changed files with 45 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/Ombi.Schedule/Jobs/Couchpotato/CouchPotatoSync.cs
View file

@ -79,11 +79,9 @@ namespace Ombi.Schedule.Jobs.Couchpotato
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
// Let's remove the old cached data // Let's remove the old cached data
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM CouchPotatoCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM CouchPotatoCache");
tran.Commit(); await tran.CommitAsync();
}
}); });
// Save // Save
@ -107,13 +105,11 @@ namespace Ombi.Schedule.Jobs.Couchpotato
strat = _ctx.Database.CreateExecutionStrategy(); strat = _ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.CouchPotatoCache.AddRangeAsync(movieIds); await _ctx.CouchPotatoCache.AddRangeAsync(movieIds);
await _ctx.SaveChangesAsync(); await _ctx.SaveChangesAsync();
tran.Commit(); await tran.CommitAsync();
}
}); });
await _notification.SendNotificationToAdmins("Couch Potato Sync Finished"); await _notification.SendNotificationToAdmins("Couch Potato Sync Finished");

4
src/Ombi.Schedule/Jobs/Lidarr/LidarrAlbumSync.cs
View file

@ -55,7 +55,7 @@ namespace Ombi.Schedule.Jobs.Lidarr
using (var tran = await _ctx.Database.BeginTransactionAsync()) using (var tran = await _ctx.Database.BeginTransactionAsync())
{ {
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM LidarrAlbumCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM LidarrAlbumCache");
tran.Commit(); await tran.CommitAsync();
} }
}); });
@ -85,7 +85,7 @@ namespace Ombi.Schedule.Jobs.Lidarr
await _ctx.LidarrAlbumCache.AddRangeAsync(albumCache); await _ctx.LidarrAlbumCache.AddRangeAsync(albumCache);
await _ctx.SaveChangesAsync(); await _ctx.SaveChangesAsync();
tran.Commit(); await tran.CommitAsync();
} }
}); });
} }

12
src/Ombi.Schedule/Jobs/Lidarr/LidarrArtistSync.cs
View file

@ -52,11 +52,9 @@ namespace Ombi.Schedule.Jobs.Lidarr
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
// Let's remove the old cached data // Let's remove the old cached data
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM LidarrArtistCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM LidarrArtistCache");
tran.Commit(); await tran.CommitAsync();
}
}); });
var artistCache = new List<LidarrArtistCache>(); var artistCache = new List<LidarrArtistCache>();
@ -76,13 +74,11 @@ namespace Ombi.Schedule.Jobs.Lidarr
strat = _ctx.Database.CreateExecutionStrategy(); strat = _ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.LidarrArtistCache.AddRangeAsync(artistCache); await _ctx.LidarrArtistCache.AddRangeAsync(artistCache);
await _ctx.SaveChangesAsync(); await _ctx.SaveChangesAsync();
tran.Commit(); await tran.CommitAsync();
}
}); });
} }
} }

6
src/Ombi.Schedule/Jobs/Radarr/RadarrSync.cs
View file

@ -39,15 +39,11 @@ namespace Ombi.Schedule.Jobs.Radarr
public async Task Execute(IJobExecutionContext job) public async Task Execute(IJobExecutionContext job)
{ {
try try
{
var strat = _ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () =>
{ {
// Let's remove the old cached data // Let's remove the old cached data
using var tran = await _ctx.Database.BeginTransactionAsync(); using var tran = await _ctx.Database.BeginTransactionAsync();
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM RadarrCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM RadarrCache");
tran.Commit(); await tran.CommitAsync();
});
var radarrSettings = _radarrSettings.GetSettingsAsync(); var radarrSettings = _radarrSettings.GetSettingsAsync();
var radarr4kSettings = _radarr4kSettings.GetSettingsAsync(); var radarr4kSettings = _radarr4kSettings.GetSettingsAsync();

12
src/Ombi.Schedule/Jobs/SickRage/SickRageSync.cs
View file

@ -49,11 +49,9 @@ namespace Ombi.Schedule.Jobs.SickRage
var strat = _ctx.Database.CreateExecutionStrategy(); var strat = _ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SickRageCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SickRageCache");
tran.Commit(); await tran.CommitAsync();
}
}); });
var entites = ids.Select(id => new SickRageCache { TvDbId = id }).ToList(); var entites = ids.Select(id => new SickRageCache { TvDbId = id }).ToList();
@ -84,12 +82,10 @@ namespace Ombi.Schedule.Jobs.SickRage
strat = _ctx.Database.CreateExecutionStrategy(); strat = _ctx.Database.CreateExecutionStrategy();
await strat.ExecuteAsync(async () => await strat.ExecuteAsync(async () =>
{ {
using (var tran = await _ctx.Database.BeginTransactionAsync()) using var tran = await _ctx.Database.BeginTransactionAsync();
{
await _ctx.SickRageEpisodeCache.AddRangeAsync(episodesToAdd); await _ctx.SickRageEpisodeCache.AddRangeAsync(episodesToAdd);
await _ctx.SaveChangesAsync(); await _ctx.SaveChangesAsync();
tran.Commit(); await tran.CommitAsync();
}
}); });
} }
} }

6
src/Ombi.Schedule/Jobs/Sonarr/SonarrSync.cs
View file

@ -69,7 +69,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
{ {
using var tran = await _ctx.Database.BeginTransactionAsync(); using var tran = await _ctx.Database.BeginTransactionAsync();
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SonarrCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SonarrCache");
tran.Commit(); await tran.CommitAsync();
}); });
var sonarrCacheToSave = new HashSet<SonarrCache>(); var sonarrCacheToSave = new HashSet<SonarrCache>();
@ -97,7 +97,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
{ {
using var tran = await _ctx.Database.BeginTransactionAsync(); using var tran = await _ctx.Database.BeginTransactionAsync();
await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SonarrEpisodeCache"); await _ctx.Database.ExecuteSqlRawAsync("DELETE FROM SonarrEpisodeCache");
tran.Commit(); await tran.CommitAsync();
}); });
foreach (var s in ids) foreach (var s in ids)
@ -156,7 +156,7 @@ namespace Ombi.Schedule.Jobs.Sonarr
await _ctx.SonarrEpisodeCache.AddRangeAsync(episodesToAdd); await _ctx.SonarrEpisodeCache.AddRangeAsync(episodesToAdd);
_log.LogDebug("Commiting the transaction"); _log.LogDebug("Commiting the transaction");
await _ctx.SaveChangesAsync(); await _ctx.SaveChangesAsync();
tran.Commit(); await tran.CommitAsync();
}); });
} }

8
src/Ombi.Store/Context/OmbiContext.cs
View file

@ -61,8 +61,7 @@ namespace Ombi.Store.Context
var strat = Database.CreateExecutionStrategy(); var strat = Database.CreateExecutionStrategy();
strat.Execute(() => strat.Execute(() =>
{ {
using (var tran = Database.BeginTransaction()) using var tran = Database.BeginTransaction();
{
// Make sure we have the API User // Make sure we have the API User
var apiUserExists = Users.ToList().Any(x => x.NormalizedUserName == "API"); var apiUserExists = Users.ToList().Any(x => x.NormalizedUserName == "API");
if (!apiUserExists) if (!apiUserExists)
@ -77,7 +76,6 @@ namespace Ombi.Store.Context
SaveChanges(); SaveChanges();
tran.Commit(); tran.Commit();
} }
}
}); });
//Check if templates exist //Check if templates exist
@ -233,11 +231,9 @@ namespace Ombi.Store.Context
{ {
strat.Execute(() => strat.Execute(() =>
{ {
using (var tran = Database.BeginTransaction()) using var tran = Database.BeginTransaction();
{
SaveChanges(); SaveChanges();
tran.Commit(); tran.Commit();
}
}); });
} }
} }