New: Release type options for Calendar Feed

frontend/src/Calendar/iCal/CalendarLinkModalContent.tsx

@@ -4,6 +4,7 @@ import FormGroup from 'Components/Form/FormGroup';
 import FormInputButton from 'Components/Form/FormInputButton';
 import FormInputGroup from 'Components/Form/FormInputGroup';
 import FormLabel from 'Components/Form/FormLabel';
+import { EnhancedSelectInputValue } from 'Components/Form/Select/EnhancedSelectInput';
 import Icon from 'Components/Icon';
 import Button from 'Components/Link/Button';
 import ClipboardButton from 'Components/Link/ClipboardButton';
@@ -15,6 +16,27 @@ import { icons, inputTypes, kinds, sizes } from 'Helpers/Props';
 import { InputChanged } from 'typings/inputs';
 import translate from 'Utilities/String/translate';
 
+const releaseTypeOptions: EnhancedSelectInputValue<string>[] = [
+  {
+    key: 'cinemaRelease',
+    get value() {
+      return translate('CinemaRelease');
+    },
+  },
+  {
+    key: 'digitalRelease',
+    get value() {
+      return translate('DigitalRelease');
+    },
+  },
+  {
+    key: 'physicalRelease',
+    get value() {
+      return translate('PhysicalRelease');
+    },
+  },
+];
+
 interface CalendarLinkModalContentProps {
   onModalClose: () => void;
 }
@@ -22,13 +44,19 @@ interface CalendarLinkModalContentProps {
 function CalendarLinkModalContent({
   onModalClose,
 }: CalendarLinkModalContentProps) {
-  const [state, setState] = useState({
+  const [state, setState] = useState<{
+    unmonitored: boolean;
+    asAllDay: boolean;
+    releaseTypes: string[];
+    tags: number[];
+  }>({
     unmonitored: false,
     asAllDay: false,
+    releaseTypes: [],
     tags: [],
   });
 
-  const { unmonitored, asAllDay, tags } = state;
+  const { unmonitored, asAllDay, releaseTypes, tags } = state;
 
   const handleInputChange = useCallback(({ name, value }: InputChanged) => {
     setState((prevState) => ({ ...prevState, [name]: value }));
@@ -52,6 +80,12 @@ function CalendarLinkModalContent({
       icalUrl += 'asAllDay=true&';
     }
 
+    if (releaseTypes.length) {
+      releaseTypes.forEach((releaseType) => {
+        icalUrl += `releaseTypes=${releaseType}&`;
+      });
+    }
+
     if (tags.length) {
       icalUrl += `tags=${tags.toString()}&`;
     }
@@ -62,7 +96,7 @@ function CalendarLinkModalContent({
       iCalHttpUrl: `${window.location.protocol}//${icalUrl}`,
       iCalWebCalUrl: `webcal://${icalUrl}`,
     };
-  }, [unmonitored, asAllDay, tags]);
+  }, [unmonitored, asAllDay, releaseTypes, tags]);
 
   return (
     <ModalContent onModalClose={onModalClose}>
@@ -94,6 +128,19 @@ function CalendarLinkModalContent({
             />
           </FormGroup>
 
+          <FormGroup>
+            <FormLabel>{translate('ICalReleaseTypes')}</FormLabel>
+
+            <FormInputGroup
+              type={inputTypes.SELECT}
+              name="releaseTypes"
+              value={releaseTypes}
+              values={releaseTypeOptions}
+              helpText={translate('ICalReleaseTypesMoviesHelpText')}
+              onChange={handleInputChange}
+            />
+          </FormGroup>
+
           <FormGroup>
             <FormLabel>{translate('Tags')}</FormLabel>
 

src/NzbDrone.Core/Localization/Core/en.json

@@ -208,6 +208,7 @@
   "ChownGroup": "chown Group",
   "ChownGroupHelpText": "Group name or gid. Use gid for remote file systems.",
   "ChownGroupHelpTextWarning": "This only works if the user running {appName} is the owner of the file. It's better to ensure the download client uses the same group as {appName}.",
+  "CinemaRelease": "Cinema Release",
   "CleanLibraryLevel": "Clean Library Level",
   "Clear": "Clear",
   "ClearBlocklist": "Clear blocklist",
@@ -755,6 +756,8 @@
   "ICalFeedHelpText": "Copy this URL to your client(s) or click to subscribe if your browser supports webcal",
   "ICalIncludeUnmonitoredMoviesHelpText": "Include unmonitored movies in the iCal feed",
   "ICalLink": "iCal Link",
+  "ICalReleaseTypes": "Release Types",
+  "ICalReleaseTypesMoviesHelpText": "Include only movies with specific release types in the iCal feed. If unspecified, all options are used.",
   "ICalShowAsAllDayEvents": "Show as All-Day Events",
   "ICalShowAsAllDayEventsHelpText": "Events will appear as all-day events in your calendar",
   "ICalTagsMoviesHelpText": "Applies to movies with at least one matching tag",

src/Radarr.Api.V3/Calendar/CalendarFeedController.cs

@@ -26,7 +26,7 @@ namespace Radarr.Api.V3.Calendar
         }
 
         [HttpGet("Radarr.ics")]
-        public IActionResult GetCalendarFeed(int pastDays = 7, int futureDays = 28, string tags = "", bool unmonitored = false)
+        public IActionResult GetCalendarFeed(int pastDays = 7, int futureDays = 28, string tags = "", bool unmonitored = false, IReadOnlyCollection<CalendarReleaseType> releaseTypes = null)
         {
             var start = DateTime.Today.AddDays(-pastDays);
             var end = DateTime.Today.AddDays(futureDays);
@@ -54,9 +54,20 @@ namespace Radarr.Api.V3.Calendar
                     continue;
                 }
 
-                CreateEvent(calendar, movie.MovieMetadata, "cinematic");
+                if (releaseTypes is not { Count: not 0 } || releaseTypes.Contains(CalendarReleaseType.CinemaRelease))
-                CreateEvent(calendar, movie.MovieMetadata, "digital");
+                {
-                CreateEvent(calendar, movie.MovieMetadata, "physical");
+                    CreateEvent(calendar, movie.MovieMetadata, "cinematic");
+                }
+
+                if (releaseTypes is not { Count: not 0 } || releaseTypes.Contains(CalendarReleaseType.DigitalRelease))
+                {
+                    CreateEvent(calendar, movie.MovieMetadata, "digital");
+                }
+
+                if (releaseTypes is not { Count: not 0 } || releaseTypes.Contains(CalendarReleaseType.PhysicalRelease))
+                {
+                    CreateEvent(calendar, movie.MovieMetadata, "physical");
+                }
             }
 
             var serializer = (IStringSerializer)new SerializerFactory().Build(calendar.GetType(), new SerializationContext());
@@ -98,9 +109,9 @@ namespace Radarr.Api.V3.Calendar
             occurrence.IsAllDay = true;
 
             occurrence.Description = movie.Overview;
-            occurrence.Categories = new List<string>() { movie.Studio };
+            occurrence.Categories = new List<string> { movie.Studio };
 
-            occurrence.Summary = $"{movie.Title} " + summaryText;
+            occurrence.Summary = $"{movie.Title} {summaryText}";
         }
     }
 }

src/Radarr.Api.V3/Calendar/CalendarReleaseType.cs

@@ -0,0 +1,8 @@
+namespace Radarr.Api.V3.Calendar;
+
+public enum CalendarReleaseType
+{
+    CinemaRelease,
+    DigitalRelease,
+    PhysicalRelease
+}