Add flag to migrate bitwise indexer flags

To be reverted in v6
Radarr · May 6, 2024 · 407eb54 · 407eb54
1 parent d5ffb7a
commit 407eb54
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 20 deletions.
diff --git a/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.js b/frontend/src/Movie/Search/MovieInteractiveSearchModalContent.js
@@ -23,7 +23,7 @@ function MovieInteractiveSearchModalContent(props) {
 
       <ModalBody scrollDirection={scrollDirections.BOTH}>
         <InteractiveSearchConnector
-          searchPayload={{ movieId }}
+          searchPayload={{ movieId, bitwiseIndexerFlags: true }}
         />
       </ModalBody>
 

diff --git a/src/Radarr.Api.V3/Indexers/ReleaseController.cs b/src/Radarr.Api.V3/Indexers/ReleaseController.cs
@@ -125,24 +125,24 @@ public async Task<object> DownloadRelease([FromBody] ReleaseResource release)
 
         [HttpGet]
         [Produces("application/json")]
-        public async Task<List<ReleaseResource>> GetReleases(int? movieId)
+        public async Task<List<ReleaseResource>> GetReleases(int? movieId, bool bitwiseIndexerFlags = false)
         {
             if (movieId.HasValue)
             {
-                return await GetMovieReleases(movieId.Value);
+                return await GetMovieReleases(movieId.Value, bitwiseIndexerFlags);
             }
 
-            return await GetRss();
+            return await GetRss(bitwiseIndexerFlags);
         }
 
-        private async Task<List<ReleaseResource>> GetMovieReleases(int movieId)
+        private async Task<List<ReleaseResource>> GetMovieReleases(int movieId, bool bitwiseIndexerFlags)
         {
             try
             {
                 var decisions = await _releaseSearchService.MovieSearch(movieId, true, true);
                 var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions);
 
-                return MapDecisions(prioritizedDecisions);
+                return MapDecisions(prioritizedDecisions, bitwiseIndexerFlags);
             }
             catch (SearchFailedException ex)
             {
@@ -155,18 +155,18 @@ private async Task<List<ReleaseResource>> GetMovieReleases(int movieId)
             }
         }
 
-        private async Task<List<ReleaseResource>> GetRss()
+        private async Task<List<ReleaseResource>> GetRss(bool bitwiseIndexerFlags)
         {
             var reports = await _rssFetcherAndParser.Fetch();
             var decisions = _downloadDecisionMaker.GetRssDecision(reports);
             var prioritizedDecisions = _prioritizeDownloadDecision.PrioritizeDecisionsForMovies(decisions);
 
-            return MapDecisions(prioritizedDecisions);
+            return MapDecisions(prioritizedDecisions, bitwiseIndexerFlags);
         }
 
-        protected override ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
+        protected override ReleaseResource MapDecision(DownloadDecision decision, int initialWeight, bool bitwiseIndexerFlags)
         {
-            var resource = base.MapDecision(decision, initialWeight);
+            var resource = base.MapDecision(decision, initialWeight, bitwiseIndexerFlags);
             _remoteMovieCache.Set(GetCacheKey(resource), decision.RemoteMovie, TimeSpan.FromMinutes(30));
 
             return resource;

diff --git a/src/Radarr.Api.V3/Indexers/ReleaseControllerBase.cs b/src/Radarr.Api.V3/Indexers/ReleaseControllerBase.cs
@@ -22,23 +22,23 @@ protected override ReleaseResource GetResourceById(int id)
             throw new NotImplementedException();
         }
 
-        protected virtual List<ReleaseResource> MapDecisions(IEnumerable<DownloadDecision> decisions)
+        protected virtual List<ReleaseResource> MapDecisions(IEnumerable<DownloadDecision> decisions, bool bitwiseIndexerFlags)
         {
             var result = new List<ReleaseResource>();
 
             foreach (var downloadDecision in decisions)
             {
-                var release = MapDecision(downloadDecision, result.Count);
+                var release = MapDecision(downloadDecision, result.Count, bitwiseIndexerFlags);
 
                 result.Add(release);
             }
 
             return result;
         }
 
-        protected virtual ReleaseResource MapDecision(DownloadDecision decision, int initialWeight)
+        protected virtual ReleaseResource MapDecision(DownloadDecision decision, int initialWeight, bool bitwiseIndexerFlags)
         {
-            var release = decision.ToResource();
+            var release = decision.ToResource(bitwiseIndexerFlags);
 
             release.ReleaseWeight = initialWeight;
 

diff --git a/src/Radarr.Api.V3/Indexers/ReleasePushController.cs b/src/Radarr.Api.V3/Indexers/ReleasePushController.cs
@@ -49,7 +49,7 @@ public class ReleasePushController : ReleaseControllerBase
 
         [HttpPost]
         [Consumes("application/json")]
-        public ActionResult<List<ReleaseResource>> Create([FromBody] ReleaseResource release)
+        public ActionResult<List<ReleaseResource>> Create([FromBody] ReleaseResource release, [FromQuery] bool bitwiseIndexerFlags = false)
         {
             _logger.Info("Release pushed: {0} - {1}", release.Title, release.DownloadUrl ?? release.MagnetUrl);
 
@@ -79,7 +79,7 @@ public ActionResult<List<ReleaseResource>> Create([FromBody] ReleaseResource rel
                 throw new ValidationException(new List<ValidationFailure> { new ("Title", "Unable to parse", release.Title) });
             }
 
-            return MapDecisions(new[] { decision });
+            return MapDecisions(new[] { decision }, bitwiseIndexerFlags);
         }
 
         private void ResolveIndexer(ReleaseInfo release)

diff --git a/src/Radarr.Api.V3/Indexers/ReleaseResource.cs b/src/Radarr.Api.V3/Indexers/ReleaseResource.cs
@@ -52,7 +52,7 @@ public class ReleaseResource : RestResource
         public int? Seeders { get; set; }
         public int? Leechers { get; set; }
         public DownloadProtocol Protocol { get; set; }
-        public int IndexerFlags { get; set; }
+        public dynamic IndexerFlags { get; set; }
 
         // Sent when queuing an unknown release
         [JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
@@ -70,13 +70,15 @@ public class ReleaseResource : RestResource
 
     public static class ReleaseResourceMapper
     {
-        public static ReleaseResource ToResource(this DownloadDecision model)
+        public static ReleaseResource ToResource(this DownloadDecision model, bool bitwiseIndexerFlags = false)
         {
             var releaseInfo = model.RemoteMovie.Release;
             var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
             var remoteMovie = model.RemoteMovie;
             var torrentInfo = (model.RemoteMovie.Release as TorrentInfo) ?? new TorrentInfo();
-            var indexerFlags = torrentInfo.IndexerFlags;
+
+            // TODO: REMOVE IN v6
+            dynamic indexerFlags = bitwiseIndexerFlags ? (int)torrentInfo.IndexerFlags : torrentInfo.IndexerFlags.ToString().Split(new[] { ", " }, StringSplitOptions.None).Where(x => x != "0");
 
             // 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
@@ -118,7 +120,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 = (int)indexerFlags
+                IndexerFlags = indexerFlags
             };
         }