mirror of https://github.com/Radarr/Radarr
Make NetImport sync interval work (needs some testing)
This commit is contained in:
parent
4abbf55ee4
commit
b6e4f53597
|
@ -10,6 +10,8 @@ namespace NzbDrone.Api.Config
|
||||||
public NetImportConfigModule(IConfigService configService)
|
public NetImportConfigModule(IConfigService configService)
|
||||||
: base(configService)
|
: base(configService)
|
||||||
{
|
{
|
||||||
|
SharedValidator.RuleFor(c => c.NetImportSyncInterval)
|
||||||
|
.IsValidNetImportSyncInterval();
|
||||||
}
|
}
|
||||||
|
|
||||||
protected override NetImportConfigResource ToResource(IConfigService model)
|
protected override NetImportConfigResource ToResource(IConfigService model)
|
||||||
|
|
|
@ -5,6 +5,7 @@ namespace NzbDrone.Api.Config
|
||||||
{
|
{
|
||||||
public class NetImportConfigResource : RestResource
|
public class NetImportConfigResource : RestResource
|
||||||
{
|
{
|
||||||
|
public int NetImportSyncInterval { get; set; }
|
||||||
}
|
}
|
||||||
|
|
||||||
public static class NetImportConfigResourceMapper
|
public static class NetImportConfigResourceMapper
|
||||||
|
@ -13,6 +14,7 @@ namespace NzbDrone.Api.Config
|
||||||
{
|
{
|
||||||
return new NetImportConfigResource
|
return new NetImportConfigResource
|
||||||
{
|
{
|
||||||
|
NetImportSyncInterval = model.NetImportSyncInterval
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -260,6 +260,7 @@
|
||||||
<Compile Include="TinyIoCNancyBootstrapper.cs" />
|
<Compile Include="TinyIoCNancyBootstrapper.cs" />
|
||||||
<Compile Include="Update\UpdateModule.cs" />
|
<Compile Include="Update\UpdateModule.cs" />
|
||||||
<Compile Include="Update\UpdateResource.cs" />
|
<Compile Include="Update\UpdateResource.cs" />
|
||||||
|
<Compile Include="Validation\NetImportSyncIntervalValidator.cs" />
|
||||||
<Compile Include="Validation\RssSyncIntervalValidator.cs" />
|
<Compile Include="Validation\RssSyncIntervalValidator.cs" />
|
||||||
<Compile Include="Validation\EmptyCollectionValidator.cs" />
|
<Compile Include="Validation\EmptyCollectionValidator.cs" />
|
||||||
<Compile Include="Validation\RuleBuilderExtensions.cs" />
|
<Compile Include="Validation\RuleBuilderExtensions.cs" />
|
||||||
|
|
|
@ -0,0 +1,34 @@
|
||||||
|
using FluentValidation.Validators;
|
||||||
|
|
||||||
|
namespace NzbDrone.Api.Validation
|
||||||
|
{
|
||||||
|
public class NetImportSyncIntervalValidator : PropertyValidator
|
||||||
|
{
|
||||||
|
public NetImportSyncIntervalValidator()
|
||||||
|
: base("Must be between 10 and 1440 or 0 to disable")
|
||||||
|
{
|
||||||
|
}
|
||||||
|
|
||||||
|
protected override bool IsValid(PropertyValidatorContext context)
|
||||||
|
{
|
||||||
|
if (context.PropertyValue == null)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
var value = (int)context.PropertyValue;
|
||||||
|
|
||||||
|
if (value == 0)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (value >= 10 && value <= 1440)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -36,5 +36,10 @@ namespace NzbDrone.Api.Validation
|
||||||
{
|
{
|
||||||
return ruleBuilder.SetValidator(new RssSyncIntervalValidator());
|
return ruleBuilder.SetValidator(new RssSyncIntervalValidator());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static IRuleBuilderOptions<T, int> IsValidNetImportSyncInterval<T>(this IRuleBuilder<T, int> ruleBuilder)
|
||||||
|
{
|
||||||
|
return ruleBuilder.SetValidator(new NetImportSyncIntervalValidator());
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -105,6 +105,13 @@ namespace NzbDrone.Core.Configuration
|
||||||
set { SetValue("RssSyncInterval", value); }
|
set { SetValue("RssSyncInterval", value); }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public int NetImportSyncInterval
|
||||||
|
{
|
||||||
|
get { return GetValueInt("NetImportSyncInterval", 60); }
|
||||||
|
|
||||||
|
set { SetValue("NetImportSyncInterval", value); }
|
||||||
|
}
|
||||||
|
|
||||||
public int MinimumAge
|
public int MinimumAge
|
||||||
{
|
{
|
||||||
get { return GetValueInt("MinimumAge", 0); }
|
get { return GetValueInt("MinimumAge", 0); }
|
||||||
|
|
|
@ -46,6 +46,8 @@ namespace NzbDrone.Core.Configuration
|
||||||
int RssSyncInterval { get; set; }
|
int RssSyncInterval { get; set; }
|
||||||
int MinimumAge { get; set; }
|
int MinimumAge { get; set; }
|
||||||
|
|
||||||
|
int NetImportSyncInterval { get; set; }
|
||||||
|
|
||||||
//UI
|
//UI
|
||||||
int FirstDayOfWeek { get; set; }
|
int FirstDayOfWeek { get; set; }
|
||||||
string CalendarWeekColumnHeader { get; set; }
|
string CalendarWeekColumnHeader { get; set; }
|
||||||
|
|
|
@ -75,7 +75,6 @@ namespace NzbDrone.Core.Jobs
|
||||||
new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName},
|
new ScheduledTask{ Interval = 5, TypeName = typeof(MessagingCleanupCommand).FullName},
|
||||||
new ScheduledTask{ Interval = updateInterval, TypeName = typeof(ApplicationUpdateCommand).FullName},
|
new ScheduledTask{ Interval = updateInterval, TypeName = typeof(ApplicationUpdateCommand).FullName},
|
||||||
// new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
|
// new ScheduledTask{ Interval = 3*60, TypeName = typeof(UpdateSceneMappingCommand).FullName},
|
||||||
new ScheduledTask{ Interval = 12*60, TypeName = typeof(NetImportSyncCommand).FullName},
|
|
||||||
new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName},
|
new ScheduledTask{ Interval = 6*60, TypeName = typeof(CheckHealthCommand).FullName},
|
||||||
new ScheduledTask{ Interval = 24*60, TypeName = typeof(RefreshMovieCommand).FullName},
|
new ScheduledTask{ Interval = 24*60, TypeName = typeof(RefreshMovieCommand).FullName},
|
||||||
new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
|
new ScheduledTask{ Interval = 24*60, TypeName = typeof(HousekeepingCommand).FullName},
|
||||||
|
@ -87,6 +86,12 @@ namespace NzbDrone.Core.Jobs
|
||||||
TypeName = typeof(RssSyncCommand).FullName
|
TypeName = typeof(RssSyncCommand).FullName
|
||||||
},
|
},
|
||||||
|
|
||||||
|
new ScheduledTask
|
||||||
|
{
|
||||||
|
Interval = GetNetImportSyncInterval(),
|
||||||
|
TypeName = typeof(NetImportSyncCommand).FullName
|
||||||
|
},
|
||||||
|
|
||||||
new ScheduledTask
|
new ScheduledTask
|
||||||
{
|
{
|
||||||
Interval = _configService.DownloadedEpisodesScanInterval,
|
Interval = _configService.DownloadedEpisodesScanInterval,
|
||||||
|
@ -140,6 +145,23 @@ namespace NzbDrone.Core.Jobs
|
||||||
return interval;
|
return interval;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private int GetNetImportSyncInterval()
|
||||||
|
{
|
||||||
|
var interval = _configService.NetImportSyncInterval;
|
||||||
|
|
||||||
|
if (interval > 0 && interval < 10)
|
||||||
|
{
|
||||||
|
return 10;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (interval < 0)
|
||||||
|
{
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
return interval;
|
||||||
|
}
|
||||||
|
|
||||||
public void Handle(CommandExecutedEvent message)
|
public void Handle(CommandExecutedEvent message)
|
||||||
{
|
{
|
||||||
var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.Body.GetType().FullName);
|
var scheduledTask = _scheduledTaskRepository.All().SingleOrDefault(c => c.TypeName == message.Command.Body.GetType().FullName);
|
||||||
|
|
|
@ -1,337 +1,3 @@
|
||||||
using System;
|
|
||||||
using System.Collections.Generic;
|
|
||||||
using System.Globalization;
|
|
||||||
using System.IO;
|
|
||||||
using System.Linq;
|
|
||||||
using System.Text.RegularExpressions;
|
|
||||||
using NLog;
|
|
||||||
using NzbDrone.Common.Cache;
|
|
||||||
using NzbDrone.Common.EnsureThat;
|
|
||||||
using NzbDrone.Common.Extensions;
|
|
||||||
using NzbDrone.Core.MediaFiles;
|
|
||||||
using NzbDrone.Core.Qualities;
|
|
||||||
using NzbDrone.Core.Tv;
|
|
||||||
|
|
||||||
namespace NzbDrone.Core.Organizer
|
|
||||||
{
|
|
||||||
public interface IBuildFileNames
|
|
||||||
{
|
|
||||||
string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig = null);
|
|
||||||
string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namingConfig = null);
|
|
||||||
string BuildFilePath(Movie movie, string fileName, string extension);
|
|
||||||
string BuildFilePath(Series series, int seasonNumber, string fileName, string extension);
|
|
||||||
string BuildSeasonPath(Series series, int seasonNumber);
|
|
||||||
BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec);
|
|
||||||
string GetSeriesFolder(Series series, NamingConfig namingConfig = null);
|
|
||||||
string GetSeasonFolder(Series series, int seasonNumber, NamingConfig namingConfig = null);
|
|
||||||
string GetMovieFolder(Movie movie, NamingConfig namingConfig = null);
|
|
||||||
}
|
|
||||||
|
|
||||||
public class FileNameBuilder : IBuildFileNames
|
|
||||||
{
|
|
||||||
private readonly INamingConfigService _namingConfigService;
|
|
||||||
private readonly IQualityDefinitionService _qualityDefinitionService;
|
|
||||||
private readonly ICached<EpisodeFormat[]> _episodeFormatCache;
|
|
||||||
private readonly ICached<AbsoluteEpisodeFormat[]> _absoluteEpisodeFormatCache;
|
|
||||||
private readonly Logger _logger;
|
|
||||||
|
|
||||||
private static readonly Regex TitleRegex = new Regex(@"\{(?<prefix>[- ._\[(]*)(?<token>(?:[a-z0-9]+)(?:(?<separator>[- ._]+)(?:[a-z0-9]+))?)(?::(?<customFormat>[a-z0-9]+))?(?<suffix>[- ._)\]]*)\}",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static readonly Regex EpisodeRegex = new Regex(@"(?<episode>\{episode(?:\:0+)?})",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static readonly Regex SeasonRegex = new Regex(@"(?<season>\{season(?:\:0+)?})",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static readonly Regex AbsoluteEpisodeRegex = new Regex(@"(?<absolute>\{absolute(?:\:0+)?})",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
public static readonly Regex SeasonEpisodePatternRegex = new Regex(@"(?<separator>(?<=})[- ._]+?)?(?<seasonEpisode>s?{season(?:\:0+)?}(?<episodeSeparator>[- ._]?[ex])(?<episode>{episode(?:\:0+)?}))(?<separator>[- ._]+?(?={))?",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
public static readonly Regex AbsoluteEpisodePatternRegex = new Regex(@"(?<separator>(?<=})[- ._]+?)?(?<absolute>{absolute(?:\:0+)?})(?<separator>[- ._]+?(?={))?",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
public static readonly Regex AirDateRegex = new Regex(@"\{Air(\s|\W|_)Date\}", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
public static readonly Regex SeriesTitleRegex = new Regex(@"(?<token>\{(?:Series)(?<separator>[- ._])(Clean)?Title\})",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
public static readonly Regex MovieTitleRegex = new Regex(@"(?<token>\{((?:(Movie|Original))(?<separator>[- ._])(Clean)?Title(The)?)\})",
|
|
||||||
RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled);
|
|
||||||
private static readonly Regex TrimSeparatorsRegex = new Regex(@"[- ._]$", RegexOptions.Compiled);
|
|
||||||
|
|
||||||
private static readonly Regex ScenifyRemoveChars = new Regex(@"(?<=\s)(,|<|>|\/|\\|;|:|'|""|\||`|~|!|\?|@|$|%|^|\*|-|_|=){1}(?=\s)|('|:|\?|,)(?=(?:(?:s|m)\s)|\s|$)|(\(|\)|\[|\]|\{|\})", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
private static readonly Regex ScenifyReplaceChars = new Regex(@"[\/]", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
//TODO: Support Written numbers (One, Two, etc) and Roman Numerals (I, II, III etc)
|
|
||||||
private static readonly Regex MultiPartCleanupRegex = new Regex(@"(?:\(\d+\)|(Part|Pt\.?)\s?\d+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
|
|
||||||
|
|
||||||
private static readonly char[] EpisodeTitleTrimCharacters = new[] { ' ', '.', '?' };
|
|
||||||
|
|
||||||
public FileNameBuilder(INamingConfigService namingConfigService,
|
|
||||||
IQualityDefinitionService qualityDefinitionService,
|
|
||||||
ICacheManager cacheManager,
|
|
||||||
Logger logger)
|
|
||||||
{
|
|
||||||
_namingConfigService = namingConfigService;
|
|
||||||
_qualityDefinitionService = qualityDefinitionService;
|
|
||||||
//_movieFormatCache = cacheManager.GetCache<MovieFormat>(GetType(), "movieFormat");
|
|
||||||
_episodeFormatCache = cacheManager.GetCache<EpisodeFormat[]>(GetType(), "episodeFormat");
|
|
||||||
_absoluteEpisodeFormatCache = cacheManager.GetCache<AbsoluteEpisodeFormat[]>(GetType(), "absoluteEpisodeFormat");
|
|
||||||
_logger = logger;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BuildFileName(List<Episode> episodes, Series series, EpisodeFile episodeFile, NamingConfig namingConfig = null)
|
|
||||||
{
|
|
||||||
if (namingConfig == null)
|
|
||||||
{
|
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!namingConfig.RenameEpisodes)
|
|
||||||
{
|
|
||||||
return GetOriginalTitle(episodeFile);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (namingConfig.StandardEpisodeFormat.IsNullOrWhiteSpace() && series.SeriesType == SeriesTypes.Standard)
|
|
||||||
{
|
|
||||||
throw new NamingFormatException("Standard episode format cannot be empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (namingConfig.DailyEpisodeFormat.IsNullOrWhiteSpace() && series.SeriesType == SeriesTypes.Daily)
|
|
||||||
{
|
|
||||||
throw new NamingFormatException("Daily episode format cannot be empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
if (namingConfig.AnimeEpisodeFormat.IsNullOrWhiteSpace() && series.SeriesType == SeriesTypes.Anime)
|
|
||||||
{
|
|
||||||
throw new NamingFormatException("Anime episode format cannot be empty");
|
|
||||||
}
|
|
||||||
|
|
||||||
var pattern = namingConfig.StandardEpisodeFormat;
|
|
||||||
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
|
|
||||||
|
|
||||||
episodes = episodes.OrderBy(e => e.SeasonNumber).ThenBy(e => e.EpisodeNumber).ToList();
|
|
||||||
|
|
||||||
if (series.SeriesType == SeriesTypes.Daily)
|
|
||||||
{
|
|
||||||
pattern = namingConfig.DailyEpisodeFormat;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (series.SeriesType == SeriesTypes.Anime && episodes.All(e => e.AbsoluteEpisodeNumber.HasValue))
|
|
||||||
{
|
|
||||||
pattern = namingConfig.AnimeEpisodeFormat;
|
|
||||||
}
|
|
||||||
|
|
||||||
pattern = AddSeasonEpisodeNumberingTokens(pattern, tokenHandlers, episodes, namingConfig);
|
|
||||||
pattern = AddAbsoluteNumberingTokens(pattern, tokenHandlers, series, episodes, namingConfig);
|
|
||||||
|
|
||||||
AddSeriesTokens(tokenHandlers, series);
|
|
||||||
AddEpisodeTokens(tokenHandlers, episodes);
|
|
||||||
AddEpisodeFileTokens(tokenHandlers, episodeFile);
|
|
||||||
AddQualityTokens(tokenHandlers, series, episodeFile);
|
|
||||||
AddMediaInfoTokens(tokenHandlers, episodeFile);
|
|
||||||
|
|
||||||
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
|
||||||
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
|
||||||
fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
|
|
||||||
|
|
||||||
return fileName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BuildFileName(Movie movie, MovieFile movieFile, NamingConfig namingConfig = null)
|
|
||||||
{
|
|
||||||
if (namingConfig == null)
|
|
||||||
{
|
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
if (!namingConfig.RenameEpisodes)
|
|
||||||
{
|
|
||||||
return GetOriginalTitle(movieFile);
|
|
||||||
}
|
|
||||||
|
|
||||||
//TODO: Update namingConfig for Movies!
|
|
||||||
var pattern = namingConfig.StandardMovieFormat;
|
|
||||||
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
|
|
||||||
|
|
||||||
AddMovieTokens(tokenHandlers, movie);
|
|
||||||
AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year
|
|
||||||
AddImdbIdTokens(tokenHandlers, movie.ImdbId);
|
|
||||||
AddQualityTokens(tokenHandlers, movie, movieFile);
|
|
||||||
AddMediaInfoTokens(tokenHandlers, movieFile);
|
|
||||||
AddMovieFileTokens(tokenHandlers, movieFile);
|
|
||||||
|
|
||||||
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
|
||||||
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
|
||||||
fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
|
|
||||||
|
|
||||||
return fileName;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BuildFilePath(Series series, int seasonNumber, string fileName, string extension)
|
|
||||||
{
|
|
||||||
Ensure.That(extension, () => extension).IsNotNullOrWhiteSpace();
|
|
||||||
|
|
||||||
var path = BuildSeasonPath(series, seasonNumber);
|
|
||||||
|
|
||||||
return Path.Combine(path, fileName + extension);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BuildFilePath(Movie movie, string fileName, string extension)
|
|
||||||
{
|
|
||||||
Ensure.That(extension, () => extension).IsNotNullOrWhiteSpace();
|
|
||||||
|
|
||||||
var path = movie.Path;
|
|
||||||
|
|
||||||
return Path.Combine(path, fileName + extension);
|
|
||||||
}
|
|
||||||
|
|
||||||
public string BuildSeasonPath(Series series, int seasonNumber)
|
|
||||||
{
|
|
||||||
var path = series.Path;
|
|
||||||
|
|
||||||
if (series.SeasonFolder)
|
|
||||||
{
|
|
||||||
if (seasonNumber == 0)
|
|
||||||
{
|
|
||||||
path = Path.Combine(path, "Specials");
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
var seasonFolder = GetSeasonFolder(series, seasonNumber);
|
|
||||||
|
|
||||||
seasonFolder = CleanFileName(seasonFolder);
|
|
||||||
|
|
||||||
path = Path.Combine(path, seasonFolder);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return path;
|
|
||||||
}
|
|
||||||
|
|
||||||
public BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec)
|
|
||||||
{
|
|
||||||
return new BasicNamingConfig(); //For now let's be lazy
|
|
||||||
|
|
||||||
var episodeFormat = GetEpisodeFormat(nameSpec.StandardEpisodeFormat).LastOrDefault();
|
|
||||||
|
|
||||||
if (episodeFormat == null)
|
|
||||||
{
|
|
||||||
return new BasicNamingConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
var basicNamingConfig = new BasicNamingConfig
|
|
||||||
{
|
|
||||||
Separator = episodeFormat.Separator,
|
|
||||||
NumberStyle = episodeFormat.SeasonEpisodePattern
|
|
||||||
};
|
|
||||||
|
|
||||||
var titleTokens = TitleRegex.Matches(nameSpec.StandardEpisodeFormat);
|
|
||||||
|
|
||||||
foreach (Match match in titleTokens)
|
|
||||||
{
|
|
||||||
var separator = match.Groups["separator"].Value;
|
|
||||||
var token = match.Groups["token"].Value;
|
|
||||||
|
|
||||||
if (!separator.Equals(" "))
|
|
||||||
{
|
|
||||||
basicNamingConfig.ReplaceSpaces = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (token.StartsWith("{Series", StringComparison.InvariantCultureIgnoreCase))
|
|
||||||
{
|
|
||||||
basicNamingConfig.IncludeSeriesTitle = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (token.StartsWith("{Episode", StringComparison.InvariantCultureIgnoreCase))
|
|
||||||
{
|
|
||||||
basicNamingConfig.IncludeEpisodeTitle = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (token.StartsWith("{Quality", StringComparison.InvariantCultureIgnoreCase))
|
|
||||||
{
|
|
||||||
basicNamingConfig.IncludeQuality = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return basicNamingConfig;
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetSeriesFolder(Series series, NamingConfig namingConfig = null)
|
|
||||||
{
|
|
||||||
if (namingConfig == null)
|
|
||||||
{
|
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
|
|
||||||
|
|
||||||
AddSeriesTokens(tokenHandlers, series);
|
|
||||||
|
|
||||||
return CleanFolderName(ReplaceTokens(namingConfig.SeriesFolderFormat, tokenHandlers, namingConfig));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetSeasonFolder(Series series, int seasonNumber, NamingConfig namingConfig = null)
|
|
||||||
{
|
|
||||||
if (namingConfig == null)
|
|
||||||
{
|
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
|
|
||||||
|
|
||||||
AddSeriesTokens(tokenHandlers, series);
|
|
||||||
AddSeasonTokens(tokenHandlers, seasonNumber);
|
|
||||||
|
|
||||||
return CleanFolderName(ReplaceTokens(namingConfig.SeasonFolderFormat, tokenHandlers, namingConfig));
|
|
||||||
}
|
|
||||||
|
|
||||||
public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
|
|
||||||
{
|
|
||||||
if(namingConfig == null)
|
|
||||||
{
|
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
|
||||||
}
|
|
||||||
|
|
||||||
var tokenHandlers = new Dictionary<string, Func<TokenMatch, string>>(FileNameBuilderTokenEqualityComparer.Instance);
|
|
||||||
|
|
||||||
AddMovieTokens(tokenHandlers, movie);
|
|
||||||
AddReleaseDateTokens(tokenHandlers, movie.Year);
|
|
||||||
AddImdbIdTokens(tokenHandlers, movie.ImdbId);
|
|
||||||
|
|
||||||
return CleanFolderName(ReplaceTokens(namingConfig.MovieFolderFormat, tokenHandlers, namingConfig));
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string CleanTitle(string title)
|
|
||||||
{
|
|
||||||
title = title.Replace("&", "and");
|
|
||||||
title = ScenifyReplaceChars.Replace(title, " ");
|
|
||||||
title = ScenifyRemoveChars.Replace(title, string.Empty);
|
|
||||||
|
|
||||||
return title;
|
|
||||||
}
|
|
||||||
|
|
||||||
public static string TitleThe(string title)
|
|
||||||
{
|
|
||||||
string[] prefixes = { "The ", "An ", "A " };
|
|
||||||
foreach (string prefix in prefixes)
|
|
||||||
{
|
|
||||||
int prefix_length = prefix.Length;
|
|
||||||
if (prefix.ToLower() == title.Substring(0, prefix_length).ToLower())
|
|
||||||
{
|
|
||||||
title = title.Substring(prefix_length) + ", " + prefix.Trim();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return title.Trim();
|
|
||||||
}
|
|
||||||
|
|
||||||
using System;
|
using System;
|
||||||
using System.Collections.Generic;
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
|
@ -472,7 +138,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
AddEpisodeFileTokens(tokenHandlers, episodeFile);
|
AddEpisodeFileTokens(tokenHandlers, episodeFile);
|
||||||
AddQualityTokens(tokenHandlers, series, episodeFile);
|
AddQualityTokens(tokenHandlers, series, episodeFile);
|
||||||
AddMediaInfoTokens(tokenHandlers, episodeFile);
|
AddMediaInfoTokens(tokenHandlers, episodeFile);
|
||||||
|
|
||||||
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
var fileName = ReplaceTokens(pattern, tokenHandlers, namingConfig).Trim();
|
||||||
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
fileName = FileNameCleanupRegex.Replace(fileName, match => match.Captures[0].Value[0].ToString());
|
||||||
fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
|
fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty);
|
||||||
|
@ -564,10 +230,10 @@ namespace NzbDrone.Core.Organizer
|
||||||
}
|
}
|
||||||
|
|
||||||
var basicNamingConfig = new BasicNamingConfig
|
var basicNamingConfig = new BasicNamingConfig
|
||||||
{
|
{
|
||||||
Separator = episodeFormat.Separator,
|
Separator = episodeFormat.Separator,
|
||||||
NumberStyle = episodeFormat.SeasonEpisodePattern
|
NumberStyle = episodeFormat.SeasonEpisodePattern
|
||||||
};
|
};
|
||||||
|
|
||||||
var titleTokens = TitleRegex.Matches(nameSpec.StandardEpisodeFormat);
|
var titleTokens = TitleRegex.Matches(nameSpec.StandardEpisodeFormat);
|
||||||
|
|
||||||
|
@ -631,7 +297,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
|
|
||||||
public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
|
public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
|
||||||
{
|
{
|
||||||
if(namingConfig == null)
|
if (namingConfig == null)
|
||||||
{
|
{
|
||||||
namingConfig = _namingConfigService.GetConfig();
|
namingConfig = _namingConfigService.GetConfig();
|
||||||
}
|
}
|
||||||
|
@ -654,6 +320,20 @@ namespace NzbDrone.Core.Organizer
|
||||||
return title;
|
return title;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static string TitleThe(string title)
|
||||||
|
{
|
||||||
|
string[] prefixes = { "The ", "An ", "A " };
|
||||||
|
foreach (string prefix in prefixes)
|
||||||
|
{
|
||||||
|
int prefix_length = prefix.Length;
|
||||||
|
if (prefix.ToLower() == title.Substring(0, prefix_length).ToLower())
|
||||||
|
{
|
||||||
|
title = title.Substring(prefix_length) + ", " + prefix.Trim();
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return title.Trim();
|
||||||
}
|
}
|
||||||
|
|
||||||
public static string CleanFileName(string name, bool replace = true)
|
public static string CleanFileName(string name, bool replace = true)
|
||||||
|
@ -763,7 +443,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
var absoluteEpisodePattern = absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
var absoluteEpisodePattern = absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
||||||
string formatPattern;
|
string formatPattern;
|
||||||
|
|
||||||
switch ((MultiEpisodeStyle) namingConfig.MultiEpisodeStyle)
|
switch ((MultiEpisodeStyle)namingConfig.MultiEpisodeStyle)
|
||||||
{
|
{
|
||||||
|
|
||||||
case MultiEpisodeStyle.Duplicate:
|
case MultiEpisodeStyle.Duplicate:
|
||||||
|
@ -786,14 +466,14 @@ namespace NzbDrone.Core.Organizer
|
||||||
case MultiEpisodeStyle.Range:
|
case MultiEpisodeStyle.Range:
|
||||||
case MultiEpisodeStyle.PrefixedRange:
|
case MultiEpisodeStyle.PrefixedRange:
|
||||||
formatPattern = "-" + absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
formatPattern = "-" + absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
||||||
var eps = new List<Episode> {episodes.First()};
|
var eps = new List<Episode> { episodes.First() };
|
||||||
|
|
||||||
if (episodes.Count > 1) eps.Add(episodes.Last());
|
if (episodes.Count > 1) eps.Add(episodes.Last());
|
||||||
|
|
||||||
absoluteEpisodePattern = FormatAbsoluteNumberTokens(absoluteEpisodePattern, formatPattern, eps);
|
absoluteEpisodePattern = FormatAbsoluteNumberTokens(absoluteEpisodePattern, formatPattern, eps);
|
||||||
break;
|
break;
|
||||||
|
|
||||||
//MultiEpisodeStyle.Extend
|
//MultiEpisodeStyle.Extend
|
||||||
default:
|
default:
|
||||||
formatPattern = "-" + absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
formatPattern = "-" + absoluteEpisodeFormat.AbsoluteEpisodePattern;
|
||||||
absoluteEpisodePattern = FormatAbsoluteNumberTokens(absoluteEpisodePattern, formatPattern, episodes);
|
absoluteEpisodePattern = FormatAbsoluteNumberTokens(absoluteEpisodePattern, formatPattern, episodes);
|
||||||
|
@ -1241,7 +921,7 @@ namespace NzbDrone.Core.Organizer
|
||||||
|
|
||||||
private AbsoluteEpisodeFormat[] GetAbsoluteFormat(string pattern)
|
private AbsoluteEpisodeFormat[] GetAbsoluteFormat(string pattern)
|
||||||
{
|
{
|
||||||
return _absoluteEpisodeFormatCache.Get(pattern, () => AbsoluteEpisodePatternRegex.Matches(pattern).OfType<Match>()
|
return _absoluteEpisodeFormatCache.Get(pattern, () => AbsoluteEpisodePatternRegex.Matches(pattern).OfType<Match>()
|
||||||
.Select(match => new AbsoluteEpisodeFormat
|
.Select(match => new AbsoluteEpisodeFormat
|
||||||
{
|
{
|
||||||
Separator = match.Groups["separator"].Value.IsNotNullOrWhiteSpace() ? match.Groups["separator"].Value : "-",
|
Separator = match.Groups["separator"].Value.IsNotNullOrWhiteSpace() ? match.Groups["separator"].Value : "-",
|
||||||
|
@ -1396,4 +1076,4 @@ namespace NzbDrone.Core.Organizer
|
||||||
Range = 4,
|
Range = 4,
|
||||||
PrefixedRange = 5
|
PrefixedRange = 5
|
||||||
}
|
}
|
||||||
}
|
}
|
|
@ -10,7 +10,7 @@
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="col-sm-2 col-sm-pull-1">
|
<div class="col-sm-2 col-sm-pull-1">
|
||||||
<input type="number" name="rssSyncInterval" class="form-control" min="0" max="1440"/>
|
<input type="number" name="netImportSyncInterval" class="form-control" min="0" max="1440"/>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</fieldset>
|
</fieldset>
|
||||||
|
|
Loading…
Reference in New Issue