diff --git a/src/NzbDrone.Core.Test/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs similarity index 97% rename from src/NzbDrone.Core.Test/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs rename to src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs index 6d075667f..0449def72 100644 --- a/src/NzbDrone.Core.Test/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs +++ b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Roksbox/FindMetadataFileFixture.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Movies; using NzbDrone.Test.Common; -namespace NzbDrone.Core.Test.Metadata.Consumers.Roksbox +namespace NzbDrone.Core.Test.Extras.Metadata.Consumers.Roksbox { [TestFixture] public class FindMetadataFileFixture : CoreTest diff --git a/src/NzbDrone.Core.Test/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs similarity index 96% rename from src/NzbDrone.Core.Test/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs rename to src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs index e8d305f51..cd10a48d2 100644 --- a/src/NzbDrone.Core.Test/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs +++ b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Wdtv/FindMetadataFileFixture.cs @@ -8,7 +8,7 @@ using NzbDrone.Core.Movies; using NzbDrone.Test.Common; -namespace NzbDrone.Core.Test.Metadata.Consumers.Wdtv +namespace NzbDrone.Core.Test.Extras.Metadata.Consumers.Wdtv { [TestFixture] public class FindMetadataFileFixture : CoreTest diff --git a/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Xbmc/FindMetadataFileFixture.cs b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Xbmc/FindMetadataFileFixture.cs new file mode 100644 index 000000000..6ea699dd0 --- /dev/null +++ b/src/NzbDrone.Core.Test/Extras/Metadata/Consumers/Xbmc/FindMetadataFileFixture.cs @@ -0,0 +1,65 @@ +using System.IO; +using FizzWare.NBuilder; +using FluentAssertions; +using Moq; +using NUnit.Framework; +using NzbDrone.Core.Extras.Metadata; +using NzbDrone.Core.Extras.Metadata.Consumers.Xbmc; +using NzbDrone.Core.Test.Framework; +using NzbDrone.Core.Movies; +using NzbDrone.Test.Common; + +namespace NzbDrone.Core.Test.Extras.Metadata.Consumers.Xbmc +{ + [TestFixture] + public class FindMetadataFileFixture : CoreTest + { + private Movie _movie; + + [SetUp] + public void Setup() + { + _movie = Builder.CreateNew() + .With(s => s.Path = @"C:\Test\Movies\The.Movie".AsOsAgnostic()) + .Build(); + } + + [Test] + public void should_return_null_if_filename_is_not_handled() + { + var path = Path.Combine(_movie.Path, "file.jpg"); + + Subject.FindMetadataFile(_movie, path).Should().BeNull(); + } + + [Test] + public void should_return_metadata_for_xbmc_nfo() + { + var path = Path.Combine(_movie.Path, "the.movie.2017.nfo"); + + Mocker.GetMock() + .Setup(v => v.IsXbmcNfoFile(path)) + .Returns(true); + + Subject.FindMetadataFile(_movie, path).Type.Should().Be(MetadataType.MovieMetadata); + + Mocker.GetMock() + .Verify(v => v.IsXbmcNfoFile(It.IsAny()), Times.Once()); + } + + [Test] + public void should_return_null_for_scene_nfo() + { + var path = Path.Combine(_movie.Path, "the.movie.2017.nfo"); + + Mocker.GetMock() + .Setup(v => v.IsXbmcNfoFile(path)) + .Returns(false); + + Subject.FindMetadataFile(_movie, path).Should().BeNull(); + + Mocker.GetMock() + .Verify(v => v.IsXbmcNfoFile(It.IsAny()), Times.Once()); + } + } +} diff --git a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj index 7f815a3d9..b1dac8d53 100644 --- a/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj +++ b/src/NzbDrone.Core.Test/NzbDrone.Core.Test.csproj @@ -198,6 +198,7 @@ Always + @@ -300,8 +301,8 @@ - - + + diff --git a/src/NzbDrone.Core/Datastore/Migration/145_banner_to_fanart.cs b/src/NzbDrone.Core/Datastore/Migration/145_banner_to_fanart.cs new file mode 100644 index 000000000..7ad227539 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/145_banner_to_fanart.cs @@ -0,0 +1,17 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(145)] + public class banner_to_fanart : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Execute.Sql("UPDATE Movies SET Images = replace(Images, \'\"coverType\": \"banner\"\', \'\"coverType\": \"fanart\"\')"); + + // Remove Link for images to specific MovieFiles, Images are now related to the Movie object only + Execute.Sql("UPDATE MetadataFiles SET MovieFileId = null WHERE Type = 2"); + } + } +} diff --git a/src/NzbDrone.Core/Extras/ExtraService.cs b/src/NzbDrone.Core/Extras/ExtraService.cs index 90743d93a..aedb233dd 100644 --- a/src/NzbDrone.Core/Extras/ExtraService.cs +++ b/src/NzbDrone.Core/Extras/ExtraService.cs @@ -19,11 +19,12 @@ namespace NzbDrone.Core.Extras { public interface IExtraService { - void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly); + void ImportMovie(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly); } public class ExtraService : IExtraService, IHandle, + IHandle, IHandle { private readonly IMediaFileService _mediaFileService; @@ -48,15 +49,15 @@ public ExtraService(IMediaFileService mediaFileService, _logger = logger; } + public void ImportMovie(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly) + { + ImportExtraFiles(localMovie, movieFile, isReadOnly); + + CreateAfterImport(localMovie.Movie, movieFile); + } + public void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool isReadOnly) { - var movie = localMovie.Movie; - - foreach (var extraFileManager in _extraFileManagers) - { - extraFileManager.CreateAfterMovieImport(movie, movieFile); - } - if (!_configService.ImportExtraFiles) { return; @@ -87,7 +88,7 @@ public void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool is foreach (var extraFileManager in _extraFileManagers) { var extension = Path.GetExtension(matchingFilename); - var extraFile = extraFileManager.Import(movie, movieFile, matchingFilename, extension, isReadOnly); + var extraFile = extraFileManager.Import(localMovie.Movie, movieFile, matchingFilename, extension, isReadOnly); if (extraFile != null) { @@ -102,6 +103,14 @@ public void ImportExtraFiles(LocalMovie localMovie, MovieFile movieFile, bool is } } + private void CreateAfterImport(Movie movie, MovieFile movieFile) + { + foreach (var extraFileManager in _extraFileManagers) + { + extraFileManager.CreateAfterMovieImport(movie, movieFile); + } + } + public void Handle(MediaCoversUpdatedEvent message) { var movie = message.Movie; @@ -113,6 +122,16 @@ public void Handle(MediaCoversUpdatedEvent message) } } + public void Handle(MovieFolderCreatedEvent message) + { + var movie = message.Movie; + + foreach (var extraFileManager in _extraFileManagers) + { + extraFileManager.CreateAfterMovieImport(movie, message.MovieFolder); + } + } + public void Handle(MovieRenamedEvent message) { var movie = message.Movie; diff --git a/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs b/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs index f210ca2bc..825238a16 100644 --- a/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs +++ b/src/NzbDrone.Core/Extras/Files/ExtraFileManager.cs @@ -16,6 +16,7 @@ public interface IManageExtraFiles int Order { get; } IEnumerable CreateAfterMovieScan(Movie movie, List movieFiles); IEnumerable CreateAfterMovieImport(Movie movie, MovieFile movieFile); + IEnumerable CreateAfterMovieImport(Movie movie, string movieFolder); IEnumerable MoveFilesAfterRename(Movie movie, List movieFiles); ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly); } @@ -43,6 +44,7 @@ public ExtraFileManager(IConfigService configService, public abstract int Order { get; } public abstract IEnumerable CreateAfterMovieScan(Movie movie, List movieFiles); public abstract IEnumerable CreateAfterMovieImport(Movie movie, MovieFile movieFile); + public abstract IEnumerable CreateAfterMovieImport(Movie movie, string movieFolder); public abstract IEnumerable MoveFilesAfterRename(Movie movie, List movieFiles); public abstract ExtraFile Import(Movie movie, MovieFile movieFile, string path, string extension, bool readOnly); diff --git a/src/NzbDrone.Core/Extras/Files/ExtraFileService.cs b/src/NzbDrone.Core/Extras/Files/ExtraFileService.cs index 5eec2addb..819de5b02 100644 --- a/src/NzbDrone.Core/Extras/Files/ExtraFileService.cs +++ b/src/NzbDrone.Core/Extras/Files/ExtraFileService.cs @@ -48,8 +48,6 @@ public ExtraFileService(IExtraFileRepository repository, _logger = logger; } - public virtual bool PermanentlyDelete => false; - public List GetFilesByMovie(int movieId) { return _repository.GetFilesByMovie(movieId); @@ -121,16 +119,8 @@ public void HandleAsync(MovieFileDeletedEvent message) if (_diskProvider.FileExists(path)) { - if (PermanentlyDelete) - { - _diskProvider.DeleteFile(path); - } - - else - { - // Send extra files to the recycling bin so they can be recovered if necessary - _recycleBinProvider.DeleteFile(path); - } + // Send to the recycling bin so they can be recovered if necessary + _recycleBinProvider.DeleteFile(path); } } } diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs index 82d078adf..210217dc0 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -87,7 +87,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil } } - public override List MovieImages(Movie movie, MovieFile movieFile) + public override List MovieImages(Movie movie) { return new List(); } diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs index 594649c3f..e379da197 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -131,7 +131,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil return new MetadataFileResult(GetMovieFileMetadataFilename(movieFile.RelativePath), xmlResult.Trim(Environment.NewLine.ToCharArray())); } - public override List MovieImages(Movie movie, MovieFile movieFile) + public override List MovieImages(Movie movie) { if (!Settings.MovieImages) { diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs index d9e383a1e..83b516b7d 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.IO; using System.Linq; @@ -129,7 +129,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil return new MetadataFileResult(filename, xmlResult.Trim(Environment.NewLine.ToCharArray())); } - public override List MovieImages(Movie movie, MovieFile moviefile) + public override List MovieImages(Movie movie) { if (!Settings.MovieImages) { diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs index 56349a2c9..d600f1041 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs @@ -7,6 +7,7 @@ using System.Xml; using System.Xml.Linq; using NLog; +using NzbDrone.Common.Disk; using NzbDrone.Common.Extensions; using NzbDrone.Core.Extras.Metadata.Files; using NzbDrone.Core.MediaCover; @@ -19,16 +20,23 @@ public class XbmcMetadata : MetadataBase { private readonly IMapCoversToLocal _mediaCoverService; private readonly Logger _logger; + private readonly IDetectXbmcNfo _detectNfo; + private readonly IDiskProvider _diskProvider; - public XbmcMetadata(IMapCoversToLocal mediaCoverService, + public XbmcMetadata(IDetectXbmcNfo detectNfo, + IDiskProvider diskProvider, + IMapCoversToLocal mediaCoverService, Logger logger) { - _mediaCoverService = mediaCoverService; _logger = logger; + _mediaCoverService = mediaCoverService; + _diskProvider = diskProvider; + _detectNfo = detectNfo; + } - private static readonly Regex MovieImagesRegex = new Regex(@"^(?poster|banner|fanart|clearart|disc|landscape|logo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); - private static readonly Regex MovieFileImageRegex = new Regex(@"(?-thumb|-poster|-banner|-fanart)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex MovieImagesRegex = new Regex(@"^(?poster|banner|fanart|clearart|discart|landscape|logo|backdrop|clearlogo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); + private static readonly Regex MovieFileImageRegex = new Regex(@"(?-thumb|-poster|-banner|-fanart|-clearart|-discart|-landscape|-logo|-backdrop|-clearlogo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase); public override string Name => "Kodi (XBMC) / Emby"; @@ -42,11 +50,6 @@ public override string GetFilenameAfterMove(Movie movie, MovieFile movieFile, Me return GetMovieMetadataFilename(movieFilePath); } - if (metadataFile.Type == MetadataType.MovieImage) - { - return GetMovieImageFilename(movieFilePath, metadataPath); - } - _logger.Debug("Unknown movie file metadata: {0}", metadataFile.RelativePath); return Path.Combine(movie.Path, metadataFile.RelativePath); } @@ -76,7 +79,8 @@ public override MetadataFile FindMetadataFile(Movie movie, string path) return metadata; } - if (filename.Equals("movie.nfo", StringComparison.OrdinalIgnoreCase)) + if (filename.Equals("movie.nfo", StringComparison.OrdinalIgnoreCase) && + _detectNfo.IsXbmcNfoFile(path)) { metadata.Type = MetadataType.MovieMetadata; return metadata; @@ -85,7 +89,8 @@ public override MetadataFile FindMetadataFile(Movie movie, string path) var parseResult = Parser.Parser.ParseMovieTitle(filename, false); if (parseResult != null && - Path.GetExtension(filename).Equals(".nfo", StringComparison.OrdinalIgnoreCase)) + Path.GetExtension(filename).Equals(".nfo", StringComparison.OrdinalIgnoreCase) && + _detectNfo.IsXbmcNfoFile(path)) { metadata.Type = MetadataType.MovieMetadata; return metadata; @@ -103,6 +108,8 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil _logger.Debug("Generating Movie Metadata for: {0}", Path.Combine(movie.Path, movieFile.RelativePath)); + var watched = GetExistingWatchedStatus(movie, movieFile.RelativePath); + var xmlResult = string.Empty; var sb = new StringBuilder(); @@ -150,7 +157,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil details.Add(new XElement("thumb", image.Url)); } - details.Add(new XElement("watched", "false")); + details.Add(new XElement("watched", watched)); if (movieFile.MediaInfo != null) { @@ -210,7 +217,7 @@ public override MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFil return new MetadataFileResult(metadataFileName, xmlResult.Trim(Environment.NewLine.ToCharArray())); } - public override List MovieImages(Movie movie, MovieFile movieFile) + public override List MovieImages(Movie movie) { if (!Settings.MovieImages) { @@ -225,7 +232,7 @@ private IEnumerable ProcessMovieImages(Movie movie) foreach (var image in movie.Images) { var source = _mediaCoverService.GetCoverPath(movie.Id, image.CoverType); - var destination = Path.ChangeExtension(movie.MovieFile.RelativePath,"").TrimEnd(".") + "-" + image.CoverType.ToString().ToLowerInvariant() + Path.GetExtension(source); + var destination = image.CoverType.ToString().ToLowerInvariant() + Path.GetExtension(source); yield return new ImageFileResult(destination, source); } @@ -236,20 +243,6 @@ private string GetMovieMetadataFilename(string movieFilePath) return Path.ChangeExtension(movieFilePath, "nfo"); } - private string GetMovieImageFilename(string movieFilePath, string existingImageName) - { - var fileExtention = Path.GetExtension(existingImageName); - var match = MovieFileImageRegex.Matches(existingImageName); - - if (match.Count > 0) - { - var imageType = match[0].Groups["type"].Value; - return Parser.Parser.RemoveFileExtension(movieFilePath) + imageType + fileExtention; - } - - return existingImageName; - } - private string GetAudioCodec(string audioCodec) { if (audioCodec == "AC-3") @@ -259,5 +252,19 @@ private string GetAudioCodec(string audioCodec) return audioCodec; } + + private bool GetExistingWatchedStatus(Movie movie, string movieFilePath) + { + var fullPath = Path.Combine(movie.Path, GetMovieMetadataFilename(movieFilePath)); + + if (!_diskProvider.FileExists(fullPath)) + { + return false; + } + + var fileContent = _diskProvider.ReadAllText(fullPath); + + return Regex.IsMatch(fileContent, "true"); + } } } diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcNfoDetector.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcNfoDetector.cs new file mode 100644 index 000000000..234d27f22 --- /dev/null +++ b/src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcNfoDetector.cs @@ -0,0 +1,40 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Text.RegularExpressions; +using NzbDrone.Common.Disk; + +namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc +{ + public interface IDetectXbmcNfo + { + bool IsXbmcNfoFile(string path); + } + + public class XbmcNfoDetector : IDetectXbmcNfo + { + private readonly IDiskProvider _diskProvider; + + private readonly Regex _regex = new Regex("<(movie|tvshow|episodedetails|artist|album|musicvideo)>", RegexOptions.Compiled); + + public XbmcNfoDetector(IDiskProvider diskProvider) + { + _diskProvider = diskProvider; + } + + public bool IsXbmcNfoFile(string path) + { + // Lets make sure we're not reading huge files. + if (_diskProvider.GetFileSize(path) > 10.Megabytes()) + { + return false; + } + + // Check if it contains some of the kodi/xbmc xml tags + var content = _diskProvider.ReadAllText(path); + + return _regex.IsMatch(content); + } + } +} diff --git a/src/NzbDrone.Core/Extras/Metadata/Files/MetadataFileService.cs b/src/NzbDrone.Core/Extras/Metadata/Files/MetadataFileService.cs index 509962e9d..bed5b9a8e 100644 --- a/src/NzbDrone.Core/Extras/Metadata/Files/MetadataFileService.cs +++ b/src/NzbDrone.Core/Extras/Metadata/Files/MetadataFileService.cs @@ -16,7 +16,5 @@ public MetadataFileService(IExtraFileRepository repository, IMovie : base(repository, movieService, diskProvider, recycleBinProvider, logger) { } - - public override bool PermanentlyDelete => true; } } diff --git a/src/NzbDrone.Core/Extras/Metadata/IMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/IMetadata.cs index aa4038525..e3d0b0624 100644 --- a/src/NzbDrone.Core/Extras/Metadata/IMetadata.cs +++ b/src/NzbDrone.Core/Extras/Metadata/IMetadata.cs @@ -11,6 +11,6 @@ public interface IMetadata : IProvider string GetFilenameAfterMove(Movie movie, MovieFile movieFile, MetadataFile metadataFile); MetadataFile FindMetadataFile(Movie movie, string path); MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile); - List MovieImages(Movie movie, MovieFile movieFile); + List MovieImages(Movie movie); } } diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs index eec70833a..29cb361b4 100644 --- a/src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs +++ b/src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs @@ -41,7 +41,7 @@ public virtual string GetFilenameAfterMove(Movie movie, MovieFile movieFile, Met public abstract MetadataFile FindMetadataFile(Movie movie, string path); public abstract MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile); - public abstract List MovieImages(Movie movie, MovieFile movieFile); + public abstract List MovieImages(Movie movie); public virtual object RequestAction(string action, IDictionary query) { return null; } diff --git a/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs b/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs index 5e8a8838a..52cd1d6e6 100644 --- a/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs +++ b/src/NzbDrone.Core/Extras/Metadata/MetadataService.cs @@ -10,6 +10,7 @@ using NzbDrone.Core.Configuration; using NzbDrone.Core.Extras.Files; using NzbDrone.Core.Extras.Metadata.Files; +using NzbDrone.Core.Extras.Others; using NzbDrone.Core.MediaFiles; using NzbDrone.Core.Movies; @@ -19,6 +20,8 @@ public class MetadataService : ExtraFileManager { private readonly IMetadataFactory _metadataFactory; private readonly ICleanMetadataService _cleanMetadataService; + private readonly IRecycleBinProvider _recycleBinProvider; + private readonly IOtherExtraFileRenamer _otherExtraFileRenamer; private readonly IDiskProvider _diskProvider; private readonly IDiskTransferService _diskTransferService; private readonly IHttpClient _httpClient; @@ -29,6 +32,8 @@ public class MetadataService : ExtraFileManager public MetadataService(IConfigService configService, IDiskProvider diskProvider, IDiskTransferService diskTransferService, + IRecycleBinProvider recycleBinProvider, + IOtherExtraFileRenamer otherExtraFileRenamer, IMetadataFactory metadataFactory, ICleanMetadataService cleanMetadataService, IHttpClient httpClient, @@ -39,6 +44,8 @@ public MetadataService(IConfigService configService, { _metadataFactory = metadataFactory; _cleanMetadataService = cleanMetadataService; + _otherExtraFileRenamer = otherExtraFileRenamer; + _recycleBinProvider = recycleBinProvider; _diskTransferService = diskTransferService; _diskProvider = diskProvider; _httpClient = httpClient; @@ -66,10 +73,11 @@ public override IEnumerable CreateAfterMovieScan(Movie movie, List CreateAfterMovieImport(Movie movie, Movie foreach (var consumer in _metadataFactory.Enabled()) { - files.AddIfNotNull(ProcessMovieMetadata(consumer, movie, movieFile, new List())); - files.AddRange(ProcessMovieImages(consumer, movie, movieFile, new List())); + } + + _metadataFileService.Upsert(files); + + return files; + } + + public override IEnumerable CreateAfterMovieImport(Movie movie, string movieFolder) + { + var metadataFiles = _metadataFileService.GetFilesByMovie(movie.Id); + + if (movieFolder.IsNullOrWhiteSpace()) + { + return new List(); + } + + var files = new List(); + + foreach (var consumer in _metadataFactory.Enabled()) + { + var consumerFiles = GetMetadataFilesForConsumer(consumer, metadataFiles); + + if (movieFolder.IsNotNullOrWhiteSpace()) + { + files.AddRange(ProcessMovieImages(consumer, movie, consumerFiles)); + } } _metadataFileService.Upsert(files); @@ -156,6 +188,8 @@ private MetadataFile ProcessMovieMetadata(IMetadata consumer, Movie movie, Movie var fullPath = Path.Combine(movie.Path, movieFileMetadata.RelativePath); + _otherExtraFileRenamer.RenameOtherExtraFile(movie, fullPath); + var existingMetadata = GetMetadataFile(movie, existingMetadataFiles, c => c.Type == MetadataType.MovieMetadata && c.MovieFileId == movieFile.Id); @@ -194,12 +228,12 @@ private MetadataFile ProcessMovieMetadata(IMetadata consumer, Movie movie, Movie return metadata; } - - private List ProcessMovieImages(IMetadata consumer, Movie movie, MovieFile movieFile, List existingMetadataFiles) + + private List ProcessMovieImages(IMetadata consumer, Movie movie, List existingMetadataFiles) { var result = new List(); - foreach (var image in consumer.MovieImages(movie, movieFile)) + foreach (var image in consumer.MovieImages(movie)) { var fullPath = Path.Combine(movie.Path, image.RelativePath); @@ -209,26 +243,13 @@ private List ProcessMovieImages(IMetadata consumer, Movie movie, M continue; } - var existingMetadata = GetMetadataFile(movie, existingMetadataFiles, c => c.Type == MetadataType.MovieImage && - c.RelativePath == image.RelativePath); + _otherExtraFileRenamer.RenameOtherExtraFile(movie, fullPath); - if (existingMetadata != null) - { - var existingFullPath = Path.Combine(movie.Path, existingMetadata.RelativePath); - if (fullPath.PathNotEquals(existingFullPath)) - { - _diskTransferService.TransferFile(existingFullPath, fullPath, TransferMode.Move); - existingMetadata.RelativePath = image.RelativePath; - - return new List{ existingMetadata }; - } - } - - var metadata = existingMetadata ?? + var metadata = GetMetadataFile(movie, existingMetadataFiles, c => c.Type == MetadataType.MovieImage && + c.RelativePath == image.RelativePath) ?? new MetadataFile { MovieId = movie.Id, - MovieFileId = movieFile.Id, Consumer = consumer.GetType().Name, Type = MetadataType.MovieImage, RelativePath = image.RelativePath, @@ -291,7 +312,7 @@ private MetadataFile GetMetadataFile(Movie movie, List existingMet _logger.Debug("Removing duplicate Metadata file: {0}", path); - _diskProvider.DeleteFile(path); + _recycleBinProvider.DeleteFile(path); _metadataFileService.Delete(file.Id); } diff --git a/src/NzbDrone.Core/Extras/Others/OtherExtraFileRenamer.cs b/src/NzbDrone.Core/Extras/Others/OtherExtraFileRenamer.cs new file mode 100644 index 000000000..dd35d91b4 --- /dev/null +++ b/src/NzbDrone.Core/Extras/Others/OtherExtraFileRenamer.cs @@ -0,0 +1,81 @@ +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using System.Text; +using NLog; +using NzbDrone.Common.Disk; +using NzbDrone.Common.Extensions; +using NzbDrone.Core.MediaFiles; +using NzbDrone.Core.Movies; + +namespace NzbDrone.Core.Extras.Others +{ + public interface IOtherExtraFileRenamer + { + void RenameOtherExtraFile(Movie movie, string path); + } + + public class OtherExtraFileRenamer : IOtherExtraFileRenamer + { + private readonly Logger _logger; + private readonly IDiskProvider _diskProvider; + private readonly IRecycleBinProvider _recycleBinProvider; + private readonly IMovieService _movieService; + private readonly IOtherExtraFileService _otherExtraFileService; + + public OtherExtraFileRenamer(IOtherExtraFileService otherExtraFileService, + IMovieService movieService, + IRecycleBinProvider recycleBinProvider, + IDiskProvider diskProvider, + Logger logger) + { + _logger = logger; + _diskProvider = diskProvider; + _recycleBinProvider = recycleBinProvider; + _movieService = movieService; + _otherExtraFileService = otherExtraFileService; + } + + public void RenameOtherExtraFile(Movie movie, string path) + { + if (!_diskProvider.FileExists(path)) + { + return; + } + + var relativePath = movie.Path.GetRelativePath(path); + + var otherExtraFile = _otherExtraFileService.FindByPath(relativePath); + if (otherExtraFile != null) + { + var newPath = path + "-orig"; + + // Recycle an existing -orig file. + RemoveOtherExtraFile(movie, newPath); + + // Rename the file to .*-orig + _diskProvider.MoveFile(path, newPath); + otherExtraFile.RelativePath = relativePath + "-orig"; + otherExtraFile.Extension += "-orig"; + _otherExtraFileService.Upsert(otherExtraFile); + } + } + + private void RemoveOtherExtraFile(Movie movie, string path) + { + if (!_diskProvider.FileExists(path)) + { + return; + } + + var relativePath = movie.Path.GetRelativePath(path); + + var otherExtraFile = _otherExtraFileService.FindByPath(relativePath); + if (otherExtraFile != null) + { + _recycleBinProvider.DeleteFile(path); + } + } + } +} diff --git a/src/NzbDrone.Core/Extras/Others/OtherExtraService.cs b/src/NzbDrone.Core/Extras/Others/OtherExtraService.cs index 421aa737b..d5b7cf8ec 100644 --- a/src/NzbDrone.Core/Extras/Others/OtherExtraService.cs +++ b/src/NzbDrone.Core/Extras/Others/OtherExtraService.cs @@ -38,6 +38,11 @@ public override IEnumerable CreateAfterMovieImport(Movie movie, Movie return Enumerable.Empty(); } + public override IEnumerable CreateAfterMovieImport(Movie movie, string movieFolder) + { + return Enumerable.Empty(); + } + public override IEnumerable MoveFilesAfterRename(Movie movie, List movieFiles) { var extraFiles = _otherExtraFileService.GetFilesByMovie(movie.Id); @@ -60,12 +65,6 @@ public override IEnumerable MoveFilesAfterRename(Movie movie, List CreateAfterMovieImport(Movie movie, Movie return Enumerable.Empty(); } + public override IEnumerable CreateAfterMovieImport(Movie movie, string movieFolder) + { + return Enumerable.Empty(); + } + public override IEnumerable MoveFilesAfterRename(Movie movie, List movieFiles) { var subtitleFiles = _subtitleFileService.GetFilesByMovie(movie.Id); diff --git a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs index 0ee443b89..da77655e7 100644 --- a/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs +++ b/src/NzbDrone.Core/MediaFiles/MovieImport/ImportApprovedMovie.cs @@ -120,7 +120,7 @@ public List Import(List decisions, bool newDownloa if (newDownload) { - _extraService.ImportExtraFiles(localMovie, movieFile, copyOnly); + _extraService.ImportMovie(localMovie, movieFile, copyOnly); } if (downloadClientItem != null) diff --git a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs index dc0ad51f6..58fe8360a 100644 --- a/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs +++ b/src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Net; @@ -160,7 +160,7 @@ public Movie GetMovieInfo(int TmdbId, Profile profile = null, bool hasPreDBEntry movie.TitleSlug += "-" + movie.TmdbId.ToString(); movie.Images.Add(_configService.GetCoverForURL(resource.poster_path, MediaCoverTypes.Poster));//TODO: Update to load image specs from tmdb page! - movie.Images.Add(_configService.GetCoverForURL(resource.backdrop_path, MediaCoverTypes.Banner)); + movie.Images.Add(_configService.GetCoverForURL(resource.backdrop_path, MediaCoverTypes.Fanart)); movie.Runtime = resource.runtime; //foreach(Title title in resource.alternative_titles.titles) diff --git a/src/NzbDrone.Core/MetadataSource/TmdbConfigurationService.cs b/src/NzbDrone.Core/MetadataSource/TmdbConfigurationService.cs index 2b960f0de..7c0d39cb5 100644 --- a/src/NzbDrone.Core/MetadataSource/TmdbConfigurationService.cs +++ b/src/NzbDrone.Core/MetadataSource/TmdbConfigurationService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Generic; using System.Linq; using System.Text; @@ -44,7 +44,7 @@ public MediaCover.MediaCover GetCoverForURL(string url, MediaCover.MediaCoverTyp switch (type) { - case MediaCoverTypes.Banner: + case MediaCoverTypes.Fanart: realUrl += images.backdrop_sizes.Last(); break; case MediaCoverTypes.Poster: diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index efde3fb1e..c2a8319e0 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -128,9 +128,12 @@ + + + diff --git a/src/UI/Movies/Details/MoviesDetailsLayout.js b/src/UI/Movies/Details/MoviesDetailsLayout.js index 5d4452121..5787aeb83 100644 --- a/src/UI/Movies/Details/MoviesDetailsLayout.js +++ b/src/UI/Movies/Details/MoviesDetailsLayout.js @@ -262,7 +262,7 @@ module.exports = Marionette.Layout.extend({ _showBackdrop : function () { $('body').addClass('backdrop'); - var fanArt = this._getImage('banner'); + var fanArt = this._getImage('fanart'); if (fanArt) { this._backstrech = $.backstretch(fanArt);