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

More rework to use the Plex DB

Browse Source
pull/591/head^2
Jamie.Rees 8 years ago
parent dc92285cfa
commit ec49ab7389
5 changed files with 78 additions and 86 deletions
Show Stats Download Patch File Download Diff File

6
PlexRequests.Helpers/PlexHelper.cs
Unescape View File

@ -102,6 +102,12 @@ namespace PlexRequests.Helpers
$"https://app.plex.tv/web/app#!/server/{machineId}/details/%2Flibrary%2Fmetadata%2F{mediaId}"; $"https://app.plex.tv/web/app#!/server/{machineId}/details/%2Flibrary%2Fmetadata%2F{mediaId}";
return url; return url;
} }
public static string FormatGenres(string tags)
{
var split = tags.Split(new[] {'|'}, StringSplitOptions.RemoveEmptyEntries);
return string.Join(", ", split);
}
} }
public class EpisodeModelHelper public class EpisodeModelHelper

61
PlexRequests.Services/Jobs/RecentlyAdded.cs
Unescape View File

@ -68,6 +68,8 @@ namespace PlexRequests.Services.Jobs
private IPlexApi Api { get; } private IPlexApi Api { get; }
private TvMazeApi TvApi = new TvMazeApi(); private TvMazeApi TvApi = new TvMazeApi();
private readonly TheMovieDbApi _movieApi = new TheMovieDbApi(); private readonly TheMovieDbApi _movieApi = new TheMovieDbApi();
private const int MetadataTypeTv = 4;
private const int MetadataTypeMovie = 1;
private ISettingsService<PlexSettings> PlexSettings { get; } private ISettingsService<PlexSettings> PlexSettings { get; }
private ISettingsService<EmailNotificationSettings> EmailSettings { get; } private ISettingsService<EmailNotificationSettings> EmailSettings { get; }
private ISettingsService<PlexRequestSettings> PlexRequestSettings { get; } private ISettingsService<PlexRequestSettings> PlexRequestSettings { get; }
@ -144,12 +146,12 @@ namespace PlexRequests.Services.Jobs
var sb = new StringBuilder(); var sb = new StringBuilder();
var plexSettings = PlexSettings.GetSettings(); var plexSettings = PlexSettings.GetSettings();
var recentlyAdded = PlexDb.GetItemsAddedAfterDate(DateTime.Now.AddDays(-7)); var recentlyAdded = PlexDb.GetItemsAddedAfterDate(DateTime.Now.AddDays(-12)).ToList();
var movies = recentlyAdded.Where(x => x.MetadataType == 1); var movies = recentlyAdded.Where(x => x.metadata_type == MetadataTypeMovie);
var tv = recentlyAdded.Where(x => x.MetadataType == 4); var tv = recentlyAdded.Where(x => x.metadata_type == MetadataTypeTv);
GenerateMovieHtmlDb(movies, ref sb); GenerateMovieHtml(movies, ref sb);
GenerateTvHtml(tv, ref sb); GenerateTvHtml(tv, ref sb);
var template = new RecentlyAddedTemplate(); var template = new RecentlyAddedTemplate();
@ -217,21 +219,26 @@ namespace PlexRequests.Services.Jobs
sb.Append("</table><br/><br/>"); sb.Append("</table><br/><br/>");
} }
private void GenerateMovieHtmlDb(IEnumerable<MetadataItems> movies, ref StringBuilder sb) private void GenerateMovieHtml(IEnumerable<MetadataItems> movies, ref StringBuilder sb)
{ {
var items = movies as MetadataItems[] ?? movies.ToArray();
if (!items.Any())
{
return;
}
sb.Append("<h1>New Movies:</h1><br/><br/>"); sb.Append("<h1>New Movies:</h1><br/><br/>");
sb.Append( sb.Append(
"<table border=\"0\" cellpadding=\"0\" align=\"center\" cellspacing=\"0\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\" width=\"100%\">"); "<table border=\"0\" cellpadding=\"0\" align=\"center\" cellspacing=\"0\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\" width=\"100%\">");
foreach (var movie in movies) foreach (var movie in items)
{ {
var plexGUID = string.Empty; var plexGUID = string.Empty;
try try
{ {
plexGUID = movie.Guid; plexGUID = movie.guid;
var imdbId = PlexHelper.GetProviderIdFromPlexGuid(plexGUID); var imdbId = PlexHelper.GetProviderIdFromPlexGuid(plexGUID);
var info = _movieApi.GetMovieInformation(imdbId).Result; var info = _movieApi.GetMovieInformation(imdbId).Result; // TODO remove this and get the image info from Plex https://github.com/jakewaldron/PlexEmail/blob/master/scripts/plexEmail.py#L391
sb.Append("<tr>"); sb.Append("<tr>");
sb.Append("<td align=\"center\">"); sb.Append("<td align=\"center\">");
@ -245,20 +252,20 @@ namespace PlexRequests.Services.Jobs
"<td align=\"center\" style=\"font-family: sans-serif; font-size: 14px; vertical-align: top;\" valign=\"top\">"); "<td align=\"center\" style=\"font-family: sans-serif; font-size: 14px; vertical-align: top;\" valign=\"top\">");
sb.AppendFormat( sb.AppendFormat(
"<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2}</p></a>", "<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2:yyyy}</p></a>",
info.ImdbId, info.Title, info.ReleaseDate?.ToString("yyyy") ?? string.Empty); imdbId, string.IsNullOrEmpty(movie.original_title) ? movie.title : movie.original_title + $" AKA {movie.title}", movie.originally_available_at);
if (!string.IsNullOrEmpty(movie.tagline))
{
sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 15px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", movie.tagline);
}
if (info.Genres.Any()) if (!string.IsNullOrEmpty(movie.tags_genre))
{ {
sb.AppendFormat( sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>", PlexHelper.FormatGenres(movie.tags_genre));
"<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Genre: {0}</p>",
string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray()));
} }
sb.AppendFormat(
"<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", movie.summary);
info.Overview);
sb.Append("<td"); sb.Append("<td");
sb.Append("<hr>"); sb.Append("<hr>");
@ -332,17 +339,23 @@ namespace PlexRequests.Services.Jobs
private void GenerateTvHtml(IEnumerable<MetadataItems> tv, ref StringBuilder sb) private void GenerateTvHtml(IEnumerable<MetadataItems> tv, ref StringBuilder sb)
{ {
var items = tv as MetadataItems[] ?? tv.ToArray();
if (!items.Any())
{
return;
}
// TV // TV
sb.Append("<h1>New Episodes:</h1><br/><br/>"); sb.Append("<h1>New Episodes:</h1><br/><br/>");
sb.Append( sb.Append(
"<table border=\"0\" cellpadding=\"0\" align=\"center\" cellspacing=\"0\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\" width=\"100%\">"); "<table border=\"0\" cellpadding=\"0\" align=\"center\" cellspacing=\"0\" style=\"border-collapse: separate; mso-table-lspace: 0pt; mso-table-rspace: 0pt; width: 100%;\" width=\"100%\">");
foreach (var t in tv) foreach (var t in items)
{ {
var plexGUID = string.Empty; var plexGUID = string.Empty;
try try
{ {
plexGUID = t.Guid; plexGUID = t.guid;
var seasonInfo = PlexHelper.GetSeasonsAndEpisodesFromPlexGuid(plexGUID); var seasonInfo = PlexHelper.GetSeasonsAndEpisodesFromPlexGuid(plexGUID);
var info = TvApi.ShowLookupByTheTvDbId(int.Parse(PlexHelper.GetProviderIdFromPlexGuid(plexGUID))); var info = TvApi.ShowLookupByTheTvDbId(int.Parse(PlexHelper.GetProviderIdFromPlexGuid(plexGUID)));
@ -360,8 +373,8 @@ namespace PlexRequests.Services.Jobs
sb.Append("<tr>"); sb.Append("<tr>");
sb.Append("<td align=\"center\" style=\"font-family: sans-serif; font-size: 14px; vertical-align: top;\" valign=\"top\">"); sb.Append("<td align=\"center\" style=\"font-family: sans-serif; font-size: 14px; vertical-align: top;\" valign=\"top\">");
sb.AppendFormat("<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2}</p></a>", sb.AppendFormat("<a href=\"https://www.imdb.com/title/{0}/\"><h3 style=\"font-family: sans-serif; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{1} {2:yyyy}</p></a>",
info.externals.imdb, info.name, info.premiered.Substring(0, 4)); // Only the year info.externals.imdb, string.IsNullOrEmpty(t.original_title) ? t.title : t.original_title + $" AKA {t.title}", t.originally_available_at); // Only the year
sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Season: {0}, Episode: {1}</p>", seasonInfo.SeasonNumber, seasonInfo.EpisodeNumber); sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">Season: {0}, Episode: {1}</p>", seasonInfo.SeasonNumber, seasonInfo.EpisodeNumber);
@ -372,7 +385,7 @@ namespace PlexRequests.Services.Jobs
string.Join(", ", info.genres.Select(x => x.ToString()).ToArray())); string.Join(", ", info.genres.Select(x => x.ToString()).ToArray()));
} }
sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>", sb.AppendFormat("<p style=\"font-family: sans-serif; font-size: 14px; font-weight: normal; margin: 0; Margin-bottom: 15px;\">{0}</p>",
string.IsNullOrEmpty(t.Summary) ? info.summary : t.Summary); // Episode Summary string.IsNullOrEmpty(t.summary) ? info.summary : t.summary); // Episode Summary
sb.Append("<td"); sb.Append("<td");
sb.Append("<hr>"); sb.Append("<hr>");

86
PlexRequests.Store/Models/Plex/MetadataItems.cs
Unescape View File

@ -26,70 +26,42 @@
#endregion #endregion
using System; using System;
using System.Data.Linq.Mapping; using Dapper;
using Dapper.Contrib.Extensions;
namespace PlexRequests.Store.Models.Plex namespace PlexRequests.Store.Models.Plex
{ {
[Table(Name = "metadata_items")] [Table("metadata_items")]
public class MetadataItems public class MetadataItems
{ {
[Column(IsPrimaryKey = true)] [Key]
public int Id { get; set; } public int id { get; set; }
[Column(Name = "library_section_id")] public int library_section_id { get; set; }
public int LibrarySectionId { get; set; } public int parent_id { get; set; }
public int metadata_type { get; set; }
[Column(Name = "parent_id")] public string guid { get; set; }
public int ParentId { get; set; } public int media_item_count { get; set; }
public string title { get; set; }
[Column(Name = "metadata_type")] public string title_sort { get; set; }
public int MetadataType { get; set; } public string original_title { get; set; }
public string studio { get; set; }
[Column(Name = "guid")] public float rating { get; set; }
public string Guid { get; set; } public int rating_count { get; set; }
public string tagline { get; set; }
[Column(Name = "media_item_count")] public string summary { get; set; }
public int MediaItemCount { get; set; } public string trivia { get; set; }
public string quotes { get; set; }
[Column(Name = "title")] public string content_rating { get; set; }
public string Title { get; set; } public int content_rating_age { get; set; }
[Column(Name = "title_sort")]
public string TitleSort { get; set; }
[Column(Name = "OriginalTitle")]
public string OriginalTitle { get; set; }
[Column(Name = "studio")]
public string Studio { get; set; }
[Column(Name = "rating")]
public float Rating { get; set; }
[Column(Name = "rating_count")]
public int RatingCount { get; set; }
[Column(Name = "tagline")]
public string Tagline { get; set; }
[Column(Name = "summary")]
public string Summary { get; set; }
[Column(Name = "trivia")]
public string Trivia { get; set; }
[Column(Name = "quotes")]
public string Quotes { get; set; }
[Column(Name = "content_rating")]
public string ContentRating { get; set; }
[Column(Name = "content_rating_age")]
public int ContentRatingAge { get; set; }
[Column(Name = "Index")]
public int Index { get; set; } public int Index { get; set; }
public string tags_genre { get; set; }
// SKIP Until Date Times // SKIP Until Date Times
[Column(Name = "originally_available_at")] public DateTime originally_available_at { get; set; }
public DateTime OriginallyAvailableAt { get; set; } public DateTime available_at { get; set; }
[Column(Name = "available_at")] public DateTime expires_at { get; set; }
public DateTime AvailableAt { get; set; }
[Column(Name = "expires_at")]
public DateTime ExpiresAt { get; set; }
// Skip RefreshedAt and Year // Skip RefreshedAt and Year
[Column(Name = "added_at")] public DateTime added_at { get; set; }
public DateTime AddedAt { get; set; }
} }
} }

7
PlexRequests.Store/PlexDatabase.cs
Unescape View File

@ -60,7 +60,7 @@ namespace PlexRequests.Store
{ {
throw new SqliteException("Factory returned null"); throw new SqliteException("Factory returned null");
} }
fact.ConnectionString = "Data Source=" + "Plex Path"; fact.ConnectionString = "Data Source=" + DbLocation;
return fact; return fact;
} }
@ -84,7 +84,10 @@ namespace PlexRequests.Store
{ {
using (var con = DbConnection()) using (var con = DbConnection())
{ {
return (IEnumerable<MetadataItems>)con.Query(query, param); con.Open();
var data = con.Query<MetadataItems>(query, param);
con.Close();
return data;
} }
} }
} }

4
PlexRequests.Store/Repository/BaseGenericRepository.cs
Unescape View File

@ -27,13 +27,11 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Data; using System.Data;
using System.Data.SqlClient;
using System.Linq; using System.Linq;
using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using Dapper;
using Dapper.Contrib.Extensions; using Dapper.Contrib.Extensions;
using Dapper;
using Mono.Data.Sqlite; using Mono.Data.Sqlite;

Write Preview
Loading…
Cancel
Save