tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-16 21:15:33 -04:00
Code Issues Projects Releases Wiki Activity

Display naming example errors when all fields are empty

Browse Source
This commit is contained in:
Bogdan
2024-09-25 05:17:17 +03:00
parent be2e1e4fdb
commit 1d286df85d
5 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/NzbDrone.Core/Organizer/FileNameBuilder.cs
View File

@@ -107,7 +107,13 @@ namespace NzbDrone.Core.Organizer
return GetOriginalTitle(movieFile, false);
}
if (namingConfig.StandardMovieFormat.IsNullOrWhiteSpace())
{
throw new NamingFormatException("Standard movie format cannot be empty");
}
var pattern = namingConfig.StandardMovieFormat;
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
var multipleTokens = TitleRegex.Matches(pattern).Count > 1;

2
src/NzbDrone.Core/Organizer/FileNameSampleService.cs
View File

@@ -90,6 +90,8 @@ namespace NzbDrone.Core.Organizer
var result = new SampleResult
{
FileName = BuildSample(_movie, _movieFile, nameSpec),
Movie = _movie,
MovieFile = _movieFile
};
return result;

11
src/Radarr.Api.V3/Config/NamingConfigController.cs
View File

@@ -17,17 +17,14 @@ namespace Radarr.Api.V3.Config
private readonly INamingConfigService _namingConfigService;
private readonly IFilenameSampleService _filenameSampleService;
private readonly IFilenameValidationService _filenameValidationService;
private readonly IBuildFileNames _filenameBuilder;
public NamingConfigController(INamingConfigService namingConfigService,
IFilenameSampleService filenameSampleService,
IFilenameValidationService filenameValidationService,
IBuildFileNames filenameBuilder)
IFilenameValidationService filenameValidationService)
{
_namingConfigService = namingConfigService;
_filenameSampleService = filenameSampleService;
_filenameValidationService = filenameValidationService;
_filenameBuilder = filenameBuilder;
SharedValidator.RuleFor(c => c.StandardMovieFormat).ValidMovieFormat();
SharedValidator.RuleFor(c => c.MovieFolderFormat).ValidMovieFolderFormat();
@@ -72,11 +69,11 @@ namespace Radarr.Api.V3.Config
var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec);
sampleResource.MovieExample = nameSpec.StandardMovieFormat.IsNullOrWhiteSpace()
? "Invalid Format"
? null
: movieSampleResult.FileName;
sampleResource.MovieFolderExample = nameSpec.MovieFolderFormat.IsNullOrWhiteSpace()
? "Invalid format"
? null
: _filenameSampleService.GetMovieFolderSample(nameSpec);
return sampleResource;
@@ -90,6 +87,8 @@ namespace Radarr.Api.V3.Config
var validationFailures = new List<ValidationFailure>();
validationFailures.AddIfNotNull(standardMovieValidationResult);
if (validationFailures.Any())
{
throw new ValidationException(validationFailures.DistinctBy(v => v.PropertyName).ToArray());