open-source-mirrors
/
Ombi
mirror of https://github.com/Ombi-app/Ombi
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into feature/v4

Browse Source
pull/3895/head
Jamie Rees 6 years ago
parent 7685b6acb1 12997541f0
commit cc5fb56e7b
13 changed files with 89 additions and 78 deletions
Show Stats Download Patch File Download Diff File

4
build.cake
Unescape View File

@ -82,9 +82,9 @@ Task("SetVersionInfo")
versionInfo = GitVersion(settings);
Information("GitResults -> {0}", versionInfo.Dump());
// Information("GitResults -> {0}", versionInfo.Dump());
Information(@"Build:{0}",AppVeyor.Environment.Build.Dump());
//Information(@"Build:{0}",AppVeyor.Environment.Build.Dump());
var buildVersion = string.Empty;
if(string.IsNullOrEmpty(AppVeyor.Environment.Build.Version))

3
src/Ombi.Core.Tests/Rule/Search/PlexAvailabilityRuleTests.cs
Unescape View File

@ -1,4 +1,5 @@
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Moq;
using NUnit.Framework;
using Ombi.Core.Models.Search;
@ -14,7 +15,7 @@ namespace Ombi.Core.Tests.Rule.Search
public void Setup()
{
ContextMock = new Mock<IPlexContentRepository>();
Rule = new PlexAvailabilityRule(ContextMock.Object);
Rule = new PlexAvailabilityRule(ContextMock.Object, new Mock<ILogger<PlexAvailabilityRule>>().Object);
}
private PlexAvailabilityRule Rule { get; set; }

43
src/Ombi.Core/Rule/Rules/Search/AvailabilityRuleHelper.cs
Unescape View File

@ -2,6 +2,7 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Logging;
using Ombi.Core.Models.Search;
using Ombi.Store.Entities;
using Ombi.Store.Repository.Requests;
@ -31,7 +32,7 @@ namespace Ombi.Core.Rule.Rules.Search
if (!airedButNotAvailable)
{
var unairedEpisodes = search.SeasonRequests.Any(x =>
x.Episodes.Any(c => !c.Available && c.AirDate > DateTime.Now.Date && c.AirDate != DateTime.MinValue));
x.Episodes.Any(c => !c.Available && c.AirDate > DateTime.Now.Date || c.AirDate != DateTime.MinValue));
if (unairedEpisodes)
{
search.FullyAvailable = true;
@ -41,28 +42,36 @@ namespace Ombi.Core.Rule.Rules.Search
}
public static async Task SingleEpisodeCheck(bool useImdb, IQueryable<PlexEpisode> allEpisodes, EpisodeRequests episode,
SeasonRequests season, PlexServerContent item, bool useTheMovieDb, bool useTvDb)
SeasonRequests season, PlexServerContent item, bool useTheMovieDb, bool useTvDb, ILogger log)
{
PlexEpisode epExists = null;
if (useImdb)
try
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.ImdbId == item.ImdbId);
}
if (useTheMovieDb)
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.TheMovieDbId == item.TheMovieDbId);
}
if (useImdb)
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.ImdbId == item.ImdbId);
}
if (useTvDb)
if (useTheMovieDb)
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.TheMovieDbId == item.TheMovieDbId);
}
if (useTvDb)
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.TvDbId == item.TvDbId);
}
}
catch (Exception e)
{
epExists = await allEpisodes.FirstOrDefaultAsync(x =>
x.EpisodeNumber == episode.EpisodeNumber && x.SeasonNumber == season.SeasonNumber &&
x.Series.TvDbId == item.TvDbId);
log.LogError(e, "Exception thrown when attempting to check if something is available");
}
if (epExists != null)

7
src/Ombi.Core/Rule/Rules/Search/PlexAvailabilityRule.cs
Unescape View File

@ -1,5 +1,6 @@
using System.Linq;
using System.Threading.Tasks;
using Microsoft.Extensions.Logging;
using Ombi.Core.Models.Search;
using Ombi.Core.Rule.Interfaces;
using Ombi.Helpers;
@ -10,12 +11,14 @@ namespace Ombi.Core.Rule.Rules.Search
{
public class PlexAvailabilityRule : BaseSearchRule, IRules<SearchViewModel>
{
public PlexAvailabilityRule(IPlexContentRepository repo)
public PlexAvailabilityRule(IPlexContentRepository repo, ILogger<PlexAvailabilityRule> log)
{
PlexContentRepository = repo;
Log = log;
}
private IPlexContentRepository PlexContentRepository { get; }
private ILogger Log { get; }
public async Task<RuleResult> Execute(SearchViewModel obj)
{
@ -72,7 +75,7 @@ namespace Ombi.Core.Rule.Rules.Search
{
foreach (var episode in season.Episodes)
{
await AvailabilityRuleHelper.SingleEpisodeCheck(useImdb, allEpisodes, episode, season, item, useTheMovieDb, useTvDb);
await AvailabilityRuleHelper.SingleEpisodeCheck(useImdb, allEpisodes, episode, season, item, useTheMovieDb, useTvDb, Log);
}
}

2
src/Ombi.Notifications/Agents/MattermostNotification.cs
Unescape View File

@ -52,7 +52,7 @@ namespace Ombi.Notifications.Agents
private void AddOtherInformation(NotificationOptions model, NotificationMessage notification,
NotificationMessageContent parsed)
{
notification.Other.Add("image", parsed.Image);
notification.Other.Add("image", parsed?.Image ?? string.Empty);
notification.Other.Add("title", model.RequestType == RequestType.Movie ? MovieRequest.Title : TvRequest.Title);
}

1
src/Ombi.Store/Context/ExternalContext.cs
Unescape View File

@ -13,6 +13,7 @@ namespace Ombi.Store.Context
if (_created) return;
_created = true;
Database.SetCommandTimeout(60);
Database.Migrate();
}

10
src/Ombi.Store/Context/OmbiContext.cs
Unescape View File

@ -18,6 +18,7 @@ namespace Ombi.Store.Context
if (_created) return;
_created = true;
Database.SetCommandTimeout(60);
Database.Migrate();
}
@ -107,6 +108,7 @@ namespace Ombi.Store.Context
var allAgents = Enum.GetValues(typeof(NotificationAgent)).Cast<NotificationAgent>().ToList();
var allTypes = Enum.GetValues(typeof(NotificationType)).Cast<NotificationType>().ToList();
var needToSave = false;
foreach (var agent in allAgents)
{
foreach (var notificationType in allTypes)
@ -116,6 +118,8 @@ namespace Ombi.Store.Context
// We already have this
continue;
}
needToSave = true;
NotificationTemplates notificationToAdd;
switch (notificationType)
{
@ -230,7 +234,11 @@ namespace Ombi.Store.Context
NotificationTemplates.Add(notificationToAdd);
}
}
SaveChanges();
if (needToSave)
{
SaveChanges();
}
}
}
}

8
src/Ombi.Store/Context/SettingsContext.cs
Unescape View File

@ -14,6 +14,7 @@ namespace Ombi.Store.Context
if (_created) return;
_created = true;
Database.SetCommandTimeout(60);
Database.Migrate();
}
@ -63,13 +64,6 @@ namespace Ombi.Store.Context
});
SaveChanges();
}
SaveChanges();
}
~SettingsContext()
{
}
}
}

1
src/Ombi.Store/Ombi.Store.csproj
Unescape View File

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

20
src/Ombi.Store/Repository/BaseRepository.cs
Unescape View File

@ -5,6 +5,7 @@ using System.Linq.Expressions;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using Microsoft.EntityFrameworkCore.Query;
using Nito.AsyncEx;
using Ombi.Store.Context;
using Ombi.Store.Entities;
@ -19,6 +20,7 @@ namespace Ombi.Store.Repository
}
public DbSet<T> _db { get; }
private readonly U _ctx;
private readonly AsyncLock _mutex = new AsyncLock();
public async Task<T> Find(object key)
{
@ -40,32 +42,32 @@ namespace Ombi.Store.Repository
_db.AddRange(content);
if (save)
{
await _ctx.SaveChangesAsync();
await InternalSaveChanges();
}
}
public async Task<T> Add(T content)
{
await _db.AddAsync(content);
await _ctx.SaveChangesAsync();
await InternalSaveChanges();
return content;
}
public async Task Delete(T request)
{
_db.Remove(request);
await _ctx.SaveChangesAsync();
await InternalSaveChanges();
}
public async Task DeleteRange(IEnumerable<T> req)
{
_db.RemoveRange(req);
await _ctx.SaveChangesAsync();
await InternalSaveChanges();
}
public async Task<int> SaveChangesAsync()
{
return await _ctx.SaveChangesAsync();
return await InternalSaveChanges();
}
public IIncludableQueryable<TEntity, TProperty> Include<TEntity, TProperty>(
@ -80,6 +82,14 @@ namespace Ombi.Store.Repository
await _ctx.Database.ExecuteSqlCommandAsync(sql);
}
private async Task<int> InternalSaveChanges()
{
using (await _mutex.LockAsync())
{
return await _ctx.SaveChangesAsync();
}
}
private bool _disposed;
// Protected implementation of Dispose pattern.

18
src/Ombi/Program.cs
Unescape View File

@ -91,9 +91,7 @@ namespace Ombi
dbBaseUrl.Value = baseUrl;
ctx.SaveChanges();
}
DeleteSchedulesDb();
Console.WriteLine($"We are running on {urlValue}");
CreateWebHostBuilder(args).Build().Run();
@ -226,20 +224,6 @@ namespace Ombi
}
}
private static void DeleteSchedulesDb()
{
try
{
if (File.Exists("Schedules.db"))
{
File.Delete("Schedules.db");
}
}
catch (Exception)
{
}
}
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
WebHost.CreateDefaultBuilder(args)
.UseStartup<Startup>()

20
src/Ombi/wwwroot/translations/de.json
Unescape View File

@ -13,7 +13,7 @@
"ContinueButton": "Weiter",
"Available": "Verfügbar",
"PartiallyAvailable": "Teilweise verfügbar",
"Monitored": "Monitored",
"Monitored": "Überwacht",
"NotAvailable": "Nicht verfügbar",
"ProcessingRequest": "Anfrage wird bearbeitet",
"PendingApproval": "Genehmigung ausstehend",
@ -68,13 +68,13 @@
"MusicTab": "Musik",
"Suggestions": "Vorschläge",
"NoResults": "Es tut uns leid, wir haben keine Ergebnisse gefunden!",
"DigitalDate": "Digital Release: {{date}}",
"DigitalDate": "Veröffentlichung der digitalen Version: {{date}}",
"TheatricalRelease": "Kinostart: {{date}}",
"ViewOnPlex": "In Plex anschauen",
"ViewOnEmby": "In Emby anschauen",
"RequestAdded": "Anfrage für {{title}} wurde erfolgreich hinzugefügt",
"Similar": "Ähnliche",
"Refine": "Refine",
"Refine": "Auswahl verfeinern",
"Movies": {
"PopularMovies": "Beliebte Filme",
"UpcomingMovies": "Kommende Filme",
@ -112,7 +112,7 @@
"TheatricalRelease": "Kinostart: {{date}}",
"ReleaseDate": "Veröffentlicht: {{date}}",
"TheatricalReleaseSort": "Kinostart",
"DigitalRelease": "Digital Release: {{date}}",
"DigitalRelease": "Veröffentlichung der digitalen Version: {{date}}",
"RequestDate": "Datum der Anfrage:",
"QualityOverride": "Qualitäts Überschreiben:",
"RootFolderOverride": "Stammverzeichnis Überschreiben:",
@ -132,16 +132,16 @@
"SeasonNumberHeading": "Staffel: {seasonNumber}",
"SortTitleAsc": "Titel ▲",
"SortTitleDesc": "Titel ▼",
"SortRequestDateAsc": "Request Date ▲",
"SortRequestDateDesc": "Request Date ▼",
"SortRequestDateAsc": "Datum der Anfrage ▲",
"SortRequestDateDesc": "Datum der Anfrage ▼",
"SortStatusAsc": "Status ▲",
"SortStatusDesc": "Status ▼",
"Remaining": {
"Quota": "{{remaining}}/{{total}} Anfragen verbleiben",
"NextDays": "Another request will be added in {{time}} days",
"NextHours": "Another request will be added in {{time}} hours",
"NextMinutes": "Another request will be added in {{time}} minutes",
"NextMinute": "Another request will be added in {{time}} minute"
"NextDays": "Eine weitere Anfrage wird in {{time}} Tagen hinzugefügt",
"NextHours": "Eine weitere Anfrage wird in {{time}} Stunden hinzugefügt",
"NextMinutes": "Eine weitere Anfrage wird in {{time}} Minuten hinzugefügt",
"NextMinute": "Eine weitere Anfrage wird in {{time}} Minute hinzugefügt"
}
},
"Issues": {

30
src/Ombi/wwwroot/translations/no.json
Unescape View File

@ -13,7 +13,7 @@
"ContinueButton": "Gå videre",
"Available": "Tilgjengelig",
"PartiallyAvailable": "Partially Available",
"Monitored": "Monitored",
"Monitored": "Overvåket",
"NotAvailable": "Ikke tilgjengelig",
"ProcessingRequest": "Behandler forespørsel",
"PendingApproval": "Venter på godkjenning",
@ -48,7 +48,7 @@
"Requests": "Forespørsler",
"UserManagement": "Brukeradministrasjon",
"Issues": "Mangler",
"Vote": "Vote",
"Vote": "Stem",
"Donate": "Doner!",
"DonateLibraryMaintainer": "Doner til vedlikeholderen av biblioteket",
"DonateTooltip": "Dette er hvordan jeg overbevise min kone til å la meg bruke min fritid til å utvikle Ombi ;)",
@ -58,14 +58,14 @@
"UpdateDetails": "Oppdater detaljer",
"Logout": "Logg av",
"OpenMobileApp": "Åpne mobilapp",
"RecentlyAdded": "Recently Added"
"RecentlyAdded": "Nylig lagt til"
},
"Search": {
"Title": "Søk",
"Paragraph": "Vil du se noe som foreløpig ikke er tilgjengelig? Ikke noe problem, bare søk etter det nedenfor og be om det!",
"MoviesTab": "Filmer",
"TvTab": "TV serier",
"MusicTab": "Music",
"MusicTab": "Musikk",
"Suggestions": "Forslag",
"NoResults": "Beklager, vi fant ingen resultater!",
"DigitalDate": "Digital utgivelse: {{date}}",
@ -104,7 +104,7 @@
"Paragraph": "Nedenfor kan du se dine og alle andres forespørsler, du ser også status for nedlasting og godkjenning.",
"MoviesTab": "Filmer",
"TvTab": "TV serier",
"MusicTab": "Music",
"MusicTab": "Musikk",
"RequestedBy": "Etterspurt av:",
"Status": "Status:",
"RequestStatus": "Status for forespørsel:",
@ -128,10 +128,10 @@
"GridStatus": "Status",
"ReportIssue": "Rapportér en feil",
"Filter": "Filter",
"Sort": "Sort",
"Sort": "Sorter",
"SeasonNumberHeading": "Sesong: {seasonNumber}",
"SortTitleAsc": "Title ▲",
"SortTitleDesc": "Title ▼",
"SortTitleAsc": "Tittel ▲",
"SortTitleDesc": "Tittel ▼",
"SortRequestDateAsc": "Request Date ▲",
"SortRequestDateDesc": "Request Date ▼",
"SortStatusAsc": "Status ▲",
@ -168,18 +168,18 @@
"FilterHeaderAvailability": "Tilgjengelighet",
"FilterHeaderRequestStatus": "Status",
"Approved": "Godkjent",
"PendingApproval": "Pending Approval"
"PendingApproval": "Venter på godkjenning"
},
"UserManagment": {
"TvRemaining": "TV: {{remaining}}/{{total}} remaining",
"MovieRemaining": "Movies: {{remaining}}/{{total}} remaining",
"MusicRemaining": "Music: {{remaining}}/{{total}} remaining",
"TvRemaining": "TV: {{remaining}}/{{total}} gjenstående",
"MovieRemaining": "Filmer: {{remaining}}/{{total}} gjenstående",
"MusicRemaining": "Musikk: {{remaining}}/{{total}} gjenstående",
"TvDue": "TV: {{date}}",
"MovieDue": "Movie: {{date}}",
"MusicDue": "Music: {{date}}"
"MovieDue": "Film:{{date}}",
"MusicDue": "Musikk:{{date}}"
},
"Votes": {
"CompletedVotesTab": "Voted",
"CompletedVotesTab": "Stemt",
"VotesTab": "Votes Needed"
}
}

Write Preview
Loading…
Cancel
Save