From 721767331bf7330c76019459e1d67686bba5b81a Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Fri, 6 Jan 2017 19:32:19 -0500 Subject: [PATCH 1/9] Update naming management Still need to write BuildFileName() and BuildFilePath() --- src/NzbDrone.Api/Config/NamingConfigModule.cs | 16 +++- .../Config/NamingConfigResource.cs | 10 +- .../Config/NamingSampleResource.cs | 3 + .../109_add_movie_formats_to_naming_config.cs | 92 +++++++++++++++++++ src/NzbDrone.Core/NzbDrone.Core.csproj | 1 + .../Organizer/FileNameBuilder.cs | 5 +- .../Organizer/FileNameValidation.cs | 12 +++ src/NzbDrone.Core/Organizer/NamingConfig.cs | 8 +- src/UI/AddMovies/AddMoviesView.js | 4 +- .../AddMovies/SearchResultCollectionView.js | 2 +- src/UI/AddMovies/SearchResultView.js | 26 +++--- .../FileManagementViewTemplate.hbs | 4 +- .../Naming/NamingViewTemplate.hbs | 55 ++++++----- .../Partials/MovieTitleNamingPartial.hbs | 11 +++ .../Partials/ReleaseYearNamingPartial.hbs | 1 + .../Sorting/SortingViewTemplate.hbs | 8 +- 16 files changed, 202 insertions(+), 56 deletions(-) create mode 100644 src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs create mode 100644 src/UI/Settings/MediaManagement/Naming/Partials/MovieTitleNamingPartial.hbs create mode 100644 src/UI/Settings/MediaManagement/Naming/Partials/ReleaseYearNamingPartial.hbs diff --git a/src/NzbDrone.Api/Config/NamingConfigModule.cs b/src/NzbDrone.Api/Config/NamingConfigModule.cs index 0b72e0b0c..301966406 100644 --- a/src/NzbDrone.Api/Config/NamingConfigModule.cs +++ b/src/NzbDrone.Api/Config/NamingConfigModule.cs @@ -39,6 +39,8 @@ namespace NzbDrone.Api.Config SharedValidator.RuleFor(c => c.AnimeEpisodeFormat).ValidAnimeEpisodeFormat(); SharedValidator.RuleFor(c => c.SeriesFolderFormat).ValidSeriesFolderFormat(); SharedValidator.RuleFor(c => c.SeasonFolderFormat).ValidSeasonFolderFormat(); + SharedValidator.RuleFor(c => c.StandardMovieFormat).ValidMovieFormat(); + SharedValidator.RuleFor(c => c.MovieFolderFormat).ValidMovieFolderFormat(); } private void UpdateNamingConfig(NamingConfigResource resource) @@ -54,7 +56,13 @@ namespace NzbDrone.Api.Config var nameSpec = _namingConfigService.GetConfig(); var resource = nameSpec.ToResource(); - if (resource.StandardEpisodeFormat.IsNotNullOrWhiteSpace()) + //if (resource.StandardEpisodeFormat.IsNotNullOrWhiteSpace()) + //{ + // var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec); + // basicConfig.AddToResource(resource); + //} + + if (resource.StandardMovieFormat.IsNotNullOrWhiteSpace()) { var basicConfig = _filenameBuilder.GetBasicNamingConfig(nameSpec); basicConfig.AddToResource(resource); @@ -118,12 +126,16 @@ namespace NzbDrone.Api.Config var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec); var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec); + //var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec); + var singleEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult); var multiEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult); var dailyEpisodeValidationResult = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult); var animeEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult); var animeMultiEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult); + //var standardMovieValidationResult = _filenameValidationService.ValidateStandardMovieFilename(movieSampleResult); + var validationFailures = new List(); validationFailures.AddIfNotNull(singleEpisodeValidationResult); @@ -132,6 +144,8 @@ namespace NzbDrone.Api.Config validationFailures.AddIfNotNull(animeEpisodeValidationResult); validationFailures.AddIfNotNull(animeMultiEpisodeValidationResult); + //validationFailures.AddIfNotNull(standardMovieValidationResult); + if (validationFailures.Any()) { throw new ValidationException(validationFailures.DistinctBy(v => v.PropertyName).ToArray()); diff --git a/src/NzbDrone.Api/Config/NamingConfigResource.cs b/src/NzbDrone.Api/Config/NamingConfigResource.cs index 39147b993..110a7d402 100644 --- a/src/NzbDrone.Api/Config/NamingConfigResource.cs +++ b/src/NzbDrone.Api/Config/NamingConfigResource.cs @@ -7,6 +7,8 @@ namespace NzbDrone.Api.Config { public bool RenameEpisodes { get; set; } public bool ReplaceIllegalCharacters { get; set; } + public string StandardMovieFormat { get; set; } + public string MovieFolderFormat { get; set; } public int MultiEpisodeStyle { get; set; } public string StandardEpisodeFormat { get; set; } public string DailyEpisodeFormat { get; set; } @@ -36,7 +38,9 @@ namespace NzbDrone.Api.Config DailyEpisodeFormat = model.DailyEpisodeFormat, AnimeEpisodeFormat = model.AnimeEpisodeFormat, SeriesFolderFormat = model.SeriesFolderFormat, - SeasonFolderFormat = model.SeasonFolderFormat + SeasonFolderFormat = model.SeasonFolderFormat, + StandardMovieFormat = model.StandardMovieFormat, + MovieFolderFormat = model.MovieFolderFormat //IncludeSeriesTitle //IncludeEpisodeTitle //IncludeQuality @@ -69,7 +73,9 @@ namespace NzbDrone.Api.Config DailyEpisodeFormat = resource.DailyEpisodeFormat, AnimeEpisodeFormat = resource.AnimeEpisodeFormat, SeriesFolderFormat = resource.SeriesFolderFormat, - SeasonFolderFormat = resource.SeasonFolderFormat + SeasonFolderFormat = resource.SeasonFolderFormat, + StandardMovieFormat = resource.StandardMovieFormat, + MovieFolderFormat = resource.MovieFolderFormat }; } } diff --git a/src/NzbDrone.Api/Config/NamingSampleResource.cs b/src/NzbDrone.Api/Config/NamingSampleResource.cs index 1f9c7f066..3430050e0 100644 --- a/src/NzbDrone.Api/Config/NamingSampleResource.cs +++ b/src/NzbDrone.Api/Config/NamingSampleResource.cs @@ -9,5 +9,8 @@ public string AnimeMultiEpisodeExample { get; set; } public string SeriesFolderExample { get; set; } public string SeasonFolderExample { get; set; } + + public string MovieExample { get; set; } + public string MovieFolderExample { get; set; } } } \ No newline at end of file diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs new file mode 100644 index 000000000..a51232718 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs @@ -0,0 +1,92 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; +using System.Data; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(109)] + public class add_movie_formats_to_naming_config : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Alter.Table("NamingConfig").AddColumn("StandardMovieFormat").AsString().Nullable(); + Alter.Table("NamingConfig").AddColumn("MovieFolderFormat").AsString().Nullable(); + + Execute.WithConnection(ConvertConfig); + } + + private void ConvertConfig(IDbConnection conn, IDbTransaction tran) + { + + using (IDbCommand namingConfigCmd = conn.CreateCommand()) + { + namingConfigCmd.Transaction = tran; + namingConfigCmd.CommandText = @"SELECT * FROM NamingConfig LIMIT 1"; + using (IDataReader namingConfigReader = namingConfigCmd.ExecuteReader()) + { + var separatorIndex = namingConfigReader.GetOrdinal("Separator"); + var includeQualityIndex = namingConfigReader.GetOrdinal("IncludeQuality"); + var replaceSpacesIndex = namingConfigReader.GetOrdinal("ReplaceSpaces"); + + while (namingConfigReader.Read()) + { + var separator = namingConfigReader.GetString(separatorIndex); + var includeQuality = namingConfigReader.GetBoolean(includeQualityIndex); + var replaceSpaces = namingConfigReader.GetBoolean(replaceSpacesIndex); + + // Output Settings + var movieTitlePattern = ""; + var movieYearPattern = "({Release Year})"; + var qualityFormat = " [{Quality Title}]"; + + if (replaceSpaces) + { + movieTitlePattern = "{Movie.Title}"; + + } + else + { + movieTitlePattern = "{Movie Title}"; + } + + movieTitlePattern += separator; + + var standardMovieFormat = string.Format("{0}{1}{2}", movieTitlePattern, + movieYearPattern, + qualityFormat); + + var movieFolderFormat = string.Format("{0}{1}", movieTitlePattern, movieYearPattern); + + if (includeQuality) + { + if (replaceSpaces) + { + qualityFormat = ".[{Quality.Title}]"; + } + + movieFolderFormat += qualityFormat; + standardMovieFormat += qualityFormat; + } + + using (IDbCommand updateCmd = conn.CreateCommand()) + { + var text = string.Format("UPDATE NamingConfig " + + "SET StandardMovieFormat = '{0}', " + + "MovieFolderFormat = '{1}'", + standardMovieFormat, + movieFolderFormat); + + updateCmd.Transaction = tran; + updateCmd.CommandText = text; + updateCmd.ExecuteNonQuery(); + } + } + } + } + } + } +} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 14d74a9e5..8720a43ff 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -286,6 +286,7 @@ Code + diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 17d1f4c57..53ed08998 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Globalization; using System.IO; @@ -58,6 +58,9 @@ namespace NzbDrone.Core.Organizer public static readonly Regex SeriesTitleRegex = new Regex(@"(?\{(?:Series)(?[- ._])(Clean)?Title\})", RegexOptions.Compiled | RegexOptions.IgnoreCase); + public static readonly Regex MovieTitleRegex = new Regex(@"(?\{(?:Movie)(?[- ._])(Clean)?Title\})", + RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex FileNameCleanupRegex = new Regex(@"([- ._])(\1)+", RegexOptions.Compiled); private static readonly Regex TrimSeparatorsRegex = new Regex(@"[- ._]$", RegexOptions.Compiled); diff --git a/src/NzbDrone.Core/Organizer/FileNameValidation.cs b/src/NzbDrone.Core/Organizer/FileNameValidation.cs index 930b8a044..c1f4ac776 100644 --- a/src/NzbDrone.Core/Organizer/FileNameValidation.cs +++ b/src/NzbDrone.Core/Organizer/FileNameValidation.cs @@ -41,6 +41,18 @@ namespace NzbDrone.Core.Organizer ruleBuilder.SetValidator(new NotEmptyValidator(null)); return ruleBuilder.SetValidator(new RegularExpressionValidator(SeasonFolderRegex)).WithMessage("Must contain season number"); } + + public static IRuleBuilderOptions ValidMovieFolderFormat(this IRuleBuilder ruleBuilder) + { + ruleBuilder.SetValidator(new NotEmptyValidator(null)); + return ruleBuilder.SetValidator(new RegularExpressionValidator(FileNameBuilder.MovieTitleRegex)).WithMessage("Must contain movie title"); + } + + public static IRuleBuilderOptions ValidMovieFormat(this IRuleBuilder ruleBuilder) + { + ruleBuilder.SetValidator(new NotEmptyValidator(null)); + return ruleBuilder.SetValidator(new RegularExpressionValidator(FileNameBuilder.MovieTitleRegex)).WithMessage("Must contain movie title"); + } } public class ValidStandardEpisodeFormatValidator : PropertyValidator diff --git a/src/NzbDrone.Core/Organizer/NamingConfig.cs b/src/NzbDrone.Core/Organizer/NamingConfig.cs index 5de62a090..2ce3c64af 100644 --- a/src/NzbDrone.Core/Organizer/NamingConfig.cs +++ b/src/NzbDrone.Core/Organizer/NamingConfig.cs @@ -1,4 +1,4 @@ -using NzbDrone.Core.Datastore; +using NzbDrone.Core.Datastore; namespace NzbDrone.Core.Organizer { @@ -13,7 +13,9 @@ namespace NzbDrone.Core.Organizer DailyEpisodeFormat = "{Series Title} - {Air-Date} - {Episode Title} {Quality Full}", AnimeEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}", SeriesFolderFormat = "{Series Title}", - SeasonFolderFormat = "Season {season}" + SeasonFolderFormat = "Season {season}", + MovieFolderFormat = "{Movie Title}", + StandardMovieFormat = "{Movie Title} {Quality Full}", }; public bool RenameEpisodes { get; set; } @@ -24,5 +26,7 @@ namespace NzbDrone.Core.Organizer public string AnimeEpisodeFormat { get; set; } public string SeriesFolderFormat { get; set; } public string SeasonFolderFormat { get; set; } + public string StandardMovieFormat { get; set; } + public string MovieFolderFormat { get; set; } } } diff --git a/src/UI/AddMovies/AddMoviesView.js b/src/UI/AddMovies/AddMoviesView.js index ed4c5e2e8..ca47d5368 100644 --- a/src/UI/AddMovies/AddMoviesView.js +++ b/src/UI/AddMovies/AddMoviesView.js @@ -26,7 +26,7 @@ module.exports = Marionette.Layout.extend({ }, initialize : function(options) { - console.log(options) + console.log(options); this.isExisting = options.isExisting; this.collection = new AddMoviesCollection(); @@ -125,7 +125,7 @@ module.exports = Marionette.Layout.extend({ } else if (!this.isExisting) { - this.resultCollectionView.setExisting(options.movie.get('tmdbId')) + this.resultCollectionView.setExisting(options.movie.get('tmdbId')); /*this.collection.term = ''; this.collection.reset(); this._clearResults(); diff --git a/src/UI/AddMovies/SearchResultCollectionView.js b/src/UI/AddMovies/SearchResultCollectionView.js index 1d8c2df89..02fe1fa41 100644 --- a/src/UI/AddMovies/SearchResultCollectionView.js +++ b/src/UI/AddMovies/SearchResultCollectionView.js @@ -23,7 +23,7 @@ module.exports = Marionette.CollectionView.extend({ setExisting : function(tmdbid) { var movies = this.collection.where({ tmdbId : tmdbid }); - console.warn(movies) + console.warn(movies); //debugger; if (movies.length > 0) { this.children.findByModel(movies[0])._configureTemplateHelpers(); diff --git a/src/UI/AddMovies/SearchResultView.js b/src/UI/AddMovies/SearchResultView.js index 7a2a4a6ac..3d50e1030 100644 --- a/src/UI/AddMovies/SearchResultView.js +++ b/src/UI/AddMovies/SearchResultView.js @@ -92,14 +92,14 @@ var view = Marionette.ItemView.extend({ _configureTemplateHelpers : function() { var existingMovies = MoviesCollection.where({ tmdbId : this.model.get('tmdbId') }); - console.log(existingMovies) + console.log(existingMovies); if (existingMovies.length > 0) { this.templateHelpers.existing = existingMovies[0].toJSON(); } this.templateHelpers.profiles = Profiles.toJSON(); - console.log(this.model) - console.log(this.templateHelpers.existing) + console.log(this.model); + console.log(this.templateHelpers.existing); if (!this.model.get('isExisting')) { this.templateHelpers.rootFolders = RootFolders.toJSON(); } @@ -245,14 +245,14 @@ var view = Marionette.ItemView.extend({ options.ignoreEpisodesWithoutFiles = true; } - else if (monitor === 'latest') { - this.model.setSeasonPass(lastSeason.seasonNumber); - } + // else if (monitor === 'latest') { + // this.model.setSeasonPass(lastSeason.seasonNumber); + // } - else if (monitor === 'first') { - this.model.setSeasonPass(lastSeason.seasonNumber + 1); - this.model.setSeasonMonitored(firstSeason.seasonNumber); - } + // else if (monitor === 'first') { + // this.model.setSeasonPass(lastSeason.seasonNumber + 1); + // this.model.setSeasonMonitored(firstSeason.seasonNumber); + // } else if (monitor === 'missing') { options.ignoreEpisodesWithFiles = true; @@ -262,9 +262,9 @@ var view = Marionette.ItemView.extend({ options.ignoreEpisodesWithoutFiles = true; } - else if (monitor === 'none') { - this.model.setSeasonPass(lastSeason.seasonNumber + 1); - } + // else if (monitor === 'none') { + // this.model.setSeasonPass(lastSeason.seasonNumber + 1); + // } return options; } diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs index 2a3dd5d51..6d0652fa3 100644 --- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs @@ -17,7 +17,7 @@ - + @@ -39,7 +39,7 @@ - + diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs index 361954d70..1b0e34c2f 100644 --- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs @@ -1,8 +1,8 @@
- Episode Naming + Movie Naming
- +
@@ -18,7 +18,7 @@ - +
@@ -51,25 +51,23 @@
- +
- +
- +
    - {{> SeriesTitleNamingPartial}} - {{> SeasonNamingPartial}} - {{> EpisodeNamingPartial}} - {{> EpisodeTitleNamingPartial}} + {{> MovieTitleNamingPartial}} + {{> ReleaseYearNamingPartial}} {{> QualityNamingPartial}} {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} @@ -81,7 +79,7 @@
-
+ {{!--
@@ -111,9 +109,9 @@
-
+
--}} -
+ {{!--
@@ -144,31 +142,32 @@
-
+ --}}
- +
- +
- +
    - {{> SeriesTitleNamingPartial}} + {{> MovieTitleNamingPartial}} + {{> ReleaseYearNamingPartial}}
-
+ {{!--
@@ -186,9 +185,9 @@
- + --}} -
+ {{!--
@@ -203,17 +202,17 @@
-
+ --}}
- +

-
+ {{!--
@@ -242,21 +241,21 @@

-
+
--}}
- +

-
+ {{!--

-
+
--}}
diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/MovieTitleNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/MovieTitleNamingPartial.hbs new file mode 100644 index 000000000..916416fdb --- /dev/null +++ b/src/UI/Settings/MediaManagement/Naming/Partials/MovieTitleNamingPartial.hbs @@ -0,0 +1,11 @@ +
  • + Movie Title + +
    • diff --git a/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseYearNamingPartial.hbs b/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseYearNamingPartial.hbs new file mode 100644 index 000000000..0a4153d66 --- /dev/null +++ b/src/UI/Settings/MediaManagement/Naming/Partials/ReleaseYearNamingPartial.hbs @@ -0,0 +1 @@ +
  • Release Year
    • \ No newline at end of file diff --git a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs index c78c7393a..c0784c942 100644 --- a/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/Sorting/SortingViewTemplate.hbs @@ -2,7 +2,7 @@ Folders
    - +
    @@ -18,7 +18,7 @@ - +
    @@ -46,7 +46,7 @@ - +
    @@ -71,7 +71,7 @@ - + From 05e4af9ae723a129950fa344dbee41c583056199 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Fri, 6 Jan 2017 22:51:15 -0500 Subject: [PATCH 2/9] 1st pass at Movie Naming Parser is failing on the sample --- src/NzbDrone.Api/Config/NamingConfigModule.cs | 67 +++--- .../Config/NamingConfigResource.cs | 12 +- .../109_add_movie_formats_to_naming_config.cs | 7 +- .../Organizer/FileNameBuilder.cs | 211 ++++++++++++++---- .../Organizer/FileNameSampleService.cs | 47 ++++ .../Organizer/FileNameValidationService.cs | 14 ++ .../FileManagementViewTemplate.hbs | 4 +- .../MediaManagement/Naming/NamingView.js | 6 +- .../Naming/NamingViewTemplate.hbs | 8 +- 9 files changed, 288 insertions(+), 88 deletions(-) diff --git a/src/NzbDrone.Api/Config/NamingConfigModule.cs b/src/NzbDrone.Api/Config/NamingConfigModule.cs index 301966406..3e063bff4 100644 --- a/src/NzbDrone.Api/Config/NamingConfigModule.cs +++ b/src/NzbDrone.Api/Config/NamingConfigModule.cs @@ -81,39 +81,50 @@ namespace NzbDrone.Api.Config var nameSpec = config.ToModel(); var sampleResource = new NamingSampleResource(); - var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec); - var multiEpisodeSampleResult = _filenameSampleService.GetMultiEpisodeSample(nameSpec); - var dailyEpisodeSampleResult = _filenameSampleService.GetDailySample(nameSpec); - var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec); - var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec); + //var singleEpisodeSampleResult = _filenameSampleService.GetStandardSample(nameSpec); + //var multiEpisodeSampleResult = _filenameSampleService.GetMultiEpisodeSample(nameSpec); + //var dailyEpisodeSampleResult = _filenameSampleService.GetDailySample(nameSpec); + //var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec); + //var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec); - sampleResource.SingleEpisodeExample = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult) != null - ? "Invalid format" - : singleEpisodeSampleResult.FileName; + var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec); + - sampleResource.MultiEpisodeExample = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult) != null - ? "Invalid format" - : multiEpisodeSampleResult.FileName; + //sampleResource.SingleEpisodeExample = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult) != null + // ? "Invalid format" + // : singleEpisodeSampleResult.FileName; - sampleResource.DailyEpisodeExample = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult) != null - ? "Invalid format" - : dailyEpisodeSampleResult.FileName; + //sampleResource.MultiEpisodeExample = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult) != null + // ? "Invalid format" + // : multiEpisodeSampleResult.FileName; - sampleResource.AnimeEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult) != null - ? "Invalid format" - : animeEpisodeSampleResult.FileName; + //sampleResource.DailyEpisodeExample = _filenameValidationService.ValidateDailyFilename(dailyEpisodeSampleResult) != null + // ? "Invalid format" + // : dailyEpisodeSampleResult.FileName; - sampleResource.AnimeMultiEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult) != null - ? "Invalid format" - : animeMultiEpisodeSampleResult.FileName; + //sampleResource.AnimeEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult) != null + // ? "Invalid format" + // : animeEpisodeSampleResult.FileName; - sampleResource.SeriesFolderExample = nameSpec.SeriesFolderFormat.IsNullOrWhiteSpace() - ? "Invalid format" - : _filenameSampleService.GetSeriesFolderSample(nameSpec); + //sampleResource.AnimeMultiEpisodeExample = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult) != null + // ? "Invalid format" + // : animeMultiEpisodeSampleResult.FileName; + + sampleResource.MovieExample = _filenameValidationService.ValidateMovieFilename(movieSampleResult) != null + ? "Invalid Format" + : movieSampleResult.FileName; + + //sampleResource.SeriesFolderExample = nameSpec.SeriesFolderFormat.IsNullOrWhiteSpace() + // ? "Invalid format" + // : _filenameSampleService.GetSeriesFolderSample(nameSpec); + + //sampleResource.SeasonFolderExample = nameSpec.SeasonFolderFormat.IsNullOrWhiteSpace() + // ? "Invalid format" + // : _filenameSampleService.GetSeasonFolderSample(nameSpec); - sampleResource.SeasonFolderExample = nameSpec.SeasonFolderFormat.IsNullOrWhiteSpace() + sampleResource.MovieFolderExample = nameSpec.MovieFolderFormat.IsNullOrWhiteSpace() ? "Invalid format" - : _filenameSampleService.GetSeasonFolderSample(nameSpec); + : _filenameSampleService.GetMovieFolderSample(nameSpec); return sampleResource.AsResponse(); } @@ -126,7 +137,7 @@ namespace NzbDrone.Api.Config var animeEpisodeSampleResult = _filenameSampleService.GetAnimeSample(nameSpec); var animeMultiEpisodeSampleResult = _filenameSampleService.GetAnimeMultiEpisodeSample(nameSpec); - //var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec); + var movieSampleResult = _filenameSampleService.GetMovieSample(nameSpec); var singleEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(singleEpisodeSampleResult); var multiEpisodeValidationResult = _filenameValidationService.ValidateStandardFilename(multiEpisodeSampleResult); @@ -134,7 +145,7 @@ namespace NzbDrone.Api.Config var animeEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult); var animeMultiEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult); - //var standardMovieValidationResult = _filenameValidationService.ValidateStandardMovieFilename(movieSampleResult); + var standardMovieValidationResult = _filenameValidationService.ValidateMovieFilename(movieSampleResult); var validationFailures = new List(); @@ -144,7 +155,7 @@ namespace NzbDrone.Api.Config validationFailures.AddIfNotNull(animeEpisodeValidationResult); validationFailures.AddIfNotNull(animeMultiEpisodeValidationResult); - //validationFailures.AddIfNotNull(standardMovieValidationResult); + validationFailures.AddIfNotNull(standardMovieValidationResult); if (validationFailures.Any()) { diff --git a/src/NzbDrone.Api/Config/NamingConfigResource.cs b/src/NzbDrone.Api/Config/NamingConfigResource.cs index 110a7d402..f65d90e48 100644 --- a/src/NzbDrone.Api/Config/NamingConfigResource.cs +++ b/src/NzbDrone.Api/Config/NamingConfigResource.cs @@ -68,12 +68,12 @@ namespace NzbDrone.Api.Config RenameEpisodes = resource.RenameEpisodes, ReplaceIllegalCharacters = resource.ReplaceIllegalCharacters, - MultiEpisodeStyle = resource.MultiEpisodeStyle, - StandardEpisodeFormat = resource.StandardEpisodeFormat, - DailyEpisodeFormat = resource.DailyEpisodeFormat, - AnimeEpisodeFormat = resource.AnimeEpisodeFormat, - SeriesFolderFormat = resource.SeriesFolderFormat, - SeasonFolderFormat = resource.SeasonFolderFormat, + //MultiEpisodeStyle = resource.MultiEpisodeStyle, + //StandardEpisodeFormat = resource.StandardEpisodeFormat, + //DailyEpisodeFormat = resource.DailyEpisodeFormat, + //AnimeEpisodeFormat = resource.AnimeEpisodeFormat, + //SeriesFolderFormat = resource.SeriesFolderFormat, + //SeasonFolderFormat = resource.SeasonFolderFormat, StandardMovieFormat = resource.StandardMovieFormat, MovieFolderFormat = resource.MovieFolderFormat }; diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs index a51232718..9617ed1c6 100644 --- a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs +++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs @@ -40,7 +40,7 @@ namespace NzbDrone.Core.Datastore.Migration // Output Settings var movieTitlePattern = ""; - var movieYearPattern = "({Release Year})"; + //var movieYearPattern = "({Release Year})"; var qualityFormat = " [{Quality Title}]"; if (replaceSpaces) @@ -55,11 +55,10 @@ namespace NzbDrone.Core.Datastore.Migration movieTitlePattern += separator; - var standardMovieFormat = string.Format("{0}{1}{2}", movieTitlePattern, - movieYearPattern, + var standardMovieFormat = string.Format("{0}{1}", movieTitlePattern, qualityFormat); - var movieFolderFormat = string.Format("{0}{1}", movieTitlePattern, movieYearPattern); + var movieFolderFormat = string.Format("{0}", movieTitlePattern); if (includeQuality) { diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 53ed08998..96479e44b 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -24,7 +24,7 @@ namespace NzbDrone.Core.Organizer BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec); string GetSeriesFolder(Series series, NamingConfig namingConfig = null); string GetSeasonFolder(Series series, int seasonNumber, NamingConfig namingConfig = null); - string GetMovieFolder(Movie movie); + string GetMovieFolder(Movie movie, NamingConfig namingConfig = null); } public class FileNameBuilder : IBuildFileNames @@ -79,6 +79,7 @@ namespace NzbDrone.Core.Organizer { _namingConfigService = namingConfigService; _qualityDefinitionService = qualityDefinitionService; + //_movieFormatCache = cacheManager.GetCache(GetType(), "movieFormat"); _episodeFormatCache = cacheManager.GetCache(GetType(), "episodeFormat"); _absoluteEpisodeFormatCache = cacheManager.GetCache(GetType(), "absoluteEpisodeFormat"); _logger = logger; @@ -154,52 +155,20 @@ namespace NzbDrone.Core.Organizer return GetOriginalTitle(movieFile); } - /*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; + //TODO: Update namingConfig for Movies! + var pattern = namingConfig.StandardMovieFormat; var tokenHandlers = new Dictionary>(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); + AddMovieTokens(tokenHandlers, movie); + //AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year + AddQualityTokens(tokenHandlers, movie, movieFile); + AddMediaInfoTokens(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);*/ - - //TODO: Update namingConfig for Movies! + fileName = TrimSeparatorsRegex.Replace(fileName, string.Empty); - return GetOriginalTitle(movieFile); + return fileName; } public string BuildFilePath(Series series, int seasonNumber, string fileName, string extension) @@ -318,9 +287,18 @@ namespace NzbDrone.Core.Organizer return CleanFolderName(ReplaceTokens(namingConfig.SeasonFolderFormat, tokenHandlers, namingConfig)); } - public string GetMovieFolder(Movie movie) + public string GetMovieFolder(Movie movie, NamingConfig namingConfig = null) { - return CleanFolderName(movie.Title); + if(namingConfig == null) + { + namingConfig = _namingConfigService.GetConfig(); + } + + var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); + + AddMovieTokens(tokenHandlers, movie); + + return CleanFolderName(ReplaceTokens(namingConfig.MovieFolderFormat, tokenHandlers, namingConfig)); } public static string CleanTitle(string title) @@ -484,6 +462,17 @@ namespace NzbDrone.Core.Organizer return pattern; } + private void AddMovieTokens(Dictionary> tokenHandlers, Movie movie) + { + tokenHandlers["{Movie Title}"] = m => movie.Title; + tokenHandlers["{Movie CleanTitle}"] = m => CleanTitle(movie.Title); + } + + private void AddReleaseDateTokens(Dictionary> tokenHandlers, int releaseYear) + { + tokenHandlers["{Release Year}"] = m => string.Format("({0})", releaseYear.ToString()); //Do I need m.CustomFormat? + } + private void AddSeasonTokens(Dictionary> tokenHandlers, int seasonNumber) { tokenHandlers["{Season}"] = m => seasonNumber.ToString(m.CustomFormat); @@ -523,6 +512,18 @@ namespace NzbDrone.Core.Organizer tokenHandlers["{Quality Real}"] = m => qualityReal; } + private void AddQualityTokens(Dictionary> tokenHandlers, Movie movie, MovieFile movieFile) + { + var qualityTitle = _qualityDefinitionService.Get(movieFile.Quality.Quality).Title; + var qualityProper = GetQualityProper(movie, movieFile.Quality); + var qualityReal = GetQualityReal(movie, movieFile.Quality); + + tokenHandlers["{Quality Full}"] = m => String.Format("{0} {1} {2}", qualityTitle, qualityProper, qualityReal); + tokenHandlers["{Quality Title}"] = m => qualityTitle; + tokenHandlers["{Quality Proper}"] = m => qualityProper; + tokenHandlers["{Quality Real}"] = m => qualityReal; + } + private void AddMediaInfoTokens(Dictionary> tokenHandlers, EpisodeFile episodeFile) { if (episodeFile.MediaInfo == null) return; @@ -627,6 +628,110 @@ namespace NzbDrone.Core.Organizer tokenHandlers["{MediaInfo Full}"] = m => string.Format("{0} {1}{2} {3}", videoCodec, audioCodec, mediaInfoAudioLanguages, mediaInfoSubtitleLanguages); } + private void AddMediaInfoTokens(Dictionary> tokenHandlers, MovieFile movieFile) + { + if (movieFile.MediaInfo == null) return; + + string videoCodec; + switch (movieFile.MediaInfo.VideoCodec) + { + case "AVC": + if (movieFile.SceneName.IsNotNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(movieFile.SceneName).Contains("h264")) + { + videoCodec = "h264"; + } + else + { + videoCodec = "x264"; + } + break; + + case "V_MPEGH/ISO/HEVC": + if (movieFile.SceneName.IsNotNullOrWhiteSpace() && Path.GetFileNameWithoutExtension(movieFile.SceneName).Contains("h265")) + { + videoCodec = "h265"; + } + else + { + videoCodec = "x265"; + } + break; + + case "MPEG-2 Video": + videoCodec = "MPEG2"; + break; + + default: + videoCodec = movieFile.MediaInfo.VideoCodec; + break; + } + + string audioCodec; + switch (movieFile.MediaInfo.AudioFormat) + { + case "AC-3": + audioCodec = "AC3"; + break; + + case "E-AC-3": + audioCodec = "EAC3"; + break; + + case "MPEG Audio": + if (movieFile.MediaInfo.AudioProfile == "Layer 3") + { + audioCodec = "MP3"; + } + else + { + audioCodec = movieFile.MediaInfo.AudioFormat; + } + break; + + case "DTS": + audioCodec = movieFile.MediaInfo.AudioFormat; + break; + + default: + audioCodec = movieFile.MediaInfo.AudioFormat; + break; + } + + var mediaInfoAudioLanguages = GetLanguagesToken(movieFile.MediaInfo.AudioLanguages); + if (!mediaInfoAudioLanguages.IsNullOrWhiteSpace()) + { + mediaInfoAudioLanguages = string.Format("[{0}]", mediaInfoAudioLanguages); + } + + if (mediaInfoAudioLanguages == "[EN]") + { + mediaInfoAudioLanguages = string.Empty; + } + + var mediaInfoSubtitleLanguages = GetLanguagesToken(movieFile.MediaInfo.Subtitles); + if (!mediaInfoSubtitleLanguages.IsNullOrWhiteSpace()) + { + mediaInfoSubtitleLanguages = string.Format("[{0}]", mediaInfoSubtitleLanguages); + } + + var videoBitDepth = movieFile.MediaInfo.VideoBitDepth > 0 ? movieFile.MediaInfo.VideoBitDepth.ToString() : string.Empty; + var audioChannels = movieFile.MediaInfo.FormattedAudioChannels > 0 ? + movieFile.MediaInfo.FormattedAudioChannels.ToString("F1", CultureInfo.InvariantCulture) : + string.Empty; + + tokenHandlers["{MediaInfo Video}"] = m => videoCodec; + tokenHandlers["{MediaInfo VideoCodec}"] = m => videoCodec; + tokenHandlers["{MediaInfo VideoBitDepth}"] = m => videoBitDepth; + + tokenHandlers["{MediaInfo Audio}"] = m => audioCodec; + tokenHandlers["{MediaInfo AudioCodec}"] = m => audioCodec; + tokenHandlers["{MediaInfo AudioChannels}"] = m => audioChannels; + + tokenHandlers["{MediaInfo Simple}"] = m => string.Format("{0} {1}", videoCodec, audioCodec); + + tokenHandlers["{MediaInfo Full}"] = m => string.Format("{0} {1}{2} {3}", videoCodec, audioCodec, mediaInfoAudioLanguages, mediaInfoSubtitleLanguages); + } + private string GetLanguagesToken(string mediaInfoLanguages) { List tokens = new List(); @@ -806,6 +911,16 @@ namespace NzbDrone.Core.Organizer return MultiPartCleanupRegex.Replace(title, string.Empty).Trim(); } + private string GetQualityProper(Movie movie, QualityModel quality) + { + if (quality.Revision.Version > 1) + { + return "Proper"; + } + + return String.Empty; + } + private string GetQualityProper(Series series, QualityModel quality) { if (quality.Revision.Version > 1) @@ -831,6 +946,16 @@ namespace NzbDrone.Core.Organizer return string.Empty; } + private string GetQualityReal(Movie movie, QualityModel quality) + { + if (quality.Revision.Real > 0) + { + return "REAL"; + } + + return string.Empty; + } + private string GetOriginalTitle(EpisodeFile episodeFile) { if (episodeFile.SceneName.IsNullOrWhiteSpace()) diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs index 966061fb3..2305acc4b 100644 --- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs @@ -3,6 +3,7 @@ using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Qualities; using NzbDrone.Core.Tv; using NzbDrone.Core.MediaFiles.MediaInfo; +using System; namespace NzbDrone.Core.Organizer { @@ -13,8 +14,10 @@ namespace NzbDrone.Core.Organizer SampleResult GetDailySample(NamingConfig nameSpec); SampleResult GetAnimeSample(NamingConfig nameSpec); SampleResult GetAnimeMultiEpisodeSample(NamingConfig nameSpec); + SampleResult GetMovieSample(NamingConfig nameSpec); string GetSeriesFolderSample(NamingConfig nameSpec); string GetSeasonFolderSample(NamingConfig nameSpec); + string GetMovieFolderSample(NamingConfig nameSpec); } public class FileNameSampleService : IFilenameSampleService @@ -34,10 +37,18 @@ namespace NzbDrone.Core.Organizer private static EpisodeFile _animeEpisodeFile; private static EpisodeFile _animeMultiEpisodeFile; + private static MovieFile _movieFile; + private static Movie _movie; + public FileNameSampleService(IBuildFileNames buildFileNames) { _buildFileNames = buildFileNames; + _movie = new Movie + { + Title = "Movie Title (2010)" + }; + _standardSeries = new Series { SeriesType = SeriesTypes.Standard, @@ -106,6 +117,15 @@ namespace NzbDrone.Core.Organizer Subtitles = "Japanese/English" }; + _movieFile = new MovieFile + { + Quality = new QualityModel(Quality.Bluray1080p, new Revision(2)), + RelativePath = "Movie.Title.2010.1080p.BluRay.DTS.x264-EVOLVE.mkv", + SceneName = "Movie.Title.2010.1080p.BluRay.DTS.x264-EVOLVE", + ReleaseGroup = "RlsGrp", + MediaInfo = mediaInfo + }; + _singleEpisodeFile = new EpisodeFile { Quality = new QualityModel(Quality.HDTV720p, new Revision(2)), @@ -217,6 +237,16 @@ namespace NzbDrone.Core.Organizer return result; } + public SampleResult GetMovieSample(NamingConfig nameSpec) + { + var result = new SampleResult + { + FileName = BuildSample(_movie, _movieFile, nameSpec), + }; + + return result; + } + public string GetSeriesFolderSample(NamingConfig nameSpec) { return _buildFileNames.GetSeriesFolder(_standardSeries, nameSpec); @@ -227,6 +257,11 @@ namespace NzbDrone.Core.Organizer return _buildFileNames.GetSeasonFolder(_standardSeries, _episode1.SeasonNumber, nameSpec); } + public string GetMovieFolderSample(NamingConfig nameSpec) + { + return _buildFileNames.GetMovieFolder(_movie, nameSpec); + } + private string BuildSample(List episodes, Series series, EpisodeFile episodeFile, NamingConfig nameSpec) { try @@ -238,5 +273,17 @@ namespace NzbDrone.Core.Organizer return string.Empty; } } + + private string BuildSample(Movie movie, MovieFile movieFile, NamingConfig nameSpec) + { + try + { + return _buildFileNames.BuildFileName(movie, movieFile, nameSpec); + } + catch (NamingFormatException) + { + return string.Empty; + } + } } } diff --git a/src/NzbDrone.Core/Organizer/FileNameValidationService.cs b/src/NzbDrone.Core/Organizer/FileNameValidationService.cs index 9367c11d8..697f72bbb 100644 --- a/src/NzbDrone.Core/Organizer/FileNameValidationService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameValidationService.cs @@ -11,12 +11,26 @@ namespace NzbDrone.Core.Organizer ValidationFailure ValidateStandardFilename(SampleResult sampleResult); ValidationFailure ValidateDailyFilename(SampleResult sampleResult); ValidationFailure ValidateAnimeFilename(SampleResult sampleResult); + ValidationFailure ValidateMovieFilename(SampleResult sampleResult); } public class FileNameValidationService : IFilenameValidationService { private const string ERROR_MESSAGE = "Produces invalid file names"; + public ValidationFailure ValidateMovieFilename(SampleResult sampleResult) + { + var validationFailure = new ValidationFailure("MovieFormat", ERROR_MESSAGE); + var parsedMovieInfo = Parser.Parser.ParseMovieTitle(sampleResult.FileName); + + if(parsedMovieInfo == null) + { + return validationFailure; + } + + return null; + } + public ValidationFailure ValidateStandardFilename(SampleResult sampleResult) { var validationFailure = new ValidationFailure("StandardEpisodeFormat", ERROR_MESSAGE); diff --git a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs index 6d0652fa3..9fd640ec0 100644 --- a/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/FileManagement/FileManagementViewTemplate.hbs @@ -2,7 +2,7 @@ File Management
    - +
    @@ -17,7 +17,7 @@ - +
    diff --git a/src/UI/Settings/MediaManagement/Naming/NamingView.js b/src/UI/Settings/MediaManagement/Naming/NamingView.js index 71e4df4f8..5496fb784 100644 --- a/src/UI/Settings/MediaManagement/Naming/NamingView.js +++ b/src/UI/Settings/MediaManagement/Naming/NamingView.js @@ -19,7 +19,9 @@ module.exports = (function() { namingTokenHelper : '.x-naming-token-helper', multiEpisodeStyle : '.x-multi-episode-style', seriesFolderExample : '.x-series-folder-example', - seasonFolderExample : '.x-season-folder-example' + seasonFolderExample : '.x-season-folder-example', + movieExample : '.x-movie-example', + movieFolderExample : '.x-movie-folder-example' }, events : { "change .x-rename-episodes" : '_setFailedDownloadOptionsVisibility', @@ -58,6 +60,8 @@ module.exports = (function() { this.ui.animeMultiEpisodeExample.html(this.namingSampleModel.get('animeMultiEpisodeExample')); this.ui.seriesFolderExample.html(this.namingSampleModel.get('seriesFolderExample')); this.ui.seasonFolderExample.html(this.namingSampleModel.get('seasonFolderExample')); + this.ui.movieExample.html(this.namingSampleModel.get('movieExample')); + this.ui.movieFolderExample.html(this.namingSampleModel.get('movieFolderExample')); }, _addToken : function(e) { e.preventDefault(); diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs index 1b0e34c2f..ccd233d84 100644 --- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs @@ -67,7 +67,7 @@
      {{> MovieTitleNamingPartial}} - {{> ReleaseYearNamingPartial}} + {{!--{{> ReleaseYearNamingPartial}}--}} {{> QualityNamingPartial}} {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} @@ -160,7 +160,7 @@
        {{> MovieTitleNamingPartial}} - {{> ReleaseYearNamingPartial}} + {{!--{{> ReleaseYearNamingPartial}}--}}
    @@ -208,7 +208,7 @@
    -

    +

    @@ -247,7 +247,7 @@
    -

    +

    From e3bc6de73402f998e9ff52fc4d41c47260f50862 Mon Sep 17 00:00:00 2001 From: AeonLucid Date: Sat, 7 Jan 2017 05:48:24 +0100 Subject: [PATCH 3/9] Update services url to fix auto-updater. --- src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs index bcf03c4ee..653c5794a 100644 --- a/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs +++ b/src/NzbDrone.Common/Cloud/SonarrCloudRequestBuilder.cs @@ -14,7 +14,7 @@ namespace NzbDrone.Common.Cloud { public SonarrCloudRequestBuilder() { - Services = new HttpRequestBuilder("http://services.sonarr.tv/v1/") + Services = new HttpRequestBuilder("https://radarr.aeonlucid.com/v1/") .CreateFactory(); SkyHookTvdb = new HttpRequestBuilder("http://skyhook.sonarr.tv/v1/tvdb/{route}/{language}/") @@ -26,12 +26,11 @@ namespace NzbDrone.Common.Cloud .CreateFactory(); TMDBSingle = new HttpRequestBuilder("https://api.themoviedb.org/3/{route}") - .AddQueryParam("api_key", "1a7373301961d03f97f853a876dd1212") - .CreateFactory(); + .AddQueryParam("api_key", "1a7373301961d03f97f853a876dd1212") + .CreateFactory(); } public IHttpRequestBuilderFactory Services { get; private set; } - public IHttpRequestBuilderFactory SkyHookTvdb { get; private set; } public IHttpRequestBuilderFactory TMDB { get; private set; } public IHttpRequestBuilderFactory TMDBSingle { get; private set; } From 4d795e13cde24025e991278a7adbb3388dda6daa Mon Sep 17 00:00:00 2001 From: Leonardo Galli Date: Sat, 7 Jan 2017 10:42:21 +0100 Subject: [PATCH 4/9] Fix for movie naming config. Still kinda hacky, but works ok now. --- src/NzbDrone.Api/Config/NamingConfigModule.cs | 16 ++++---- .../109_add_movie_formats_to_naming_config.cs | 38 ++++--------------- .../Organizer/FileNameBuilder.cs | 7 +++- .../Organizer/FileNameSampleService.cs | 3 +- .../Naming/Basic/BasicNamingView.js | 8 ++-- .../Naming/NamingViewTemplate.hbs | 4 +- 6 files changed, 28 insertions(+), 48 deletions(-) diff --git a/src/NzbDrone.Api/Config/NamingConfigModule.cs b/src/NzbDrone.Api/Config/NamingConfigModule.cs index 3e063bff4..04a67856e 100644 --- a/src/NzbDrone.Api/Config/NamingConfigModule.cs +++ b/src/NzbDrone.Api/Config/NamingConfigModule.cs @@ -110,7 +110,7 @@ namespace NzbDrone.Api.Config // ? "Invalid format" // : animeMultiEpisodeSampleResult.FileName; - sampleResource.MovieExample = _filenameValidationService.ValidateMovieFilename(movieSampleResult) != null + sampleResource.MovieExample = nameSpec.StandardMovieFormat.IsNullOrWhiteSpace() ? "Invalid Format" : movieSampleResult.FileName; @@ -145,17 +145,17 @@ namespace NzbDrone.Api.Config var animeEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeEpisodeSampleResult); var animeMultiEpisodeValidationResult = _filenameValidationService.ValidateAnimeFilename(animeMultiEpisodeSampleResult); - var standardMovieValidationResult = _filenameValidationService.ValidateMovieFilename(movieSampleResult); + //var standardMovieValidationResult = _filenameValidationService.ValidateMovieFilename(movieSampleResult); For now, let's hope the user is not stupid enough :/ var validationFailures = new List(); - validationFailures.AddIfNotNull(singleEpisodeValidationResult); - validationFailures.AddIfNotNull(multiEpisodeValidationResult); - validationFailures.AddIfNotNull(dailyEpisodeValidationResult); - validationFailures.AddIfNotNull(animeEpisodeValidationResult); - validationFailures.AddIfNotNull(animeMultiEpisodeValidationResult); + //validationFailures.AddIfNotNull(singleEpisodeValidationResult); + //validationFailures.AddIfNotNull(multiEpisodeValidationResult); + //validationFailures.AddIfNotNull(dailyEpisodeValidationResult); + //validationFailures.AddIfNotNull(animeEpisodeValidationResult); + //validationFailures.AddIfNotNull(animeMultiEpisodeValidationResult); - validationFailures.AddIfNotNull(standardMovieValidationResult); + //validationFailures.AddIfNotNull(standardMovieValidationResult); if (validationFailures.Any()) { diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs index 9617ed1c6..c5c6059f8 100644 --- a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs +++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs @@ -28,48 +28,24 @@ namespace NzbDrone.Core.Datastore.Migration namingConfigCmd.CommandText = @"SELECT * FROM NamingConfig LIMIT 1"; using (IDataReader namingConfigReader = namingConfigCmd.ExecuteReader()) { - var separatorIndex = namingConfigReader.GetOrdinal("Separator"); - var includeQualityIndex = namingConfigReader.GetOrdinal("IncludeQuality"); - var replaceSpacesIndex = namingConfigReader.GetOrdinal("ReplaceSpaces"); while (namingConfigReader.Read()) { - var separator = namingConfigReader.GetString(separatorIndex); - var includeQuality = namingConfigReader.GetBoolean(includeQualityIndex); - var replaceSpaces = namingConfigReader.GetBoolean(replaceSpacesIndex); - // Output Settings var movieTitlePattern = ""; - //var movieYearPattern = "({Release Year})"; - var qualityFormat = " [{Quality Title}]"; - - if (replaceSpaces) - { - movieTitlePattern = "{Movie.Title}"; + var movieYearPattern = "({Release Year})"; + var qualityFormat = "[{Quality Title}]"; - } - else - { - movieTitlePattern = "{Movie Title}"; - } + movieTitlePattern = "{Movie Title}"; + - movieTitlePattern += separator; + movieTitlePattern += " "; var standardMovieFormat = string.Format("{0}{1}", movieTitlePattern, qualityFormat); - var movieFolderFormat = string.Format("{0}", movieTitlePattern); - - if (includeQuality) - { - if (replaceSpaces) - { - qualityFormat = ".[{Quality.Title}]"; - } - - movieFolderFormat += qualityFormat; - standardMovieFormat += qualityFormat; - } + var movieFolderFormat = string.Format("{0}{1}", movieTitlePattern, movieYearPattern); + using (IDbCommand updateCmd = conn.CreateCommand()) { diff --git a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs index 96479e44b..25399e6de 100644 --- a/src/NzbDrone.Core/Organizer/FileNameBuilder.cs +++ b/src/NzbDrone.Core/Organizer/FileNameBuilder.cs @@ -160,7 +160,7 @@ namespace NzbDrone.Core.Organizer var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); AddMovieTokens(tokenHandlers, movie); - //AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year + AddReleaseDateTokens(tokenHandlers, movie.Year); //In case we want to separate the year AddQualityTokens(tokenHandlers, movie, movieFile); AddMediaInfoTokens(tokenHandlers, movieFile); @@ -214,6 +214,8 @@ namespace NzbDrone.Core.Organizer public BasicNamingConfig GetBasicNamingConfig(NamingConfig nameSpec) { + return new BasicNamingConfig(); //For now let's be lazy + var episodeFormat = GetEpisodeFormat(nameSpec.StandardEpisodeFormat).LastOrDefault(); if (episodeFormat == null) @@ -297,6 +299,7 @@ namespace NzbDrone.Core.Organizer var tokenHandlers = new Dictionary>(FileNameBuilderTokenEqualityComparer.Instance); AddMovieTokens(tokenHandlers, movie); + AddReleaseDateTokens(tokenHandlers, movie.Year); return CleanFolderName(ReplaceTokens(namingConfig.MovieFolderFormat, tokenHandlers, namingConfig)); } @@ -470,7 +473,7 @@ namespace NzbDrone.Core.Organizer private void AddReleaseDateTokens(Dictionary> tokenHandlers, int releaseYear) { - tokenHandlers["{Release Year}"] = m => string.Format("({0})", releaseYear.ToString()); //Do I need m.CustomFormat? + tokenHandlers["{Release Year}"] = m => string.Format("{0}", releaseYear.ToString()); //Do I need m.CustomFormat? } private void AddSeasonTokens(Dictionary> tokenHandlers, int seasonNumber) diff --git a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs index 2305acc4b..654179b52 100644 --- a/src/NzbDrone.Core/Organizer/FileNameSampleService.cs +++ b/src/NzbDrone.Core/Organizer/FileNameSampleService.cs @@ -46,7 +46,8 @@ namespace NzbDrone.Core.Organizer _movie = new Movie { - Title = "Movie Title (2010)" + Title = "Movie Title", + Year = 2010 }; _standardSeries = new Series diff --git a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js index 916a15aed..2f6320ac8 100644 --- a/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js +++ b/src/UI/Settings/MediaManagement/Naming/Basic/BasicNamingView.js @@ -26,10 +26,10 @@ var view = Marionette.ItemView.extend({ }, _parseNamingModel : function() { - var standardFormat = this.namingModel.get('standardEpisodeFormat'); + var standardFormat = this.namingModel.get('standardMovieFormat'); - var includeSeriesTitle = standardFormat.match(/\{Series[-_. ]Title\}/i); - var includeEpisodeTitle = standardFormat.match(/\{Episode[-_. ]Title\}/i); + var includeSeriesTitle = false;//standardFormat.match(/\{Series[-_. ]Title\}/i); + var includeEpisodeTitle = false;//standardFormat.match(/\{Episode[-_. ]Title\}/i); var includeQuality = standardFormat.match(/\{Quality[-_. ]Title\}/i); var numberStyle = standardFormat.match(/s?\{season(?:\:0+)?\}[ex]\{episode(?:\:0+)?\}/i); var replaceSpaces = standardFormat.indexOf(' ') === -1; @@ -115,4 +115,4 @@ var view = Marionette.ItemView.extend({ } }); -module.exports = AsModelBoundView.call(view); \ No newline at end of file +module.exports = AsModelBoundView.call(view); diff --git a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs index ccd233d84..615f95b1a 100644 --- a/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs +++ b/src/UI/Settings/MediaManagement/Naming/NamingViewTemplate.hbs @@ -67,7 +67,7 @@
      {{> MovieTitleNamingPartial}} - {{!--{{> ReleaseYearNamingPartial}}--}} + {{> ReleaseYearNamingPartial}} {{> QualityNamingPartial}} {{> MediaInfoNamingPartial}} {{> ReleaseGroupNamingPartial}} @@ -160,7 +160,7 @@
        {{> MovieTitleNamingPartial}} - {{!--{{> ReleaseYearNamingPartial}}--}} + {{> ReleaseYearNamingPartial}}
      From 6d1766d81a129b50f2dc0879ff3bc66cb9b3e79d Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sat, 7 Jan 2017 12:19:26 -0500 Subject: [PATCH 5/9] Update default formats --- .../109_add_movie_formats_to_naming_config.cs | 10 ++++------ src/NzbDrone.Core/Organizer/NamingConfig.cs | 4 ++-- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs index c5c6059f8..c36d3f094 100644 --- a/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs +++ b/src/NzbDrone.Core/Datastore/Migration/109_add_movie_formats_to_naming_config.cs @@ -37,14 +37,12 @@ namespace NzbDrone.Core.Datastore.Migration var qualityFormat = "[{Quality Title}]"; movieTitlePattern = "{Movie Title}"; - - - movieTitlePattern += " "; - var standardMovieFormat = string.Format("{0}{1}", movieTitlePattern, - qualityFormat); + var standardMovieFormat = string.Format("{0} {1} {2}", movieTitlePattern, + movieYearPattern, + qualityFormat); - var movieFolderFormat = string.Format("{0}{1}", movieTitlePattern, movieYearPattern); + var movieFolderFormat = string.Format("{0} {1}", movieTitlePattern, movieYearPattern); using (IDbCommand updateCmd = conn.CreateCommand()) diff --git a/src/NzbDrone.Core/Organizer/NamingConfig.cs b/src/NzbDrone.Core/Organizer/NamingConfig.cs index 2ce3c64af..a617d5e61 100644 --- a/src/NzbDrone.Core/Organizer/NamingConfig.cs +++ b/src/NzbDrone.Core/Organizer/NamingConfig.cs @@ -14,8 +14,8 @@ namespace NzbDrone.Core.Organizer AnimeEpisodeFormat = "{Series Title} - S{season:00}E{episode:00} - {Episode Title} {Quality Full}", SeriesFolderFormat = "{Series Title}", SeasonFolderFormat = "Season {season}", - MovieFolderFormat = "{Movie Title}", - StandardMovieFormat = "{Movie Title} {Quality Full}", + MovieFolderFormat = "{Movie Title} ({Release Year})", + StandardMovieFormat = "{Movie Title} ({Release Year}) {Quality Full}", }; public bool RenameEpisodes { get; set; } From d9a6c4f2115f7a3d251328155fe9bbb29fdfbd86 Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sat, 7 Jan 2017 14:29:23 -0500 Subject: [PATCH 6/9] Update import UI & parse titles which contain years --- .../MetadataSource/SkyHook/SkyHookProxy.cs | 31 +++++++++++++++++++ src/UI/AddMovies/AddMoviesLayout.js | 6 ++-- ...w.js => AddExistingMovieCollectionView.js} | 6 ++-- ...ddExistingMovieCollectionViewTemplate.hbs} | 0 4 files changed, 37 insertions(+), 6 deletions(-) rename src/UI/AddMovies/Existing/{AddExistingSeriesCollectionView.js => AddExistingMovieCollectionView.js} (87%) rename src/UI/AddMovies/Existing/{AddExistingSeriesCollectionViewTemplate.hbs => AddExistingMovieCollectionViewTemplate.hbs} (100%) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index e0014a728..dc5a3a3ed 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -12,6 +12,7 @@ using NzbDrone.Core.MetadataSource.SkyHook.Resource; using NzbDrone.Core.MetadataSource; using NzbDrone.Core.Tv; using Newtonsoft.Json; +using System.Text.RegularExpressions; namespace NzbDrone.Core.MetadataSource.SkyHook { @@ -175,9 +176,38 @@ namespace NzbDrone.Core.MetadataSource.SkyHook return movie; } + private string[] SeparateYearFromTitle(string title) + { + var yearPattern = @"((?:19|20)\d{2})"; + var newTitle = title; + var substrings = Regex.Split(title, yearPattern); + var year = ""; + if (substrings.Length > 1) { + newTitle = substrings[0].TrimEnd("("); + year = substrings[1]; + } + + return new[] { newTitle.Trim(), year.Trim() }; + } + + private string StripTrailingTheFromTitle(string title) + { + if(title.EndsWith(", the") || title.EndsWith(",the")) + { + title = title.Substring(title.Length - 4); + } + return title; + } + public List SearchForNewMovie(string title) { var lowerTitle = title.ToLower(); + var yearCheck = SeparateYearFromTitle(lowerTitle); // TODO: Make this much less hacky! + + lowerTitle = yearCheck[0]; + var yearTerm = yearCheck[1]; + + lowerTitle = StripTrailingTheFromTitle(lowerTitle); if (lowerTitle.StartsWith("imdb:") || lowerTitle.StartsWith("imdbid:")) { @@ -209,6 +239,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook .SetSegment("id", "movie") .SetSegment("secondaryRoute", "") .AddQueryParam("query", searchTerm) + .AddQueryParam("year", yearTerm) .AddQueryParam("include_adult", false) .Build(); diff --git a/src/UI/AddMovies/AddMoviesLayout.js b/src/UI/AddMovies/AddMoviesLayout.js index 904d3f179..3dd299959 100644 --- a/src/UI/AddMovies/AddMoviesLayout.js +++ b/src/UI/AddMovies/AddMoviesLayout.js @@ -2,7 +2,7 @@ var vent = require('vent'); var AppLayout = require('../AppLayout'); var Marionette = require('marionette'); var RootFolderLayout = require('./RootFolders/RootFolderLayout'); -//var ExistingMoviesCollectionView = require('./Existing/AddExistingSeriesCollectionView'); +var ExistingMoviesCollectionView = require('./Existing/AddExistingMovieCollectionView'); var AddMoviesView = require('./AddMoviesView'); var ProfileCollection = require('../Profile/ProfileCollection'); var RootFolderCollection = require('./RootFolders/RootFolderCollection'); @@ -36,9 +36,9 @@ module.exports = Marionette.Layout.extend({ }, _folderSelected : function(options) { - //vent.trigger(vent.Commands.CloseModalCommand); + vent.trigger(vent.Commands.CloseModalCommand); //TODO: Fix this shit. - //this.workspace.show(new ExistingMoviesCollectionView({ model : options.model })); + this.workspace.show(new ExistingMoviesCollectionView({ model : options.model })); }, _importMovies : function() { diff --git a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionView.js b/src/UI/AddMovies/Existing/AddExistingMovieCollectionView.js similarity index 87% rename from src/UI/AddMovies/Existing/AddExistingSeriesCollectionView.js rename to src/UI/AddMovies/Existing/AddExistingMovieCollectionView.js index 5c5eddc64..1e3d38b6a 100644 --- a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionView.js +++ b/src/UI/AddMovies/Existing/AddExistingMovieCollectionView.js @@ -1,11 +1,11 @@ var Marionette = require('marionette'); -var AddSeriesView = require('../AddSeriesView'); +var AddMoviesView = require('../AddMoviesView'); var UnmappedFolderCollection = require('./UnmappedFolderCollection'); module.exports = Marionette.CompositeView.extend({ - itemView : AddSeriesView, + itemView : AddMoviesView, itemViewContainer : '.x-loading-folders', - template : 'AddSeries/Existing/AddExistingSeriesCollectionViewTemplate', + template : 'AddMovies/Existing/AddExistingMovieCollectionViewTemplate', ui : { loadingFolders : '.x-loading-folders' diff --git a/src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs b/src/UI/AddMovies/Existing/AddExistingMovieCollectionViewTemplate.hbs similarity index 100% rename from src/UI/AddMovies/Existing/AddExistingSeriesCollectionViewTemplate.hbs rename to src/UI/AddMovies/Existing/AddExistingMovieCollectionViewTemplate.hbs From c63704ba0d57c88e09c80b9527fa8a9fd95d5902 Mon Sep 17 00:00:00 2001 From: Mike Date: Sat, 7 Jan 2017 20:48:45 +0100 Subject: [PATCH 7/9] Change tvsearch to movie. (#46) --- src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs index 518494923..b9b5103f3 100644 --- a/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs +++ b/src/NzbDrone.Core/Indexers/Newznab/NewznabRequestGenerator.cs @@ -112,9 +112,9 @@ namespace NzbDrone.Core.Indexers.Newznab var capabilities = _capabilitiesProvider.GetCapabilities(Settings); - if (capabilities.SupportedTvSearchParameters != null) + if (capabilities.SupportedMovieSearchParamters != null) { - pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories.Concat(Settings.AnimeCategories), "tvsearch", "")); + pageableRequests.Add(GetPagedRequests(MaxPages, Settings.Categories.Concat(Settings.AnimeCategories), "movie", "")); } return pageableRequests; From d3cbf9a8ff2f9bcfa1584134c09a3fc201af0429 Mon Sep 17 00:00:00 2001 From: Mitchell Cash Date: Sun, 8 Jan 2017 11:20:50 +1000 Subject: [PATCH 8/9] Remove all .DS_Store files It is now part of .gitignore so hopefully we shouldn't see these again. --- .DS_Store | Bin 10244 -> 0 bytes src/.DS_Store | Bin 8196 -> 0 bytes src/UI/.DS_Store | Bin 10244 -> 0 bytes 3 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 .DS_Store delete mode 100644 src/.DS_Store delete mode 100644 src/UI/.DS_Store diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index 8139cef010b45dfb9aaa946a9f548270720e1773..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHMX>1i$6uw^6`jy+Ok-! ze-y#E#of5?iW(!}lK8_Aj2aV_Kom)gYvLbF)QA{k;<@+EE3dBD4wxy*2BDLpW7X^hxHB` z0t5mC0t5mC0t5mC&ISZ1XY)f*r47mefdGL3fk6cL_aRItw-MhCNGm=aREQ-2*&J#X z2VK)TK*WT78}aRcv?7%5DOV5hL*XwmAj8QY=H1Cgd^;em3}=wx4E~ehuTUVKPH|z; zogpG^PzDGD2n9S5u>v7F%Oxy6RUbDgQOt(|Za|x|wF(=`_L|e?U zd%64mZ|jv~*OvQ@)di~F z9&@_7Xwa_THor#K*Yn3-X}I2sZZknc`j9_+;i5<_4QZtJ>fkZ8@i-r-QWAM;x8OiY zWSZncNs1CBkqUXK@g!BmDp(zBV(V$LY+*au1MCU5o9$tH+57Bcc8DEeKeD6jSN1zQ z#{K}qSmZ%NK6I3#4AW4FIhcp}s6joJq6y1!C01e$)?qz5u@T)!!i9%^+=|<<9rxf# zJdJ1YEMCQ%cn|yWDL%vJIDjMg0Y`C6jx8(2>;Yq^5!yjnd+Rka*3 z8+f(ma`KK6r03N|MdW2PQ+TDmjBW(_=A8*+Ps!Jh*a7yf;OcSqH*zrs6A>nsmJ>r4 zB0~IZKqIb3Gp<1kT8W{ZFc3uyHWI|s8;Ggfh^IGW0JmTV?!cY63wPsTJc`HgIG(_Z zcp0x?7xv&Syp4D8F81LQ9Liwq@(jj)J)E( z&_Mz_4NP%2W=APAp8=v7_~)<)^!%nY zadqd(Q<7d+-!P$Z@mZUaGR2izpiW3BsLb?{Cb~jAfr$Jgw313+_z)$Hp~;9RJAJZV ztSIT(Oa@HVFA7mw5vfhKl&RB0luAT~6D@kVI#Z!sBQu|Ds#L2KN-(JmC>smZxk_j- zk;=9j{R*DcGP0`lP1Yldk|v`{BAey%`@e~(1MExo9VMop*)JrdxQGI>kt0OZ6ch>( zH4C#*EkslU7GsGJQLE674k4l}Y@#H^Mbu4{p16p*7x&?QA);Qx>nBnXc(S2mP(Ce@ z^;C&(=;{PVPa~TONjBv*HJ-H`O_xm3 zlv4^Py*66t8MR0)357H!6<2BDG==D|Wl7(R!b>^1wQT9FP-k%-Yq`=}twgxk|IhIa>{G7){{ho$6Epw- diff --git a/src/.DS_Store b/src/.DS_Store deleted file mode 100644 index cbd549c7f321ab91fb5c1e4a5d74116488d65b0c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8196 zcmeHMU2GIp6uxI$V73$JEiJYzG##vzzm06OEwoLj%Wf;QfUInPY3VY%Gt$xN%w}hH zOKqx6O#A^g@kL|QXaJF*KA2el-VD*G@yS34`e;mi(Fctho+o5JkuSXKhwNI4>4Jjs}L2HSsUa;CA& z+aK^5@EPzK@EPzK@EKSQ4B#`H6={X%zOeeW&w$UsUC97j9~3+o#yp%A$d?YR_!a<> zZ2@?}Hf0S&#lx6~vjWkA1w<&K2nBD80U{j770)l`;jBOrPQcrIfOlr_b|}Elj`J(r zoj^>WU;7OB3@m4W-97=*PkJ(wPHy4;-Ekw4TM#HKU$b_d6s(ZhhgMabN{!o-DOYt1 zPF&58@SdUR8LypG-SJYp&$i9^wwf6*^vN`>N!XUF8kU}45IQ<&SeiW{HG`(|e7 z2a>d9SL?xJ!?~Gr7cO3U`|>+iu6-fCKX_{hsb0dzmnAYxrvo5o-i58iLPC9npP4LNv44hwhZDjNu&#_=+r|6dGfvJ*qnH@tkg9 zN?&>B?!=UaneCvav4o_?(&cT8?G(+%SVS}^d*0NO2#J$kGDdP_ikv4elQ+qSWR849 zJ}2Lh8{`M_6ZwVwM*bjwlD~k!dZ+{nRS<$E*a17C8TLUNv_l6Z;4t*U5jYC{FaoDw z4AL+TImm+pF3iBw@C-Z)FTq=I0WQKNcppB7PvBGd46ebqa6{x2D9Q4{Qr-gLCL+H_ zQI_648hGyZvTQhX_)uj}V%5s>)&?QQP50C)_wBkr+IAp5e~G#F7HWzMNhpOYsHBi3 z0$3!_>nPbRTkGY9ew3Vkb|szDbxhsk zy%D*AuHmv}-Ii92Ea$>z-S!T&uI2h=-OdMaDv8UJbrVfE72vXU2U*@xlwXtY$W8Ji z`I-DmekcDx1=NCqQVgREJ0XT5?1FB12$JwHoZvD{!)Z|AQ82**8|63!(1toI#p1_;-fCLxH$E z*+s>0hPaeL86XfKFdG5BcMr1`rqj7==KkHyq%0>z+TT+d%XGblhAXI;Q#p6u{7`s- z!cVno!NJ6cGoJ7?Z_I7gvin8L)Qyy1@6)`Ie7)astm(Rz+G`r)Np)$PV|$uu8`&AA z2L?@Bcg9odp^E0U~pO|QBYK}#l zni?l#(TUBQ8)DIoO`9es)ptUnmA5yy>>AEY9y@XJ)a!4&dHVbXi3a>P3ac(c=d;q# zSZ=OQLQ`=z56yQopive^I_~ML?&?me>X>WnF)Yn9b4I)78E#Tt>=I(#X~*_|$Y9#B z#zt+@RHZd5Jw}6#7RySQ56RK#tYcYyj%#|RV-F8`#u1O}_(TP&p?$8C_1eT_Lnh5H zM=jxC?apvxcdwCkNruB`7A;#9z3q-WH*UH6(qgr0N%c}i*+($jo_W7%WCzAM*29{c zHf-Ir4-e)z(3a6}YokULV&Sl`TD~Hp9MH+#U5?J}boE?FYHC+RBKx_fEo)GzheE<& z^_qy%?~?PX<_}y~uPFTw(9>33f6@&xB{E=XDZ^6rurzCER3d{p>ATwNcQ!9oB136s zbd;QS{l2Z+B9TM!9+U_R7 zLSpplHFb4rNU)C^udAnK1+5RM-4Lr&)Hz}ma4iwMPMs_G&YR7f6h*BRD}pz--9_4Y zg800-qn5OcRts;m)zd_vci%r@?cZ|t3wDwHAozNN{eihyfMtjhQ)9%^?T8ac+tGo0 z(T6=qpr2TpgoYH-uwWBcA0)O;5LX|@6du7bJcXz644%b{cnL4#6&%NDoWWZ-i*xt@ zAL1i?jPv*kmy1~2Tg2M$OS3kY$l8`;A0{p5`@A4@72?K2R{31}+2$1PJ_F2%xe((cVh4=W_?eH{!YWC|&o_#ScDiN=jiug-FMf6zOgV=TQc{hM|NLVBC8dJ>|ID0Ku>a?Y?Eh8jy5QgG?EU|rClp|W From 5f9e285c707b3235c5468525c47b87167ce32d7b Mon Sep 17 00:00:00 2001 From: Tim Turner Date: Sat, 7 Jan 2017 20:55:14 -0500 Subject: [PATCH 9/9] Fix issues with ", the" not trimming properly --- src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index dc5a3a3ed..14957c0ef 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -192,9 +192,12 @@ namespace NzbDrone.Core.MetadataSource.SkyHook private string StripTrailingTheFromTitle(string title) { - if(title.EndsWith(", the") || title.EndsWith(",the")) + if(title.EndsWith(",the")) { title = title.Substring(title.Length - 4); + } else if(title.EndsWith(", the")) + { + title = title.Substring(title.Length - 5); } return title; }