open-source-mirrors
/
Sonarr
mirror of https://github.com/Sonarr/Sonarr
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge 45619a1df3 into 640e3e5d44

Browse Source
pull/6923/merge
Arthur Melton 1 month ago committed by GitHub
parent 640e3e5d44 45619a1df3
commit e4dc1c0bce
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
20 changed files with 97 additions and 5 deletions
Show Stats Download Patch File Download Diff File

1
src/NzbDrone.Core/Blocklisting/Blocklist.cs
Unescape View File

@ -21,6 +21,7 @@ namespace NzbDrone.Core.Blocklisting
public long? Size { get; set; }
public DownloadProtocol Protocol { get; set; }
public string Indexer { get; set; }
public int IndexerId { get; set; }
public IndexerFlags IndexerFlags { get; set; }
public ReleaseType ReleaseType { get; set; }
public string Message { get; set; }

2
src/NzbDrone.Core/Blocklisting/BlocklistService.cs
Unescape View File

@ -83,6 +83,7 @@ namespace NzbDrone.Core.Blocklisting
PublishedDate = remoteEpisode.Release.PublishDate,
Size = remoteEpisode.Release.Size,
Indexer = remoteEpisode.Release.Indexer,
IndexerId = remoteEpisode.Release.IndexerId,
Protocol = remoteEpisode.Release.DownloadProtocol,
Message = message,
Languages = remoteEpisode.ParsedEpisodeInfo.Languages
@ -183,6 +184,7 @@ namespace NzbDrone.Core.Blocklisting
PublishedDate = DateTime.Parse(message.Data.GetValueOrDefault("publishedDate")),
Size = long.Parse(message.Data.GetValueOrDefault("size", "0")),
Indexer = message.Data.GetValueOrDefault("indexer"),
IndexerId = int.Parse(message.Data.GetValueOrDefault("indexerId")),
Protocol = (DownloadProtocol)Convert.ToInt32(message.Data.GetValueOrDefault("protocol")),
Message = message.Message,
Languages = message.Languages,

10
src/NzbDrone.Core/CustomFormats/CustomFormatCalculationService.cs
Unescape View File

@ -42,7 +42,8 @@ namespace NzbDrone.Core.CustomFormats
Size = size,
Languages = remoteEpisode.Languages,
IndexerFlags = remoteEpisode.Release?.IndexerFlags ?? 0,
ReleaseType = remoteEpisode.ParsedEpisodeInfo.ReleaseType
ReleaseType = remoteEpisode.ParsedEpisodeInfo.ReleaseType,
IndexerId = remoteEpisode.Release?.IndexerId ?? 0,
};
return ParseCustomFormat(input);
@ -78,7 +79,8 @@ namespace NzbDrone.Core.CustomFormats
Size = blocklist.Size ?? 0,
Languages = blocklist.Languages,
IndexerFlags = blocklist.IndexerFlags,
ReleaseType = blocklist.ReleaseType
ReleaseType = blocklist.ReleaseType,
IndexerId = blocklist.IndexerId,
};
return ParseCustomFormat(input);
@ -89,6 +91,7 @@ namespace NzbDrone.Core.CustomFormats
var parsed = Parser.Parser.ParseTitle(history.SourceTitle);
long.TryParse(history.Data.GetValueOrDefault("size"), out var size);
int.TryParse(history.Data.GetValueOrDefault("indexerId"), out var indexerId);
Enum.TryParse(history.Data.GetValueOrDefault("indexerFlags"), true, out IndexerFlags indexerFlags);
Enum.TryParse(history.Data.GetValueOrDefault("releaseType"), out ReleaseType releaseType);
@ -108,6 +111,7 @@ namespace NzbDrone.Core.CustomFormats
Size = size,
Languages = history.Languages,
IndexerFlags = indexerFlags,
IndexerId = indexerId,
ReleaseType = releaseType
};
@ -132,6 +136,7 @@ namespace NzbDrone.Core.CustomFormats
Size = localEpisode.Size,
Languages = localEpisode.Languages,
IndexerFlags = localEpisode.IndexerFlags,
IndexerId = localEpisode.Release.IndexerId,
ReleaseType = localEpisode.ReleaseType,
Filename = Path.GetFileName(localEpisode.Path)
};
@ -203,6 +208,7 @@ namespace NzbDrone.Core.CustomFormats
Size = episodeFile.Size,
Languages = episodeFile.Languages,
IndexerFlags = episodeFile.IndexerFlags,
IndexerId = episodeFile.IndexerId,
ReleaseType = episodeFile.ReleaseType,
Filename = Path.GetFileName(episodeFile.RelativePath),
};

1
src/NzbDrone.Core/CustomFormats/CustomFormatInput.cs
Unescape View File

@ -11,6 +11,7 @@ namespace NzbDrone.Core.CustomFormats
public Series Series { get; set; }
public long Size { get; set; }
public IndexerFlags IndexerFlags { get; set; }
public int IndexerId { get; set; }
public List<Language> Languages { get; set; }
public string Filename { get; set; }
public ReleaseType ReleaseType { get; set; }

44
src/NzbDrone.Core/CustomFormats/Specifications/IndexerSpecification.cs
Unescape View File

@ -0,0 +1,44 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.CustomFormats
{
public class IndexerSpecificationValidator : AbstractValidator<IndexerSpecification>
{
public IndexerSpecificationValidator(/*IIndexerFactory indexerFactory*/)
{
RuleFor(c => c.Value).NotEmpty();
/*
RuleFor(c => c.Value).Custom((indexerId, context) =>
{
if (indexerId != 0 && !indexerFactory.Exists(indexerId))
{
context.AddFailure($"Invalid indexer value: {indexerId}");
}
});
*/
}
}
public class IndexerSpecification : CustomFormatSpecificationBase
{
private static readonly IndexerSpecificationValidator Validator = new ();
public override int Order => 11;
public override string ImplementationName => "Indexer";
[FieldDefinition(1, Label = "CustomFormatsSpecificationIndexer", Type = FieldType.Select, SelectOptionsProviderAction = "getIndexersList")]
public int Value { get; set; }
protected override bool IsSatisfiedByWithoutNegate(CustomFormatInput input)
{
return input.IndexerId == Value;
}
public override NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

4
src/NzbDrone.Core/History/HistoryService.cs
Unescape View File

@ -171,6 +171,7 @@ namespace NzbDrone.Core.History
history.Data.Add("SeriesMatchType", message.Episode.SeriesMatchType.ToString());
history.Data.Add("ReleaseSource", message.Episode.ReleaseSource.ToString());
history.Data.Add("IndexerFlags", message.Episode.Release.IndexerFlags.ToString());
history.Data.Add("IndexerId", message.Episode.Release.IndexerId.ToString());
history.Data.Add("ReleaseType", message.Episode.ParsedEpisodeInfo.ReleaseType.ToString());
if (!message.Episode.ParsedEpisodeInfo.ReleaseHash.IsNullOrWhiteSpace())
@ -224,6 +225,7 @@ namespace NzbDrone.Core.History
history.Data.Add("CustomFormatScore", message.EpisodeInfo.CustomFormatScore.ToString());
history.Data.Add("Size", message.EpisodeInfo.Size.ToString());
history.Data.Add("IndexerFlags", message.ImportedEpisode.IndexerFlags.ToString());
history.Data.Add("IndexerId", message.ImportedEpisode.IndexerId.ToString());
history.Data.Add("ReleaseType", message.ImportedEpisode.ReleaseType.ToString());
_historyRepository.Insert(history);
@ -285,6 +287,7 @@ namespace NzbDrone.Core.History
history.Data.Add("Reason", message.Reason.ToString());
history.Data.Add("ReleaseGroup", message.EpisodeFile.ReleaseGroup);
history.Data.Add("Size", message.EpisodeFile.Size.ToString());
history.Data.Add("IndexerId", message.EpisodeFile.IndexerId.ToString());
history.Data.Add("IndexerFlags", message.EpisodeFile.IndexerFlags.ToString());
history.Data.Add("ReleaseType", message.EpisodeFile.ReleaseType.ToString());
@ -319,6 +322,7 @@ namespace NzbDrone.Core.History
history.Data.Add("ReleaseGroup", message.EpisodeFile.ReleaseGroup);
history.Data.Add("Size", message.EpisodeFile.Size.ToString());
history.Data.Add("IndexerFlags", message.EpisodeFile.IndexerFlags.ToString());
history.Data.Add("IndexerId", message.EpisodeFile.IndexerId.ToString());
history.Data.Add("ReleaseType", message.EpisodeFile.ReleaseType.ToString());
_historyRepository.Insert(history);

12
src/NzbDrone.Core/Indexers/IndexerFactory.cs
Unescape View File

@ -40,6 +40,18 @@ namespace NzbDrone.Core.Indexers
return base.Active().Where(c => c.Enable).ToList();
}
public virtual object RequestAction(string action, IDictionary<string, string> query)
{
_logger.Info("HELLO WORLD");
if (action == "getIndexerList")
{
return GetAvailableProviders();
}
return new { };
}
public override void SetProviderCharacteristics(IIndexer provider, IndexerDefinition definition)
{
base.SetProviderCharacteristics(provider, definition);

1
src/NzbDrone.Core/Localization/Core/en.json
Unescape View File

@ -292,6 +292,7 @@
"CustomFormatsSpecificationExceptLanguage": "Except Language",
"CustomFormatsSpecificationExceptLanguageHelpText": "Matches if any language other than the selected language is present",
"CustomFormatsSpecificationFlag": "Flag",
"CustomFormatsSpecificationIndexer": "Indexer",
"CustomFormatsSpecificationLanguage": "Language",
"CustomFormatsSpecificationMaximumSize": "Maximum Size",
"CustomFormatsSpecificationMaximumSizeHelpText": "Release must be less than or equal to this size",

1
src/NzbDrone.Core/MediaFiles/EpisodeFile.cs
Unescape View File

@ -23,6 +23,7 @@ namespace NzbDrone.Core.MediaFiles
public string ReleaseGroup { get; set; }
public string ReleaseHash { get; set; }
public QualityModel Quality { get; set; }
public int IndexerId { get; set; }
public IndexerFlags IndexerFlags { get; set; }
public MediaInfoModel MediaInfo { get; set; }
public LazyLoaded<List<Episode>> Episodes { get; set; }

1
src/NzbDrone.Core/MediaFiles/EpisodeImport/ImportApprovedEpisodes.cs
Unescape View File

@ -98,6 +98,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport
episodeFile.ReleaseGroup = localEpisode.ReleaseGroup;
episodeFile.ReleaseHash = localEpisode.ReleaseHash;
episodeFile.Languages = localEpisode.Languages;
episodeFile.IndexerId = localEpisode.IndexerId;
// Prefer the release type from the download client, folder and finally the file so we have the most accurate information.
episodeFile.ReleaseType = localEpisode.DownloadClientEpisodeInfo?.ReleaseType ??

1
src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportFile.cs
Unescape View File

@ -18,6 +18,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
public List<Language> Languages { get; set; }
public string ReleaseGroup { get; set; }
public int IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType ReleaseType { get; set; }
public string DownloadId { get; set; }

1
src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportItem.cs
Unescape View File

@ -25,6 +25,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
public List<CustomFormat> CustomFormats { get; set; }
public int CustomFormatScore { get; set; }
public int IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType ReleaseType { get; set; }
public IEnumerable<ImportRejection> Rejections { get; set; }

10
src/NzbDrone.Core/MediaFiles/EpisodeImport/Manual/ManualImportService.cs
Unescape View File

@ -24,7 +24,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
{
List<ManualImportItem> GetMediaFiles(int seriesId, int? seasonNumber);
List<ManualImportItem> GetMediaFiles(string path, string downloadId, int? seriesId, bool filterExistingFiles);
ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, string releaseGroup, QualityModel quality, List<Language> languages, int indexerFlags, ReleaseType releaseType);
ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, string releaseGroup, QualityModel quality, List<Language> languages, int indexerFlags, int indexerId, ReleaseType releaseType);
}
public class ManualImportService : IExecute<ManualImportCommand>, IManualImportService
@ -138,7 +138,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
return ProcessFolder(path, path, downloadId, seriesId, filterExistingFiles);
}
public ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, string releaseGroup, QualityModel quality, List<Language> languages, int indexerFlags, ReleaseType releaseType)
public ManualImportItem ReprocessItem(string path, string downloadId, int seriesId, int? seasonNumber, List<int> episodeIds, string releaseGroup, QualityModel quality, List<Language> languages, int indexerFlags, int indexerId, ReleaseType releaseType)
{
var rootFolder = Path.GetDirectoryName(path);
var series = _seriesService.GetSeries(seriesId);
@ -178,6 +178,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
localEpisode.Languages = finalLanguges;
localEpisode.Quality = finalQuality;
localEpisode.IndexerFlags = (IndexerFlags)indexerFlags;
localEpisode.IndexerId = indexerId;
localEpisode.ReleaseType = releaseType;
localEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(localEpisode);
@ -222,6 +223,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
Languages = languages?.Count <= 1 && (languages?.SingleOrDefault() ?? Language.Unknown) == Language.Unknown ? LanguageParser.ParseLanguages(path) : languages,
Quality = quality.Quality == Quality.Unknown ? QualityParser.ParseQuality(path) : quality,
IndexerFlags = (IndexerFlags)indexerFlags,
IndexerId = indexerId,
ReleaseType = releaseType
};
@ -440,6 +442,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
item.Size = _diskProvider.GetFileSize(decision.LocalEpisode.Path);
item.Rejections = decision.Rejections;
item.IndexerFlags = (int)decision.LocalEpisode.IndexerFlags;
item.IndexerId = decision.LocalEpisode.IndexerId;
item.ReleaseType = decision.LocalEpisode.ReleaseType;
if (decision.LocalEpisode.Series != null)
@ -468,6 +471,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
item.Quality = episodeFile.Quality;
item.Languages = episodeFile.Languages;
item.IndexerFlags = (int)episodeFile.IndexerFlags;
item.IndexerId = episodeFile.IndexerId;
item.ReleaseType = episodeFile.ReleaseType;
item.Size = _diskProvider.GetFileSize(item.Path);
item.Rejections = Enumerable.Empty<ImportRejection>();
@ -506,6 +510,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
Quality = file.Quality,
Languages = file.Languages,
IndexerFlags = (IndexerFlags)file.IndexerFlags,
IndexerId = file.IndexerId,
ReleaseType = file.ReleaseType,
Series = series,
Size = 0
@ -534,6 +539,7 @@ namespace NzbDrone.Core.MediaFiles.EpisodeImport.Manual
localEpisode.Quality = file.Quality;
localEpisode.Languages = file.Languages;
localEpisode.IndexerFlags = (IndexerFlags)file.IndexerFlags;
localEpisode.IndexerId = file.IndexerId;
localEpisode.ReleaseType = file.ReleaseType;
localEpisode.CustomFormats = _formatCalculator.ParseCustomFormat(localEpisode);

1
src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs
Unescape View File

@ -91,6 +91,7 @@ namespace NzbDrone.Core.Notifications.CustomScript
environmentVariables.Add("Sonarr_Release_QualityVersion", remoteEpisode.ParsedEpisodeInfo.Quality.Revision.Version.ToString());
environmentVariables.Add("Sonarr_Release_ReleaseGroup", releaseGroup ?? string.Empty);
environmentVariables.Add("Sonarr_Release_IndexerFlags", remoteEpisode.Release.IndexerFlags.ToString());
environmentVariables.Add("Sonarr_Release_IndexerId", remoteEpisode.Release.IndexerId.ToString());
environmentVariables.Add("Sonarr_Download_Client", message.DownloadClientName ?? string.Empty);
environmentVariables.Add("Sonarr_Download_Client_Type", message.DownloadClientType ?? string.Empty);
environmentVariables.Add("Sonarr_Download_Id", message.DownloadId ?? string.Empty);

4
src/NzbDrone.Core/Parser/Model/GrabbedReleaseInfo.cs
Unescape View File

@ -9,6 +9,7 @@ namespace NzbDrone.Core.Parser.Model
{
public string Title { get; set; }
public string Indexer { get; set; }
public int IndexerId { get; set; }
public long Size { get; set; }
public ReleaseType ReleaseType { get; set; }
@ -20,12 +21,15 @@ namespace NzbDrone.Core.Parser.Model
var episodeIds = grabbedHistories.Select(h => h.EpisodeId).Distinct().ToList();
grabbedHistory.Data.TryGetValue("indexer", out var indexer);
grabbedHistory.Data.TryGetValue("indexerId", out var indexerIdString);
grabbedHistory.Data.TryGetValue("size", out var sizeString);
Enum.TryParse(grabbedHistory.Data.GetValueOrDefault("releaseType"), out ReleaseType releaseType);
long.TryParse(sizeString, out var size);
int.TryParse(indexerIdString, out var indexerId);
Title = grabbedHistory.SourceTitle;
Indexer = indexer;
IndexerId = indexerId;
Size = size;
EpisodeIds = episodeIds;
ReleaseType = releaseType;

1
src/NzbDrone.Core/Parser/Model/LocalEpisode.cs
Unescape View File

@ -32,6 +32,7 @@ namespace NzbDrone.Core.Parser.Model
public QualityModel Quality { get; set; }
public List<Language> Languages { get; set; }
public IndexerFlags IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType ReleaseType { get; set; }
public MediaInfoModel MediaInfo { get; set; }
public bool ExistingFile { get; set; }

2
src/Sonarr.Api.V3/EpisodeFiles/EpisodeFileResource.cs
Unescape View File

@ -27,6 +27,7 @@ namespace Sonarr.Api.V3.EpisodeFiles
public List<CustomFormatResource> CustomFormats { get; set; }
public int CustomFormatScore { get; set; }
public int? IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType? ReleaseType { get; set; }
public MediaInfoResource MediaInfo { get; set; }
@ -65,6 +66,7 @@ namespace Sonarr.Api.V3.EpisodeFiles
CustomFormats = customFormats.ToResource(false),
CustomFormatScore = customFormatScore,
IndexerFlags = (int)model.IndexerFlags,
IndexerId = model.IndexerId,
ReleaseType = model.ReleaseType,
};
}

2
src/Sonarr.Api.V3/ManualImport/ManualImportController.cs
Unescape View File

@ -39,7 +39,7 @@ namespace Sonarr.Api.V3.ManualImport
{
foreach (var item in items)
{
var processedItem = _manualImportService.ReprocessItem(item.Path, item.DownloadId, item.SeriesId, item.SeasonNumber, item.EpisodeIds ?? new List<int>(), item.ReleaseGroup, item.Quality, item.Languages, item.IndexerFlags, item.ReleaseType);
var processedItem = _manualImportService.ReprocessItem(item.Path, item.DownloadId, item.SeriesId, item.SeasonNumber, item.EpisodeIds ?? new List<int>(), item.ReleaseGroup, item.Quality, item.Languages, item.IndexerFlags, item.IndexerId, item.ReleaseType);
item.SeasonNumber = processedItem.SeasonNumber;
item.Episodes = processedItem.Episodes.ToResource();

1
src/Sonarr.Api.V3/ManualImport/ManualImportReprocessResource.cs
Unescape View File

@ -22,6 +22,7 @@ namespace Sonarr.Api.V3.ManualImport
public List<CustomFormatResource> CustomFormats { get; set; }
public int CustomFormatScore { get; set; }
public int IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType ReleaseType { get; set; }
public IEnumerable<ImportRejectionResource> Rejections { get; set; }
}

2
src/Sonarr.Api.V3/ManualImport/ManualImportResource.cs
Unescape View File

@ -33,6 +33,7 @@ namespace Sonarr.Api.V3.ManualImport
public List<CustomFormatResource> CustomFormats { get; set; }
public int CustomFormatScore { get; set; }
public int IndexerFlags { get; set; }
public int IndexerId { get; set; }
public ReleaseType ReleaseType { get; set; }
public IEnumerable<ImportRejectionResource> Rejections { get; set; }
}
@ -63,6 +64,7 @@ namespace Sonarr.Api.V3.ManualImport
EpisodeFileId = model.EpisodeFileId,
ReleaseGroup = model.ReleaseGroup,
Quality = model.Quality,
IndexerId = model.IndexerId,
Languages = model.Languages,
CustomFormats = customFormats.ToResource(false),
CustomFormatScore = customFormatScore,

Write Preview
Loading…
Cancel
Save