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

Merge pull request #4113 from bernarden/bug/4110-capitalise-v-in-tvshow-notification-type

Browse Source 
Capitalizes V for tv show notification type. Refactors NotificationMessageCurlys class.
pull/4138/head v4.0.1313
Jamie 4 years ago committed by GitHub
parent 487e36b957 4d9500df54
commit 79163d251d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 141 additions and 201 deletions
Show Stats Download Patch File Download Diff File

1
src/Ombi.Notifications/BaseNotification.cs
Unescape View File

@ -209,7 +209,6 @@ namespace Ombi.Notifications
if (model.RequestType == RequestType.Movie) if (model.RequestType == RequestType.Movie)
{ {
_log.LogDebug("Notification options: {@model}, Req: {@MovieRequest}, Settings: {@Customization}", model, MovieRequest, Customization); _log.LogDebug("Notification options: {@model}, Req: {@MovieRequest}, Settings: {@Customization}", model, MovieRequest, Customization);
curlys.Setup(model, MovieRequest, Customization, preference); curlys.Setup(model, MovieRequest, Customization, preference);
} }
else if (model.RequestType == RequestType.TvShow) else if (model.RequestType == RequestType.TvShow)

341
src/Ombi.Notifications/NotificationMessageCurlys.cs
Unescape View File

@ -14,218 +14,156 @@ namespace Ombi.Notifications
{ {
public class NotificationMessageCurlys public class NotificationMessageCurlys
{ {
public void Setup(NotificationOptions opts, MovieRequests req, CustomizationSettings s, UserNotificationPreferences pref) public void SetupNewsletter(CustomizationSettings s)
{ {
LoadIssues(opts); ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
RequestId = req?.Id.ToString(); }
ProviderId = req?.TheMovieDbId.ToString() ?? string.Empty;
string title;
if (req == null)
{
opts.Substitutes.TryGetValue("Title", out title);
}
else
{
title = req?.Title;
}
ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
RequestedUser = req?.RequestedUser?.UserName;
if (UserName.IsNullOrEmpty())
{
// Can be set if it's an issue
UserName = req?.RequestedUser?.UserName;
}
if (Alias.IsNullOrEmpty()) public void Setup(OmbiUser user, CustomizationSettings s)
{ {
// Can be set if it's an issue ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
} RequestedUser = user.UserName;
Alias = user.UserAlias;
UserName = user.UserName;
}
if (pref != null) public void Setup(NotificationOptions opts, MovieRequests req, CustomizationSettings s,
{ UserNotificationPreferences pref)
UserPreference = pref.Value.HasValue() ? pref.Value : Alias; {
} LoadIssues(opts);
Title = title; LoadCommon(req, s, pref);
RequestedDate = req?.RequestedDate.ToString("D"); LoadTitle(opts, req);
if (Type.IsNullOrEmpty()) ProviderId = req?.TheMovieDbId.ToString() ?? string.Empty;
{
Type = req?.RequestType.Humanize();
}
Overview = req?.Overview;
Year = req?.ReleaseDate.Year.ToString(); Year = req?.ReleaseDate.Year.ToString();
DenyReason = req?.DeniedReason; Overview = req?.Overview;
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
PosterImage = string.Format((req?.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase)
? "https://image.tmdb.org/t/p/w300{0}" : "https://image.tmdb.org/t/p/w300/{0}", req?.PosterPath);
AdditionalInformation = opts?.AdditionalInformation ?? string.Empty; AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
PosterImage = $"https://image.tmdb.org/t/p/w300/{req?.PosterPath?.TrimStart('/') ?? string.Empty}";
CalculateRequestStatus(req); CalculateRequestStatus(req);
} }
public void Setup(NotificationOptions opts, AlbumRequest req, CustomizationSettings s, UserNotificationPreferences pref) public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s,
UserNotificationPreferences pref)
{ {
LoadIssues(opts); LoadIssues(opts);
LoadCommon(req, s, pref);
LoadTitle(opts, req);
ProviderId = req?.ParentRequest?.ExternalProviderId.ToString() ?? string.Empty;
Year = req?.ParentRequest?.ReleaseDate.Year.ToString();
Overview = req?.ParentRequest?.Overview;
AdditionalInformation = opts.AdditionalInformation;
PosterImage =
$"https://image.tmdb.org/t/p/w300/{req?.ParentRequest?.PosterPath?.TrimStart('/') ?? string.Empty}";
RequestId = req?.Id.ToString(); // Generate episode list.
ProviderId = req?.ForeignArtistId ?? string.Empty; StringBuilder epSb = new StringBuilder();
IEnumerable<EpisodeRequests> episodes = req?.SeasonRequests?
.SelectMany(x => x.Episodes) ?? new List<EpisodeRequests>();
episodes
.OrderBy(x => x.EpisodeNumber)
.ToList()
.ForEach(ep => epSb.Append($"{ep.EpisodeNumber},"));
if (epSb.Length > 0) epSb.Remove(epSb.Length - 1, 1);
EpisodesList = epSb.ToString();
string title; // Generate season list.
if (req == null) StringBuilder seasonSb = new StringBuilder();
{ List<SeasonRequests> seasons = req?.SeasonRequests ?? new List<SeasonRequests>();
opts.Substitutes.TryGetValue("Title", out title); seasons
} .OrderBy(x => x.SeasonNumber)
else .ToList()
{ .ForEach(ep => seasonSb.Append($"{ep.SeasonNumber},"));
title = req?.Title; if (seasonSb.Length > 0) seasonSb.Remove(seasonSb.Length - 1, 1);
} SeasonsList = seasonSb.ToString();
ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; CalculateRequestStatus(req);
ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; }
RequestedUser = req?.RequestedUser?.UserName;
if (UserName.IsNullOrEmpty())
{
// Can be set if it's an issue
UserName = req?.RequestedUser?.UserName;
}
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty; public void Setup(NotificationOptions opts, AlbumRequest req, CustomizationSettings s,
DenyReason = req?.DeniedReason; UserNotificationPreferences pref)
if (Alias.IsNullOrEmpty()) {
{ LoadIssues(opts);
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; LoadCommon(req, s, pref);
} LoadTitle(opts, req);
if (pref != null) ProviderId = req?.ForeignArtistId ?? string.Empty;
{
UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
}
Title = title;
RequestedDate = req?.RequestedDate.ToString("D");
if (Type.IsNullOrEmpty())
{
Type = req?.RequestType.Humanize();
}
Year = req?.ReleaseDate.Year.ToString(); Year = req?.ReleaseDate.Year.ToString();
PosterImage = (req?.Cover.HasValue() ?? false) ? req.Cover : req?.Disk ?? string.Empty;
AdditionalInformation = opts?.AdditionalInformation ?? string.Empty; AdditionalInformation = opts?.AdditionalInformation ?? string.Empty;
PosterImage = req?.Cover.HasValue() ?? false ? req.Cover : req?.Disk ?? string.Empty;
CalculateRequestStatus(req); CalculateRequestStatus(req);
} }
public void SetupNewsletter(CustomizationSettings s) private void LoadIssues(NotificationOptions opts)
{ {
ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; IssueDescription = opts.Substitutes.TryGetValue("IssueDescription", out string val) ? val : string.Empty;
ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; IssueCategory = opts.Substitutes.TryGetValue("IssueCategory", out val) ? val : string.Empty;
IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty;
IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty;
NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty;
UserName = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty;
Alias = opts.Substitutes.TryGetValue("IssueUserAlias", out val) ? val : string.Empty;
Type = opts.Substitutes.TryGetValue("RequestType", out val) && Enum.TryParse(val, out RequestType type)
? HumanizeReturnType(type)
: string.Empty;
} }
public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s, UserNotificationPreferences pref) private void LoadCommon(BaseRequest req, CustomizationSettings s, UserNotificationPreferences pref)
{ {
LoadIssues(opts); ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s.ApplicationName;
ApplicationUrl = s?.ApplicationUrl.HasValue() ?? false ? s.ApplicationUrl : string.Empty;
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
DenyReason = req?.DeniedReason;
RequestId = req?.Id.ToString(); RequestId = req?.Id.ToString();
ProviderId = req?.ParentRequest?.ExternalProviderId.ToString() ?? string.Empty; RequestedUser = req?.RequestedUser?.UserName;
string title; RequestedDate = req?.RequestedDate.ToString("D");
if (req == null)
{ if (Type.IsNullOrEmpty())
opts.Substitutes.TryGetValue("Title", out title);
}
else
{ {
title = req?.ParentRequest.Title; Type = HumanizeReturnType(req?.RequestType);
} }
DenyReason = req?.DeniedReason;
ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty;
ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName;
RequestedUser = req?.RequestedUser?.UserName;
if (UserName.IsNullOrEmpty()) if (UserName.IsNullOrEmpty())
{ {
// Can be set if it's an issue
UserName = req?.RequestedUser?.UserName; UserName = req?.RequestedUser?.UserName;
} }
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
if (Alias.IsNullOrEmpty()) if (Alias.IsNullOrEmpty())
{ {
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = req?.RequestedUser?.Alias.HasValue() ?? false
? req.RequestedUser?.Alias
: req?.RequestedUser?.UserName;
} }
if (pref != null) if (pref != null)
{ {
UserPreference = pref.Value.HasValue() ? pref.Value : Alias; UserPreference = pref.Value.HasValue() ? pref.Value : Alias;
} }
Title = title;
RequestedDate = req?.RequestedDate.ToString("D");
if (Type.IsNullOrEmpty())
{
Type = req?.RequestType.Humanize();
}
Overview = req?.ParentRequest.Overview;
Year = req?.ParentRequest.ReleaseDate.Year.ToString();
PosterImage = string.Format((req?.ParentRequest.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase)
? "https://image.tmdb.org/t/p/w300{0}" : "https://image.tmdb.org/t/p/w300/{0}", req?.ParentRequest.PosterPath);
AdditionalInformation = opts.AdditionalInformation;
// DO Episode and Season Lists
var episodes = req?.SeasonRequests?.SelectMany(x => x.Episodes) ?? new List<EpisodeRequests>();
var seasons = req?.SeasonRequests?.OrderBy(x => x.SeasonNumber).ToList() ?? new List<SeasonRequests>();
var orderedEpisodes = episodes.OrderBy(x => x.EpisodeNumber).ToList();
var epSb = new StringBuilder();
var seasonSb = new StringBuilder();
for (var i = 0; i < orderedEpisodes.Count; i++)
{
var ep = orderedEpisodes[i];
if (i < orderedEpisodes.Count - 1)
{
epSb.Append($"{ep.EpisodeNumber},");
}
else
{
epSb.Append($"{ep.EpisodeNumber}");
}
}
for (var i = 0; i < seasons.Count; i++)
{
var ep = seasons[i];
if (i < seasons.Count - 1)
{
seasonSb.Append($"{ep.SeasonNumber},");
}
else
{
seasonSb.Append($"{ep.SeasonNumber}");
}
}
EpisodesList = epSb.ToString();
SeasonsList = seasonSb.ToString();
CalculateRequestStatus(req);
} }
public void Setup(OmbiUser user, CustomizationSettings s) private static string HumanizeReturnType(RequestType? requestType)
{ {
ApplicationUrl = (s?.ApplicationUrl.HasValue() ?? false) ? s.ApplicationUrl : string.Empty; return requestType switch
ApplicationName = string.IsNullOrEmpty(s?.ApplicationName) ? "Ombi" : s?.ApplicationName; {
RequestedUser = user.UserName; null => string.Empty,
Alias = user.UserAlias; RequestType.TvShow => "TV Show",
UserName = user.UserName; _ => requestType.Humanize()
};
} }
private void LoadIssues(NotificationOptions opts) private void LoadTitle(NotificationOptions opts, BaseRequest req)
{ {
var val = string.Empty; switch (req)
IssueDescription = opts.Substitutes.TryGetValue("IssueDescription", out val) ? val : string.Empty; {
IssueCategory = opts.Substitutes.TryGetValue("IssueCategory", out val) ? val : string.Empty; case null:
IssueStatus = opts.Substitutes.TryGetValue("IssueStatus", out val) ? val : string.Empty; opts.Substitutes.TryGetValue("Title", out string title);
IssueSubject = opts.Substitutes.TryGetValue("IssueSubject", out val) ? val : string.Empty; Title = title;
NewIssueComment = opts.Substitutes.TryGetValue("NewIssueComment", out val) ? val : string.Empty; break;
UserName = opts.Substitutes.TryGetValue("IssueUser", out val) ? val : string.Empty; case ChildRequests tvShowRequest:
Alias = opts.Substitutes.TryGetValue("IssueUserAlias", out val) ? val : string.Empty; Title = tvShowRequest.ParentRequest?.Title;
Type = opts.Substitutes.TryGetValue("RequestType", out val) ? val.Humanize() : string.Empty; break;
default:
Title = req.Title;
break;
}
} }
private void CalculateRequestStatus(BaseRequest req) private void CalculateRequestStatus(BaseRequest req)
@ -238,16 +176,19 @@ namespace Ombi.Notifications
RequestStatus = "Available"; RequestStatus = "Available";
return; return;
} }
if (req.Denied ?? false) if (req.Denied ?? false)
{ {
RequestStatus = "Denied"; RequestStatus = "Denied";
return; return;
} }
if (!req.Available && req.Approved) if (!req.Available && req.Approved)
{ {
RequestStatus = "Processing Request"; RequestStatus = "Processing Request";
return; return;
} }
RequestStatus = "Pending Approval"; RequestStatus = "Pending Approval";
} }
} }
@ -288,36 +229,36 @@ namespace Ombi.Notifications
public Dictionary<string, string> Curlys => new Dictionary<string, string> public Dictionary<string, string> Curlys => new Dictionary<string, string>
{ {
{nameof(RequestId), RequestId }, { nameof(RequestId), RequestId },
{nameof(RequestedUser), RequestedUser }, { nameof(RequestedUser), RequestedUser },
{nameof(Title), Title }, { nameof(Title), Title },
{nameof(RequestedDate), RequestedDate }, { nameof(RequestedDate), RequestedDate },
{nameof(Type), Type }, { nameof(Type), Type },
{nameof(AdditionalInformation), AdditionalInformation }, { nameof(AdditionalInformation), AdditionalInformation },
{nameof(LongDate),LongDate}, { nameof(LongDate), LongDate },
{nameof(ShortDate),ShortDate}, { nameof(ShortDate), ShortDate },
{nameof(LongTime),LongTime}, { nameof(LongTime), LongTime },
{nameof(ShortTime),ShortTime}, { nameof(ShortTime), ShortTime },
{nameof(Overview),Overview}, { nameof(Overview), Overview },
{nameof(Year),Year}, { nameof(Year), Year },
{nameof(EpisodesList),EpisodesList}, { nameof(EpisodesList), EpisodesList },
{nameof(SeasonsList),SeasonsList}, { nameof(SeasonsList), SeasonsList },
{nameof(PosterImage),PosterImage}, { nameof(PosterImage), PosterImage },
{nameof(ApplicationName),ApplicationName}, { nameof(ApplicationName), ApplicationName },
{nameof(ApplicationUrl),ApplicationUrl}, { nameof(ApplicationUrl), ApplicationUrl },
{nameof(IssueDescription),IssueDescription}, { nameof(IssueDescription), IssueDescription },
{nameof(IssueCategory),IssueCategory}, { nameof(IssueCategory), IssueCategory },
{nameof(IssueStatus),IssueStatus}, { nameof(IssueStatus), IssueStatus },
{nameof(IssueSubject),IssueSubject}, { nameof(IssueSubject), IssueSubject },
{nameof(NewIssueComment),NewIssueComment}, { nameof(NewIssueComment), NewIssueComment },
{nameof(IssueUser),IssueUser}, { nameof(IssueUser), IssueUser },
{nameof(UserName),UserName}, { nameof(UserName), UserName },
{nameof(Alias),Alias}, { nameof(Alias), Alias },
{nameof(UserPreference),UserPreference}, { nameof(UserPreference), UserPreference },
{nameof(DenyReason),DenyReason}, { nameof(DenyReason), DenyReason },
{nameof(AvailableDate),AvailableDate}, { nameof(AvailableDate), AvailableDate },
{nameof(RequestStatus),RequestStatus}, { nameof(RequestStatus), RequestStatus },
{nameof(ProviderId),ProviderId}, { nameof(ProviderId), ProviderId },
}; };
} }
} }
Write Preview
Loading…
Cancel
Save