Fixed some bugs !wip
|
@ -151,7 +151,7 @@
|
||||||
<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
|
<td style="font-family: sans-serif; font-size: 14px; vertical-align: top;" valign="top">
|
||||||
<br />
|
<br />
|
||||||
<br />
|
<br />
|
||||||
<p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">Here is a list of Movies and TV Shows that have recently been added!</p>
|
<p style="font-family: sans-serif; font-size: 20px; font-weight: normal; margin: 0; Margin-bottom: 15px;">{@INTRO}</p>
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
|
@ -288,22 +288,7 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
|
CreateMovieHtmlContent(sb, info);
|
||||||
|
|
||||||
sb.Append("<tr>");
|
|
||||||
TableData(sb);
|
|
||||||
|
|
||||||
Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
|
|
||||||
Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
|
|
||||||
EndTag(sb, "a");
|
|
||||||
|
|
||||||
if (info.Genres.Any())
|
|
||||||
{
|
|
||||||
AddParagraph(sb,
|
|
||||||
$"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
|
|
||||||
}
|
|
||||||
|
|
||||||
AddParagraph(sb, info.Overview);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -316,6 +301,7 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private async Task ProcessEmbyMovies(IQueryable<EmbyContent> embyContent, StringBuilder sb)
|
private async Task ProcessEmbyMovies(IQueryable<EmbyContent> embyContent, StringBuilder sb)
|
||||||
{
|
{
|
||||||
sb.Append(
|
sb.Append(
|
||||||
|
@ -331,22 +317,7 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
}
|
}
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
|
CreateMovieHtmlContent(sb, info);
|
||||||
|
|
||||||
sb.Append("<tr>");
|
|
||||||
TableData(sb);
|
|
||||||
|
|
||||||
Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
|
|
||||||
Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
|
|
||||||
EndTag(sb, "a");
|
|
||||||
|
|
||||||
if (info.Genres.Any())
|
|
||||||
{
|
|
||||||
AddParagraph(sb,
|
|
||||||
$"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
|
|
||||||
}
|
|
||||||
|
|
||||||
AddParagraph(sb, info.Overview);
|
|
||||||
}
|
}
|
||||||
catch (Exception e)
|
catch (Exception e)
|
||||||
{
|
{
|
||||||
|
@ -360,6 +331,26 @@ namespace Ombi.Schedule.Jobs.Ombi
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void CreateMovieHtmlContent(StringBuilder sb, MovieResponseDto info)
|
||||||
|
{
|
||||||
|
AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.PosterPath}");
|
||||||
|
|
||||||
|
sb.Append("<tr>");
|
||||||
|
TableData(sb);
|
||||||
|
|
||||||
|
Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
|
||||||
|
Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
|
||||||
|
EndTag(sb, "a");
|
||||||
|
|
||||||
|
if (info.Genres.Any())
|
||||||
|
{
|
||||||
|
AddParagraph(sb,
|
||||||
|
$"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
|
||||||
|
}
|
||||||
|
|
||||||
|
AddParagraph(sb, info.Overview);
|
||||||
|
}
|
||||||
|
|
||||||
private async Task ProcessPlexTv(IQueryable<PlexServerContent> plexContent, StringBuilder sb)
|
private async Task ProcessPlexTv(IQueryable<PlexServerContent> plexContent, StringBuilder sb)
|
||||||
{
|
{
|
||||||
var orderedTv = plexContent.OrderByDescending(x => x.AddedAt);
|
var orderedTv = plexContent.OrderByDescending(x => x.AddedAt);
|
||||||
|
|
|
@ -119,7 +119,10 @@ namespace Ombi.Store.Context
|
||||||
var roles = Roles.Where(x => x.Name == OmbiRoles.RecievesNewsletter);
|
var roles = Roles.Where(x => x.Name == OmbiRoles.RecievesNewsletter);
|
||||||
if (!roles.Any())
|
if (!roles.Any())
|
||||||
{
|
{
|
||||||
Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter));
|
Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter)
|
||||||
|
{
|
||||||
|
NormalizedName = OmbiRoles.RecievesNewsletter.ToUpper()
|
||||||
|
});
|
||||||
}
|
}
|
||||||
//Check if templates exist
|
//Check if templates exist
|
||||||
var templates = NotificationTemplates.ToList();
|
var templates = NotificationTemplates.ToList();
|
||||||
|
|
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 12 KiB |
Before Width: | Height: | Size: 1.8 KiB After Width: | Height: | Size: 2.6 KiB |
Before Width: | Height: | Size: 2.5 KiB After Width: | Height: | Size: 3.4 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 6.9 KiB After Width: | Height: | Size: 8.2 KiB |
Before Width: | Height: | Size: 7.3 KiB After Width: | Height: | Size: 8.8 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 14 KiB |
Before Width: | Height: | Size: 2.9 KiB After Width: | Height: | Size: 4.1 KiB |
Before Width: | Height: | Size: 3 KiB After Width: | Height: | Size: 4.3 KiB |
Before Width: | Height: | Size: 3.9 KiB After Width: | Height: | Size: 5 KiB |
Before Width: | Height: | Size: 4.1 KiB After Width: | Height: | Size: 5.2 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 14 KiB After Width: | Height: | Size: 13 KiB |
Before Width: | Height: | Size: 680 B After Width: | Height: | Size: 1.4 KiB |
Before Width: | Height: | Size: 1.5 KiB After Width: | Height: | Size: 2.3 KiB |
Before Width: | Height: | Size: 5.5 KiB After Width: | Height: | Size: 6.9 KiB |
Before Width: | Height: | Size: 1.1 KiB After Width: | Height: | Size: 1.1 KiB |
Before Width: | Height: | Size: 9.7 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 10 KiB After Width: | Height: | Size: 11 KiB |
Before Width: | Height: | Size: 35 KiB After Width: | Height: | Size: 31 KiB |
Before Width: | Height: | Size: 3.7 KiB After Width: | Height: | Size: 4.9 KiB |