Merge remote-tracking branch 'upstream/develop' into hide-tags-option

sct · Oct 6, 2023 · e436449 · e436449
2 parents 701f38b + 7bdd25e
commit e436449
Show file tree

Hide file tree

Showing 4 changed files with 53 additions and 1 deletion.
diff --git a/server/entity/MediaRequest.ts b/server/entity/MediaRequest.ts
@@ -984,7 +984,7 @@ export class MediaRequest {
             (keyword) => keyword.id === ANIME_KEYWORD_ID
           )
         ) {
-          seriesType = 'anime';
+          seriesType = sonarrSettings.animeSeriesType ?? 'anime';
         }
 
         let rootFolder =

diff --git a/server/lib/settings.ts b/server/lib/settings.ts
@@ -69,6 +69,8 @@ export interface RadarrSettings extends DVRSettings {
 }
 
 export interface SonarrSettings extends DVRSettings {
+  seriesType: 'standard' | 'daily' | 'anime';
+  animeSeriesType: 'standard' | 'daily' | 'anime';
   activeAnimeProfileId?: number;
   activeAnimeProfileName?: string;
   activeAnimeDirectory?: string;

diff --git a/src/components/Settings/SonarrModal/index.tsx b/src/components/Settings/SonarrModal/index.tsx
@@ -43,6 +43,8 @@ const messages = defineMessages({
   qualityprofile: 'Quality Profile',
   languageprofile: 'Language Profile',
   rootfolder: 'Root Folder',
+  seriesType: 'Series Type',
+  animeSeriesType: 'Anime Series Type',
   animequalityprofile: 'Anime Quality Profile',
   animelanguageprofile: 'Anime Language Profile',
   animerootfolder: 'Anime Root Folder',
@@ -244,6 +246,8 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
           activeProfileId: sonarr?.activeProfileId,
           activeLanguageProfileId: sonarr?.activeLanguageProfileId,
           rootFolder: sonarr?.activeDirectory,
+          seriesType: sonarr?.seriesType,
+          animeSeriesType: sonarr?.animeSeriesType,
           activeAnimeProfileId: sonarr?.activeAnimeProfileId,
           activeAnimeLanguageProfileId: sonarr?.activeAnimeLanguageProfileId,
           activeAnimeRootFolder: sonarr?.activeAnimeDirectory,
@@ -280,6 +284,8 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                 : undefined,
               activeProfileName: profileName,
               activeDirectory: values.rootFolder,
+              seriesType: values.seriesType,
+              animeSeriesType: values.animeSeriesType,
               activeAnimeProfileId: values.activeAnimeProfileId
                 ? Number(values.activeAnimeProfileId)
                 : undefined,
@@ -537,6 +543,27 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                       )}
                   </div>
                 </div>
+                <div className="form-row">
+                  <label htmlFor="seriesType" className="text-label">
+                    {intl.formatMessage(messages.seriesType)}
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <Field
+                        as="select"
+                        id="seriesType"
+                        name="seriesType"
+                        disabled={!isValidated || isTesting}
+                      >
+                        <option value="standard">Standard</option>
+                        <option value="daily">Daily</option>
+                      </Field>
+                    </div>
+                  </div>
+                  {errors.seriesType && touched.seriesType && (
+                    <div className="error">{errors.seriesType}</div>
+                  )}
+                </div>
                 <div className="form-row">
                   <label htmlFor="activeProfileId" className="text-label">
                     {intl.formatMessage(messages.qualityprofile)}
@@ -723,6 +750,27 @@ const SonarrModal = ({ onClose, sonarr, onSave }: SonarrModalProps) => {
                     />
                   </div>
                 </div>
+                <div className="form-row">
+                  <label htmlFor="animeSeriesType" className="text-label">
+                    {intl.formatMessage(messages.animeSeriesType)}
+                  </label>
+                  <div className="form-input-area">
+                    <div className="form-input-field">
+                      <Field
+                        as="select"
+                        id="animeSeriesType"
+                        name="animeSeriesType"
+                        disabled={!isValidated || isTesting}
+                      >
+                        <option value="standard">Standard</option>
+                        <option value="anime">Anime</option>
+                      </Field>
+                    </div>
+                  </div>
+                  {errors.animeSeriesType && touched.animeSeriesType && (
+                    <div className="error">{errors.animeSeriesType}</div>
+                  )}
+                </div>
                 <div className="form-row">
                   <label htmlFor="activeAnimeProfileId" className="text-label">
                     {intl.formatMessage(messages.animequalityprofile)}

diff --git a/src/i18n/locale/en.json b/src/i18n/locale/en.json
@@ -831,6 +831,7 @@
   "components.Settings.SettingsUsers.userSettingsDescription": "Configure global and default user settings.",
   "components.Settings.SettingsUsers.users": "Users",
   "components.Settings.SonarrModal.add": "Add Server",
+  "components.Settings.SonarrModal.animeSeriesType": "Anime Series Type",
   "components.Settings.SonarrModal.animeTags": "Anime Tags",
   "components.Settings.SonarrModal.animelanguageprofile": "Anime Language Profile",
   "components.Settings.SonarrModal.animequalityprofile": "Anime Quality Profile",
@@ -860,6 +861,7 @@
   "components.Settings.SonarrModal.selectQualityProfile": "Select quality profile",
   "components.Settings.SonarrModal.selectRootFolder": "Select root folder",
   "components.Settings.SonarrModal.selecttags": "Select tags",
+  "components.Settings.SonarrModal.seriesType": "Series Type",
   "components.Settings.SonarrModal.server4k": "4K Server",
   "components.Settings.SonarrModal.servername": "Server Name",
   "components.Settings.SonarrModal.ssl": "Use SSL",