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

Merge branch 'develop' of https://github.com/tidusjar/ombi into develop

Browse source
This commit is contained in:
tidusjar 2019-06-12 16:47:15 +01:00
commit e58263ec08
6 changed files with 19 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Ombi.Api/Ombi.Api.csproj
View file

@ -11,7 +11,7 @@
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" /> <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Polly" Version="6.1.0" /> <PackageReference Include="Polly" Version="7.1.0" />
<PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" /> <PackageReference Include="System.Xml.XmlSerializer" Version="4.3.0" />
</ItemGroup> </ItemGroup>

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

@ -60,7 +60,7 @@ namespace Ombi.Schedule.Jobs.Lidarr
ArtistId = a.artistId, ArtistId = a.artistId,
ForeignAlbumId = a.foreignAlbumId, ForeignAlbumId = a.foreignAlbumId,
ReleaseDate = a.releaseDate, ReleaseDate = a.releaseDate,
TrackCount = a.currentRelease.trackCount, TrackCount = a.currentRelease?.trackCount ?? 0,
Monitored = a.monitored, Monitored = a.monitored,
Title = a.title, Title = a.title,
PercentOfTracks = a.statistics?.percentOfEpisodes ?? 0m, PercentOfTracks = a.statistics?.percentOfEpisodes ?? 0m,

4
src/Ombi.Schedule/Jobs/Plex/PlexContentSync.cs
View file

@ -196,7 +196,7 @@ namespace Ombi.Schedule.Jobs.Plex
} }
contentToAdd.Clear(); contentToAdd.Clear();
} }
if (count > 200) if (count > 30)
{ {
await Repo.SaveChangesAsync(); await Repo.SaveChangesAsync();
@ -233,7 +233,7 @@ namespace Ombi.Schedule.Jobs.Plex
} }
contentToAdd.Clear(); contentToAdd.Clear();
} }
if (count > 200) if (count > 30)
{ {
await Repo.SaveChangesAsync(); await Repo.SaveChangesAsync();
} }

1
src/Ombi.Store/Ombi.Store.csproj
View file

@ -16,6 +16,7 @@
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.2" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.2.2" />
<PackageReference Include="Newtonsoft.Json" Version="12.0.1" /> <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
<PackageReference Include="Nito.AsyncEx" Version="5.0.0-pre-05" /> <PackageReference Include="Nito.AsyncEx" Version="5.0.0-pre-05" />
<PackageReference Include="Polly" Version="7.1.0" />
<PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.9" /> <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3" Version="1.1.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

14
src/Ombi.Store/Repository/BaseRepository.cs
View file

@ -3,11 +3,13 @@ using System.Collections.Generic;
using System.Linq; using System.Linq;
using System.Linq.Expressions; using System.Linq.Expressions;
using System.Threading.Tasks; using System.Threading.Tasks;
using Microsoft.Data.Sqlite;
using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.Query;
using Ombi.Helpers; using Ombi.Helpers;
using Ombi.Store.Context; using Ombi.Store.Context;
using Ombi.Store.Entities; using Ombi.Store.Entities;
using Polly;
namespace Ombi.Store.Repository namespace Ombi.Store.Repository
{ {
@ -83,7 +85,17 @@ namespace Ombi.Store.Repository
protected async Task<int> InternalSaveChanges() protected async Task<int> InternalSaveChanges()
{ {
return await _ctx.SaveChangesAsync(); var policy = Policy
.Handle<SqliteException>()
.WaitAndRetryAsync(new[]
{
TimeSpan.FromSeconds(1),
TimeSpan.FromSeconds(2),
TimeSpan.FromSeconds(3)
});
var result = await policy.ExecuteAndCaptureAsync(async () => await _ctx.SaveChangesAsync());
return result.Result;
} }