Merge 9bcef3567c into 4cbf5cfc57

frontend/src/InteractiveSearch/InteractiveSearchRow.tsx

@@ -11,6 +11,7 @@ import Tooltip from 'Components/Tooltip/Tooltip';
 import type DownloadProtocol from 'DownloadClient/DownloadProtocol';
 import { icons, kinds, tooltipPositions } from 'Helpers/Props';
 import Language from 'Language/Language';
+import IndexerFlags from 'Movie/IndexerFlags';
 import MovieFormats from 'Movie/MovieFormats';
 import MovieLanguage from 'Movie/MovieLanguage';
 import MovieQuality from 'Movie/MovieQuality';
@@ -90,7 +91,7 @@ interface InteractiveSearchRowProps {
   customFormats: CustomFormat[];
   customFormatScore: number;
   mappedMovieId?: number;
-  indexerFlags: string[];
+  indexerFlags: number;
   rejections: string[];
   downloadAllowed: boolean;
   isGrabbing: boolean;
@@ -125,7 +126,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
     customFormatScore,
     customFormats,
     mappedMovieId,
-    indexerFlags = [],
+    indexerFlags = 0,
     rejections = [],
     downloadAllowed,
     isGrabbing = false,
@@ -281,17 +282,11 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
       </TableRowCell>
 
       <TableRowCell className={styles.indexerFlags}>
-        {indexerFlags.length ? (
+        {indexerFlags ? (
           <Popover
             anchor={<Icon name={icons.FLAG} kind={kinds.PRIMARY} />}
             title={translate('IndexerFlags')}
-            body={
+            body={<IndexerFlags indexerFlags={indexerFlags} />}
-              <ul>
-                {indexerFlags.map((flag, index) => {
-                  return <li key={index}>{flag}</li>;
-                })}
-              </ul>
-            }
             position={tooltipPositions.LEFT}
           />
         ) : null}

src/Radarr.Api.V3/Indexers/ReleaseResource.cs

@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 using NzbDrone.Core.DecisionEngine;
 using NzbDrone.Core.Indexers;
@@ -53,7 +52,7 @@ public class ReleaseResource : RestResource
         public int? Seeders { get; set; }
         public int? Leechers { get; set; }
         public DownloadProtocol Protocol { get; set; }
-        public dynamic IndexerFlags { get; set; }
+        public int IndexerFlags { get; set; }
 
         // Sent when queuing an unknown release
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
@@ -77,7 +76,7 @@ public static ReleaseResource ToResource(this DownloadDecision model)
             var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
             var remoteMovie = model.RemoteMovie;
             var torrentInfo = (model.RemoteMovie.Release as TorrentInfo) ?? new TorrentInfo();
-            var indexerFlags = torrentInfo.IndexerFlags.ToString().Split(new[] { ", " }, StringSplitOptions.None).Where(x => x != "0");
+            var indexerFlags = torrentInfo.IndexerFlags;
 
             // TODO: Clean this mess up. don't mix data from multiple classes, use sub-resources instead? (Got a huge Deja Vu, didn't we talk about this already once?)
             return new ReleaseResource
@@ -119,7 +118,7 @@ public static ReleaseResource ToResource(this DownloadDecision model)
                 Seeders = torrentInfo.Seeders,
                 Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null,
                 Protocol = releaseInfo.DownloadProtocol,
-                IndexerFlags = indexerFlags
+                IndexerFlags = (int)indexerFlags
             };
         }
 
@@ -134,13 +133,9 @@ public static ReleaseInfo ToModel(this ReleaseResource resource)
                     MagnetUrl = resource.MagnetUrl,
                     InfoHash = resource.InfoHash,
                     Seeders = resource.Seeders,
-                    Peers = (resource.Seeders.HasValue && resource.Leechers.HasValue) ? (resource.Seeders + resource.Leechers) : null
+                    Peers = (resource.Seeders.HasValue && resource.Leechers.HasValue) ? (resource.Seeders + resource.Leechers) : null,
+                    IndexerFlags = (IndexerFlags)resource.IndexerFlags
                 };
-
-                if (resource.IndexerFlags is JsonElement { ValueKind: JsonValueKind.Number } indexerFlags)
-                {
-                    model.IndexerFlags = (IndexerFlags)indexerFlags.GetInt32();
-                }
             }
             else
             {