github-mirrors/prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-04-24 05:47:22 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move scene flag to TorrentInfo and return tag in response

Browse source
This commit is contained in:
Bogdan 2023-09-03 11:13:56 +03:00
parent 09606af351
commit 07b98f4137
12 changed files with 29 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/NzbDrone.Core.Test/IndexerTests/OrpheusTests/OrpheusFixture.cs
View file

@ -9,8 +9,8 @@ using NUnit.Framework;
using NzbDrone.Common.Http;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Indexers.Definitions;
using NzbDrone.Core.Indexers.Definitions.Gazelle;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
@ -40,9 +40,9 @@ namespace NzbDrone.Core.Test.IndexerTests.OrpheusTests
var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 3000 } })).Releases;
releases.Should().HaveCount(65);
releases.First().Should().BeOfType<GazelleInfo>();
releases.First().Should().BeOfType<TorrentInfo>();
var torrentInfo = releases.First() as GazelleInfo;
var torrentInfo = releases.First() as TorrentInfo;
torrentInfo.Title.Should().Be("The Beatles - Abbey Road [1969] [Album] [2.0 Mix 2019] [MP3 V2 (VBR)] [BD]");
torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);

6
src/NzbDrone.Core.Test/IndexerTests/RedactedTests/RedactedFixture.cs
View file

@ -9,8 +9,8 @@ using NUnit.Framework;
using NzbDrone.Common.Http;
using NzbDrone.Core.Indexers;
using NzbDrone.Core.Indexers.Definitions;
using NzbDrone.Core.Indexers.Definitions.Gazelle;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.IndexerTests.RedactedTests
@ -40,9 +40,9 @@ namespace NzbDrone.Core.Test.IndexerTests.RedactedTests
var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 3000 } })).Releases;
releases.Should().HaveCount(39);
releases.First().Should().BeOfType<GazelleInfo>();
releases.First().Should().BeOfType<TorrentInfo>();
var torrentInfo = releases.First() as GazelleInfo;
var torrentInfo = releases.First() as TorrentInfo;
torrentInfo.Title.Should().Be("Red Hot Chili Peppers - Californication [1999] [Album] [US / Reissue 2020] [FLAC 24bit Lossless] [Vinyl]");
torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);

5
src/NzbDrone.Core.Test/IndexerTests/SecretCinemaTests/SecretCinemaFixture.cs
View file

@ -11,6 +11,7 @@ using NzbDrone.Core.Indexers;
using NzbDrone.Core.Indexers.Definitions;
using NzbDrone.Core.Indexers.Definitions.Gazelle;
using NzbDrone.Core.IndexerSearch.Definitions;
using NzbDrone.Core.Parser.Model;
using NzbDrone.Core.Test.Framework;
namespace NzbDrone.Core.Test.IndexerTests.SecretCinemaTests
@ -40,9 +41,9 @@ namespace NzbDrone.Core.Test.IndexerTests.SecretCinemaTests
var releases = (await Subject.Fetch(new BasicSearchCriteria { Categories = new[] { 2000 } })).Releases;
releases.Should().HaveCount(3);
releases.First().Should().BeOfType<GazelleInfo>();
releases.First().Should().BeOfType<TorrentInfo>();
var torrentInfo = releases.First() as GazelleInfo;
var torrentInfo = releases.First() as TorrentInfo;
torrentInfo.Title.Should().Be("Singin' in the Rain (1952) 2160p");
torrentInfo.DownloadProtocol.Should().Be(DownloadProtocol.Torrent);

8
src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleInfo.cs
View file

@ -1,8 +0,0 @@
using NzbDrone.Core.Parser.Model;
namespace NzbDrone.Core.Indexers.Definitions.Gazelle;
public class GazelleInfo : TorrentInfo
{
public bool? Scene { get; set; }
}

4
src/NzbDrone.Core/Indexers/Definitions/Gazelle/GazelleParser.cs
View file

@ -69,7 +69,7 @@ public class GazelleParser : IParseIndexerResponse
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
Title = WebUtility.HtmlDecode(title),
@ -108,7 +108,7 @@ public class GazelleParser : IParseIndexerResponse
var groupName = WebUtility.HtmlDecode(result.GroupName);
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
Title = groupName,

2
src/NzbDrone.Core/Indexers/Definitions/GreatPosterWall.cs
View file

@ -171,7 +171,7 @@ public class GreatPosterWallParser : GazelleParser
var infoUrl = GetInfoUrl(result.GroupId.ToString(), torrent.TorrentId);
var time = DateTime.SpecifyKind(torrent.Time, DateTimeKind.Unspecified);
var release = new GazelleInfo
var release = new TorrentInfo
{
Title = WebUtility.HtmlDecode(torrent.FileName).Trim(),
Guid = infoUrl,

4
src/NzbDrone.Core/Indexers/Definitions/Orpheus.cs
View file

@ -265,7 +265,7 @@ namespace NzbDrone.Core.Indexers.Definitions
var title = GetTitle(result, torrent);
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
InfoUrl = infoUrl,
@ -306,7 +306,7 @@ namespace NzbDrone.Core.Indexers.Definitions
var id = result.TorrentId;
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
Title = WebUtility.HtmlDecode(result.GroupName),

4
src/NzbDrone.Core/Indexers/Definitions/Redacted.cs
View file

@ -231,7 +231,7 @@ namespace NzbDrone.Core.Indexers.Definitions
var title = GetTitle(result, torrent);
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
InfoUrl = infoUrl,
@ -272,7 +272,7 @@ namespace NzbDrone.Core.Indexers.Definitions
var id = result.TorrentId;
var infoUrl = GetInfoUrl(result.GroupId, id);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = infoUrl,
Title = WebUtility.HtmlDecode(result.GroupName),

4
src/NzbDrone.Core/Indexers/Definitions/SecretCinema.cs
View file

@ -110,7 +110,7 @@ public class SecretCinemaParser : IParseIndexerResponse
var title = WebUtility.HtmlDecode(result.GroupName);
var time = DateTime.SpecifyKind(torrent.Time, DateTimeKind.Unspecified);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = $"SecretCinema-{id}",
Title = title,
@ -170,7 +170,7 @@ public class SecretCinemaParser : IParseIndexerResponse
var id = result.TorrentId;
var groupName = WebUtility.HtmlDecode(result.GroupName);
var release = new GazelleInfo
var release = new TorrentInfo
{
Guid = $"SecretCinema-{id}",
Title = groupName,

2
src/NzbDrone.Core/Indexers/Definitions/Shazbat.cs
View file

@ -339,7 +339,7 @@ public class ShazbatParser : IParseIndexerResponse
Seeders = seeders,
Peers = seeders + leechers,
PublishDate = publishDate,
IndexerFlags = new HashSet<IndexerFlag> { IndexerFlag.Scene },
Scene = true,
Genres = row.QuerySelectorAll("label.label-tag").Select(t => t.TextContent.Trim()).ToList(),
DownloadVolumeFactor = hasGlobalFreeleech ? 0 : 1,
UploadVolumeFactor = 1,

13
src/NzbDrone.Core/Indexers/IndexerBase.cs
View file

@ -131,12 +131,17 @@ namespace NzbDrone.Core.Indexers
c.IndexerPrivacy = ((IndexerDefinition)Definition).Privacy;
c.IndexerPriority = ((IndexerDefinition)Definition).Priority;
if (Protocol == DownloadProtocol.Torrent)
//Add common flags
if (Protocol == DownloadProtocol.Torrent && c is TorrentInfo torrentRelease)
{
//Add common flags
if (((TorrentInfo)c).DownloadVolumeFactor == 0)
if (torrentRelease.DownloadVolumeFactor == 0)
{
((TorrentInfo)c).IndexerFlags.Add(IndexerFlag.FreeLeech);
torrentRelease.IndexerFlags.Add(IndexerFlag.FreeLeech);
}
if (torrentRelease.Scene.GetValueOrDefault(false))
{
torrentRelease.IndexerFlags.Add(IndexerFlag.Scene);
}
}
});

1
src/NzbDrone.Core/Parser/Model/TorrentInfo.cs
View file

@ -13,6 +13,7 @@ namespace NzbDrone.Core.Parser.Model
public long? MinimumSeedTime { get; set; }
public double? DownloadVolumeFactor { get; set; }
public double? UploadVolumeFactor { get; set; }
public bool? Scene { get; set; }
public TorrentSeedConfiguration SeedConfiguration { get; set; }