mirror of
https://github.com/Radarr/Radarr.git
synced 2024-10-02 22:27:20 +02:00
Fixed: Switch release indexer flags to bitwise
This commit is contained in:
parent
649702eaca
commit
9bcef3567c
@ -11,6 +11,7 @@ import Tooltip from 'Components/Tooltip/Tooltip';
|
|||||||
import type DownloadProtocol from 'DownloadClient/DownloadProtocol';
|
import type DownloadProtocol from 'DownloadClient/DownloadProtocol';
|
||||||
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
|
import { icons, kinds, tooltipPositions } from 'Helpers/Props';
|
||||||
import Language from 'Language/Language';
|
import Language from 'Language/Language';
|
||||||
|
import IndexerFlags from 'Movie/IndexerFlags';
|
||||||
import MovieFormats from 'Movie/MovieFormats';
|
import MovieFormats from 'Movie/MovieFormats';
|
||||||
import MovieLanguage from 'Movie/MovieLanguage';
|
import MovieLanguage from 'Movie/MovieLanguage';
|
||||||
import MovieQuality from 'Movie/MovieQuality';
|
import MovieQuality from 'Movie/MovieQuality';
|
||||||
@ -90,7 +91,7 @@ interface InteractiveSearchRowProps {
|
|||||||
customFormats: CustomFormat[];
|
customFormats: CustomFormat[];
|
||||||
customFormatScore: number;
|
customFormatScore: number;
|
||||||
mappedMovieId?: number;
|
mappedMovieId?: number;
|
||||||
indexerFlags: string[];
|
indexerFlags: number;
|
||||||
rejections: string[];
|
rejections: string[];
|
||||||
downloadAllowed: boolean;
|
downloadAllowed: boolean;
|
||||||
isGrabbing: boolean;
|
isGrabbing: boolean;
|
||||||
@ -125,7 +126,7 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
|
|||||||
customFormatScore,
|
customFormatScore,
|
||||||
customFormats,
|
customFormats,
|
||||||
mappedMovieId,
|
mappedMovieId,
|
||||||
indexerFlags = [],
|
indexerFlags = 0,
|
||||||
rejections = [],
|
rejections = [],
|
||||||
downloadAllowed,
|
downloadAllowed,
|
||||||
isGrabbing = false,
|
isGrabbing = false,
|
||||||
@ -281,17 +282,11 @@ function InteractiveSearchRow(props: InteractiveSearchRowProps) {
|
|||||||
</TableRowCell>
|
</TableRowCell>
|
||||||
|
|
||||||
<TableRowCell className={styles.indexerFlags}>
|
<TableRowCell className={styles.indexerFlags}>
|
||||||
{indexerFlags.length ? (
|
{indexerFlags ? (
|
||||||
<Popover
|
<Popover
|
||||||
anchor={<Icon name={icons.FLAG} kind={kinds.PRIMARY} />}
|
anchor={<Icon name={icons.FLAG} kind={kinds.PRIMARY} />}
|
||||||
title={translate('IndexerFlags')}
|
title={translate('IndexerFlags')}
|
||||||
body={
|
body={<IndexerFlags indexerFlags={indexerFlags} />}
|
||||||
<ul>
|
|
||||||
{indexerFlags.map((flag, index) => {
|
|
||||||
return <li key={index}>{flag}</li>;
|
|
||||||
})}
|
|
||||||
</ul>
|
|
||||||
}
|
|
||||||
position={tooltipPositions.LEFT}
|
position={tooltipPositions.LEFT}
|
||||||
/>
|
/>
|
||||||
) : null}
|
) : null}
|
||||||
|
@ -1,7 +1,6 @@
|
|||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.Json;
|
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using NzbDrone.Core.DecisionEngine;
|
using NzbDrone.Core.DecisionEngine;
|
||||||
using NzbDrone.Core.Indexers;
|
using NzbDrone.Core.Indexers;
|
||||||
@ -53,7 +52,7 @@ public class ReleaseResource : RestResource
|
|||||||
public int? Seeders { get; set; }
|
public int? Seeders { get; set; }
|
||||||
public int? Leechers { get; set; }
|
public int? Leechers { get; set; }
|
||||||
public DownloadProtocol Protocol { get; set; }
|
public DownloadProtocol Protocol { get; set; }
|
||||||
public dynamic IndexerFlags { get; set; }
|
public int IndexerFlags { get; set; }
|
||||||
|
|
||||||
// Sent when queuing an unknown release
|
// Sent when queuing an unknown release
|
||||||
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
[JsonIgnore(Condition = JsonIgnoreCondition.WhenWritingDefault)]
|
||||||
@ -77,7 +76,7 @@ public static ReleaseResource ToResource(this DownloadDecision model)
|
|||||||
var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
|
var parsedMovieInfo = model.RemoteMovie.ParsedMovieInfo;
|
||||||
var remoteMovie = model.RemoteMovie;
|
var remoteMovie = model.RemoteMovie;
|
||||||
var torrentInfo = (model.RemoteMovie.Release as TorrentInfo) ?? new TorrentInfo();
|
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?)
|
// 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
|
return new ReleaseResource
|
||||||
@ -119,7 +118,7 @@ public static ReleaseResource ToResource(this DownloadDecision model)
|
|||||||
Seeders = torrentInfo.Seeders,
|
Seeders = torrentInfo.Seeders,
|
||||||
Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null,
|
Leechers = (torrentInfo.Peers.HasValue && torrentInfo.Seeders.HasValue) ? (torrentInfo.Peers.Value - torrentInfo.Seeders.Value) : (int?)null,
|
||||||
Protocol = releaseInfo.DownloadProtocol,
|
Protocol = releaseInfo.DownloadProtocol,
|
||||||
IndexerFlags = indexerFlags
|
IndexerFlags = (int)indexerFlags
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -134,13 +133,9 @@ public static ReleaseInfo ToModel(this ReleaseResource resource)
|
|||||||
MagnetUrl = resource.MagnetUrl,
|
MagnetUrl = resource.MagnetUrl,
|
||||||
InfoHash = resource.InfoHash,
|
InfoHash = resource.InfoHash,
|
||||||
Seeders = resource.Seeders,
|
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
|
else
|
||||||
{
|
{
|
||||||
|
Loading…
Reference in New Issue
Block a user