shpaq/Prowlarr-Prowlarr
1
0
Fork 0
mirror of https://github.com/Prowlarr/Prowlarr.git synced 2025-09-17 17:14:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed: Backend/Frontend Cleanup

Browse Source
This commit is contained in:
Qstick
2019-06-30 00:58:54 -04:00
parent 286f73f38d
commit d178dce0d3
56 changed files with 519 additions and 925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -35,18 +35,9 @@ namespace NzbDrone.Core.Organizer
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 TagsRegex = new Regex(@"(?<tags>\{tags(?:\: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);
@@ -178,48 +169,6 @@ namespace NzbDrone.Core.Organizer
{
return new BasicNamingConfig(); //For now let's be lazy
//var episodeFormat = GetEpisodeFormat(nameSpec.StandardMovieFormat).LastOrDefault();
//if (episodeFormat == null)
//{
// return new BasicNamingConfig();
//}
//var basicNamingConfig = new BasicNamingConfig
//{
// Separator = episodeFormat.Separator,
// NumberStyle = episodeFormat.SeasonEpisodePattern
//};
//var titleTokens = TitleRegex.Matches(nameSpec.StandardMovieFormat);
//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 GetMovieFolder(Movie movie, NamingConfig namingConfig = null)
@@ -521,18 +470,6 @@ namespace NzbDrone.Core.Organizer
return value.ToString(split[1]);
}
private EpisodeFormat[] GetEpisodeFormat(string pattern)
{
return _episodeFormatCache.Get(pattern, () => SeasonEpisodePatternRegex.Matches(pattern).OfType<Match>()
.Select(match => new EpisodeFormat
{
EpisodeSeparator = match.Groups["episodeSeparator"].Value,
Separator = match.Groups["separator"].Value,
EpisodePattern = match.Groups["episode"].Value,
SeasonEpisodePattern = match.Groups["seasonEpisode"].Value,
}).ToArray());
}
private string GetQualityProper(Movie movie, QualityModel quality)
{
if (quality.Revision.Version > 1)