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

fix: 🐛 Fixed the issue where we were not generating the newsletter plex mediaserver link correctly

Browse Source
pull/4317/head
tidusjar 3 years ago
parent ceaec3feb0
commit b6064e9308
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File

12
src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
Unescape View File

@ -583,7 +583,7 @@ namespace Ombi.Schedule.Jobs.Ombi
sb.Append("<tr>"); sb.Append("<tr>");
if (plexSettings.Enable) if (plexSettings.Enable)
{ {
await ProcessPlexMovies(plexMovies, sb, ombiSettings.DefaultLanguageCode); await ProcessPlexMovies(plexMovies, sb, ombiSettings.DefaultLanguageCode, plexSettings.Servers.FirstOrDefault().ServerHostname ?? string.Empty);
} }
if (embySettings.Enable) if (embySettings.Enable)
@ -614,7 +614,7 @@ namespace Ombi.Schedule.Jobs.Ombi
sb.Append("<tr>"); sb.Append("<tr>");
if (plexSettings.Enable) if (plexSettings.Enable)
{ {
await ProcessPlexTv(plexEpisodes, sb); await ProcessPlexTv(plexEpisodes, sb, plexSettings.Servers.FirstOrDefault().ServerHostname ?? string.Empty);
} }
if (embySettings.Enable) if (embySettings.Enable)
@ -655,7 +655,7 @@ namespace Ombi.Schedule.Jobs.Ombi
return sb.ToString(); return sb.ToString();
} }
private async Task ProcessPlexMovies(IQueryable<PlexServerContent> plexContentToSend, StringBuilder sb, string defaultLanguageCode) private async Task ProcessPlexMovies(IQueryable<PlexServerContent> plexContentToSend, StringBuilder sb, string defaultLanguageCode, string mediaServerUrl)
{ {
int count = 0; int count = 0;
var ordered = plexContentToSend.OrderByDescending(x => x.AddedAt); var ordered = plexContentToSend.OrderByDescending(x => x.AddedAt);
@ -667,7 +667,7 @@ namespace Ombi.Schedule.Jobs.Ombi
continue; continue;
} }
var info = await _movieApi.GetMovieInformationWithExtraInfo(movieDbId, defaultLanguageCode); var info = await _movieApi.GetMovieInformationWithExtraInfo(movieDbId, defaultLanguageCode);
var mediaurl = content.Url; var mediaurl = PlexHelper.BuildPlexMediaUrl(content.Url, mediaServerUrl);
if (info == null) if (info == null)
{ {
continue; continue;
@ -907,7 +907,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddGenres(sb, $"Type: {info.albumType}"); AddGenres(sb, $"Type: {info.albumType}");
} }
private async Task ProcessPlexTv(HashSet<PlexEpisode> plexContent, StringBuilder sb) private async Task ProcessPlexTv(HashSet<PlexEpisode> plexContent, StringBuilder sb, string serverHostname)
{ {
var series = new List<PlexServerContent>(); var series = new List<PlexServerContent>();
foreach (var plexEpisode in plexContent) foreach (var plexEpisode in plexContent)
@ -985,7 +985,7 @@ namespace Ombi.Schedule.Jobs.Ombi
AddBackgroundInsideTable(sb, $"https://image.tmdb.org/t/p/w1280/"); AddBackgroundInsideTable(sb, $"https://image.tmdb.org/t/p/w1280/");
} }
AddPosterInsideTable(sb, banner); AddPosterInsideTable(sb, banner);
AddMediaServerUrl(sb, t.Url, banner); AddMediaServerUrl(sb, PlexHelper.BuildPlexMediaUrl(t.Url, serverHostname), banner);
AddInfoTable(sb); AddInfoTable(sb);
var title = ""; var title = "";

Write Preview
Loading…
Cancel
Save