feat: radarr/sonarr tag support (#1366)

server/routes/settings/radarr.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import RadarrAPI from '../../api/radarr';
+import RadarrAPI from '../../api/servarr/radarr';
 import { getSettings, RadarrSettings } from '../../lib/settings';
 import logger from '../../logger';
 
@@ -35,15 +35,20 @@ radarrRoutes.post('/', (req, res) => {
   return res.status(201).json(newRadarr);
 });
 
-radarrRoutes.post('/test', async (req, res, next) => {
+radarrRoutes.post<
+  undefined,
+  Record<string, unknown>,
+  RadarrSettings & { tagLabel?: string }
+>('/test', async (req, res, next) => {
   try {
     const radarr = new RadarrAPI({
       apiKey: req.body.apiKey,
-      url: RadarrAPI.buildRadarrUrl(req.body, '/api/v3'),
+      url: RadarrAPI.buildUrl(req.body, '/api/v3'),
     });
 
     const profiles = await radarr.getProfiles();
     const folders = await radarr.getRootFolders();
+    const tags = await radarr.getTags();
 
     return res.status(200).json({
       profiles,
@@ -51,6 +56,7 @@ radarrRoutes.post('/test', async (req, res, next) => {
         id: folder.id,
         path: folder.path,
       })),
+      tags,
     });
   } catch (e) {
     logger.error('Failed to test Radarr', {
@@ -62,40 +68,41 @@ radarrRoutes.post('/test', async (req, res, next) => {
   }
 });
 
-radarrRoutes.put<{ id: string }>('/:id', (req, res) => {
-  const settings = getSettings();
+radarrRoutes.put<{ id: string }, RadarrSettings, RadarrSettings>(
+  '/:id',
+  (req, res, next) => {
+    const settings = getSettings();
 
-  const radarrIndex = settings.radarr.findIndex(
-    (r) => r.id === Number(req.params.id)
-  );
+    const radarrIndex = settings.radarr.findIndex(
+      (r) => r.id === Number(req.params.id)
+    );
 
-  if (radarrIndex === -1) {
-    return res
-      .status(404)
-      .json({ status: '404', message: 'Settings instance not found' });
+    if (radarrIndex === -1) {
+      return next({ status: '404', message: 'Settings instance not found' });
+    }
+
+    // If we are setting this as the default, clear any previous defaults for the same type first
+    // ex: if is4k is true, it will only remove defaults for other servers that have is4k set to true
+    // and are the default
+    if (req.body.isDefault) {
+      settings.radarr
+        .filter((radarrInstance) => radarrInstance.is4k === req.body.is4k)
+        .forEach((radarrInstance) => {
+          radarrInstance.isDefault = false;
+        });
+    }
+
+    settings.radarr[radarrIndex] = {
+      ...req.body,
+      id: Number(req.params.id),
+    } as RadarrSettings;
+    settings.save();
+
+    return res.status(200).json(settings.radarr[radarrIndex]);
   }
+);
 
-  // If we are setting this as the default, clear any previous defaults for the same type first
-  // ex: if is4k is true, it will only remove defaults for other servers that have is4k set to true
-  // and are the default
-  if (req.body.isDefault) {
-    settings.radarr
-      .filter((radarrInstance) => radarrInstance.is4k === req.body.is4k)
-      .forEach((radarrInstance) => {
-        radarrInstance.isDefault = false;
-      });
-  }
-
-  settings.radarr[radarrIndex] = {
-    ...req.body,
-    id: Number(req.params.id),
-  } as RadarrSettings;
-  settings.save();
-
-  return res.status(200).json(settings.radarr[radarrIndex]);
-});
-
-radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res) => {
+radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res, next) => {
   const settings = getSettings();
 
   const radarrSettings = settings.radarr.find(
@@ -103,14 +110,12 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res) => {
   );
 
   if (!radarrSettings) {
-    return res
-      .status(404)
-      .json({ status: '404', message: 'Settings instance not found' });
+    return next({ status: '404', message: 'Settings instance not found' });
   }
 
   const radarr = new RadarrAPI({
     apiKey: radarrSettings.apiKey,
-    url: RadarrAPI.buildRadarrUrl(radarrSettings, '/api/v3'),
+    url: RadarrAPI.buildUrl(radarrSettings, '/api/v3'),
   });
 
   const profiles = await radarr.getProfiles();
@@ -123,7 +128,7 @@ radarrRoutes.get<{ id: string }>('/:id/profiles', async (req, res) => {
   );
 });
 
-radarrRoutes.delete<{ id: string }>('/:id', (req, res) => {
+radarrRoutes.delete<{ id: string }>('/:id', (req, res, next) => {
   const settings = getSettings();
 
   const radarrIndex = settings.radarr.findIndex(
@@ -131,9 +136,7 @@ radarrRoutes.delete<{ id: string }>('/:id', (req, res) => {
   );
 
   if (radarrIndex === -1) {
-    return res
-      .status(404)
-      .json({ status: '404', message: 'Settings instance not found' });
+    return next({ status: '404', message: 'Settings instance not found' });
   }
 
   const removed = settings.radarr.splice(radarrIndex, 1);

server/routes/settings/sonarr.ts

@@ -1,5 +1,5 @@
 import { Router } from 'express';
-import SonarrAPI from '../../api/sonarr';
+import SonarrAPI from '../../api/servarr/sonarr';
 import { getSettings, SonarrSettings } from '../../lib/settings';
 import logger from '../../logger';
 
@@ -39,12 +39,13 @@ sonarrRoutes.post('/test', async (req, res, next) => {
   try {
     const sonarr = new SonarrAPI({
       apiKey: req.body.apiKey,
-      url: SonarrAPI.buildSonarrUrl(req.body, '/api/v3'),
+      url: SonarrAPI.buildUrl(req.body, '/api/v3'),
     });
 
     const profiles = await sonarr.getProfiles();
     const folders = await sonarr.getRootFolders();
     const languageProfiles = await sonarr.getLanguageProfiles();
+    const tags = await sonarr.getTags();
 
     return res.status(200).json({
       profiles,
@@ -53,6 +54,7 @@ sonarrRoutes.post('/test', async (req, res, next) => {
         path: folder.path,
       })),
       languageProfiles,
+      tags,
     });
   } catch (e) {
     logger.error('Failed to test Sonarr', {