mirror of
https://github.com/Radarr/Radarr.git
synced 2024-09-11 20:12:41 +02:00
New: Calendar iCal feed includes Digital Release events
This commit is contained in:
parent
398fc4dca2
commit
fc61687e82
@ -22,7 +22,7 @@ function getUrls(state) {
|
||||
tags
|
||||
} = state;
|
||||
|
||||
let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/calendar/Radarr.ics?`;
|
||||
let icalUrl = `${window.location.host}${window.Radarr.urlBase}/feed/v3/calendar/Radarr.ics?`;
|
||||
|
||||
if (unmonitored) {
|
||||
icalUrl += 'unmonitored=true&';
|
||||
|
@ -1,140 +0,0 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Ical.Net;
|
||||
using Ical.Net.CalendarComponents;
|
||||
using Ical.Net.DataTypes;
|
||||
using Ical.Net.Serialization;
|
||||
using Nancy;
|
||||
using Nancy.Responses;
|
||||
using NzbDrone.Common.Extensions;
|
||||
using NzbDrone.Core.Movies;
|
||||
using NzbDrone.Core.Tags;
|
||||
|
||||
namespace NzbDrone.Api.Calendar
|
||||
{
|
||||
public class CalendarFeedModule : NzbDroneFeedModule
|
||||
{
|
||||
private readonly IMovieService _movieService;
|
||||
private readonly ITagService _tagService;
|
||||
|
||||
public CalendarFeedModule(IMovieService movieService, ITagService tagService)
|
||||
: base("calendar")
|
||||
{
|
||||
_movieService = movieService;
|
||||
_tagService = tagService;
|
||||
|
||||
Get("/NzbDrone.ics", options => GetCalendarFeed());
|
||||
Get("/Sonarr.ics", options => GetCalendarFeed());
|
||||
Get("/Radarr.ics", options => GetCalendarFeed());
|
||||
}
|
||||
|
||||
private object GetCalendarFeed()
|
||||
{
|
||||
var pastDays = 7;
|
||||
var futureDays = 28;
|
||||
var start = DateTime.Today.AddDays(-pastDays);
|
||||
var end = DateTime.Today.AddDays(futureDays);
|
||||
var unmonitored = false;
|
||||
|
||||
//var premiersOnly = false;
|
||||
var tags = new List<int>();
|
||||
|
||||
// TODO: Remove start/end parameters in v3, they don't work well for iCal
|
||||
var queryStart = Request.Query.Start;
|
||||
var queryEnd = Request.Query.End;
|
||||
var queryPastDays = Request.Query.PastDays;
|
||||
var queryFutureDays = Request.Query.FutureDays;
|
||||
var queryUnmonitored = Request.Query.Unmonitored;
|
||||
|
||||
// var queryPremiersOnly = Request.Query.PremiersOnly;
|
||||
var queryTags = Request.Query.Tags;
|
||||
|
||||
if (queryStart.HasValue)
|
||||
{
|
||||
start = DateTime.Parse(queryStart.Value);
|
||||
}
|
||||
|
||||
if (queryEnd.HasValue)
|
||||
{
|
||||
end = DateTime.Parse(queryEnd.Value);
|
||||
}
|
||||
|
||||
if (queryPastDays.HasValue)
|
||||
{
|
||||
pastDays = int.Parse(queryPastDays.Value);
|
||||
start = DateTime.Today.AddDays(-pastDays);
|
||||
}
|
||||
|
||||
if (queryFutureDays.HasValue)
|
||||
{
|
||||
futureDays = int.Parse(queryFutureDays.Value);
|
||||
end = DateTime.Today.AddDays(futureDays);
|
||||
}
|
||||
|
||||
if (queryUnmonitored.HasValue)
|
||||
{
|
||||
unmonitored = bool.Parse(queryUnmonitored.Value);
|
||||
}
|
||||
|
||||
//if (queryPremiersOnly.HasValue)
|
||||
//{
|
||||
// premiersOnly = bool.Parse(queryPremiersOnly.Value);
|
||||
//}
|
||||
if (queryTags.HasValue)
|
||||
{
|
||||
var tagInput = (string)queryTags.Value.ToString();
|
||||
tags.AddRange(tagInput.Split(',').Select(_tagService.GetTag).Select(t => t.Id));
|
||||
}
|
||||
|
||||
var movies = _movieService.GetMoviesBetweenDates(start, end, unmonitored);
|
||||
var calendar = new Ical.Net.Calendar
|
||||
{
|
||||
ProductId = "-//radarr.video//Radarr//EN"
|
||||
};
|
||||
|
||||
var calendarName = "Radarr Movies Calendar";
|
||||
calendar.AddProperty(new CalendarProperty("NAME", calendarName));
|
||||
calendar.AddProperty(new CalendarProperty("X-WR-CALNAME", calendarName));
|
||||
|
||||
foreach (var movie in movies.OrderBy(v => v.Added))
|
||||
{
|
||||
if (tags.Any() && tags.None(movie.Tags.Contains))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
CreateEvent(calendar, movie, true);
|
||||
CreateEvent(calendar, movie, false);
|
||||
}
|
||||
|
||||
var serializer = (IStringSerializer)new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
|
||||
var icalendar = serializer.SerializeToString(calendar);
|
||||
|
||||
return new TextResponse(icalendar, "text/calendar");
|
||||
}
|
||||
|
||||
private void CreateEvent(Ical.Net.Calendar calendar, Movie movie, bool cinemasRelease)
|
||||
{
|
||||
var date = cinemasRelease ? movie.InCinemas : movie.PhysicalRelease;
|
||||
if (!date.HasValue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var occurrence = calendar.Create<CalendarEvent>();
|
||||
occurrence.Uid = "NzbDrone_movie_" + movie.Id + (cinemasRelease ? "_cinemas" : "_physical");
|
||||
occurrence.Status = movie.Status == MovieStatusType.Announced ? EventStatus.Tentative : EventStatus.Confirmed;
|
||||
|
||||
occurrence.Start = new CalDateTime(date.Value);
|
||||
occurrence.End = occurrence.Start;
|
||||
occurrence.IsAllDay = true;
|
||||
|
||||
occurrence.Description = movie.Overview;
|
||||
occurrence.Categories = new List<string>() { movie.Studio };
|
||||
|
||||
var physicalText = "(Physical Release)";
|
||||
occurrence.Summary = $"{movie.Title} " + (cinemasRelease ? "(Theatrical Release)" : physicalText);
|
||||
}
|
||||
}
|
||||
}
|
38
src/NzbDrone.Api/Calendar/LegacyCalendarFeedModule.cs
Normal file
38
src/NzbDrone.Api/Calendar/LegacyCalendarFeedModule.cs
Normal file
@ -0,0 +1,38 @@
|
||||
using System.Text;
|
||||
using Nancy;
|
||||
using Nancy.Responses;
|
||||
|
||||
namespace NzbDrone.Api.Calendar
|
||||
{
|
||||
public class LegacyCalendarFeedModule : NzbDroneFeedModule
|
||||
{
|
||||
public LegacyCalendarFeedModule()
|
||||
: base("calendar")
|
||||
{
|
||||
Get("/NzbDrone.ics", options => GetCalendarFeed());
|
||||
Get("/Sonarr.ics", options => GetCalendarFeed());
|
||||
Get("/Radarr.ics", options => GetCalendarFeed());
|
||||
}
|
||||
|
||||
private object GetCalendarFeed()
|
||||
{
|
||||
string queryString = ConvertQueryParams(Request.Query);
|
||||
var url = string.Format("/feed/v3/calendar/Radarr.ics?{0}", queryString);
|
||||
return Response.AsRedirect(url, RedirectResponse.RedirectType.Permanent);
|
||||
}
|
||||
|
||||
private string ConvertQueryParams(DynamicDictionary query)
|
||||
{
|
||||
var sb = new StringBuilder();
|
||||
|
||||
foreach (var key in query)
|
||||
{
|
||||
var value = query[key];
|
||||
|
||||
sb.AppendFormat("&{0}={1}", key, value);
|
||||
}
|
||||
|
||||
return sb.ToString().Trim('&');
|
||||
}
|
||||
}
|
||||
}
|
@ -94,8 +94,9 @@ private object GetCalendarFeed()
|
||||
continue;
|
||||
}
|
||||
|
||||
CreateEvent(calendar, movie, true);
|
||||
CreateEvent(calendar, movie, false);
|
||||
CreateEvent(calendar, movie, "cinematic");
|
||||
CreateEvent(calendar, movie, "digital");
|
||||
CreateEvent(calendar, movie, "physical");
|
||||
}
|
||||
|
||||
var serializer = (IStringSerializer)new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
|
||||
@ -104,16 +105,32 @@ private object GetCalendarFeed()
|
||||
return new TextResponse(icalendar, "text/calendar");
|
||||
}
|
||||
|
||||
private void CreateEvent(Ical.Net.Calendar calendar, Movie movie, bool cinemasRelease)
|
||||
private void CreateEvent(Ical.Net.Calendar calendar, Movie movie, string releaseType)
|
||||
{
|
||||
var date = cinemasRelease ? movie.InCinemas : movie.PhysicalRelease;
|
||||
var date = movie.InCinemas;
|
||||
string eventType = "_cinemas";
|
||||
string summaryText = "(Theatrical Release)";
|
||||
|
||||
if (releaseType == "digital")
|
||||
{
|
||||
date = movie.DigitalRelease;
|
||||
eventType = "_digital";
|
||||
summaryText = "(Digital Release)";
|
||||
}
|
||||
else if (releaseType == "physical")
|
||||
{
|
||||
date = movie.PhysicalRelease;
|
||||
eventType = "_physical";
|
||||
summaryText = "(Physical Release)";
|
||||
}
|
||||
|
||||
if (!date.HasValue)
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
var occurrence = calendar.Create<CalendarEvent>();
|
||||
occurrence.Uid = "Radarr_movie_" + movie.Id + (cinemasRelease ? "_cinemas" : "_physical");
|
||||
occurrence.Uid = "Radarr_movie_" + movie.Id + eventType;
|
||||
occurrence.Status = movie.Status == MovieStatusType.Announced ? EventStatus.Tentative : EventStatus.Confirmed;
|
||||
|
||||
occurrence.Start = new CalDateTime(date.Value);
|
||||
@ -123,8 +140,7 @@ private void CreateEvent(Ical.Net.Calendar calendar, Movie movie, bool cinemasRe
|
||||
occurrence.Description = movie.Overview;
|
||||
occurrence.Categories = new List<string>() { movie.Studio };
|
||||
|
||||
var physicalText = "(Physical Release)";
|
||||
occurrence.Summary = $"{movie.Title} " + (cinemasRelease ? "(Theatrical Release)" : physicalText);
|
||||
occurrence.Summary = $"{movie.Title} " + summaryText;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user