tedkulp/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr.git synced 2026-04-23 22:25:14 -04:00
Code Issues Projects Releases Wiki Activity

Fixed: Misc Extra File Improvements (This changes mapping of backdrop images to Fanart instead of Banner) (#2642)

Browse Source 
Fixes #2556
Fixes #2639
Fixes #2547
This commit is contained in:
Qstick
2018-04-01 15:48:22 -04:00
committed by Leonardo Galli
parent 0f6c5533f1
commit 39346b6127
25 changed files with 346 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -87,7 +87,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.MediaBrowser
}
}
public override List<ImageFileResult> MovieImages(Movie movie, MovieFile movieFile)
public override List<ImageFileResult> MovieImages(Movie movie)
{
return new List<ImageFileResult>();
}
src/NzbDrone.Core/Extras/Metadata/Consumers/Roksbox/RoksboxMetadata.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -131,7 +131,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Roksbox
return new MetadataFileResult(GetMovieFileMetadataFilename(movieFile.RelativePath), xmlResult.Trim(Environment.NewLine.ToCharArray()));
}
public override List<ImageFileResult> MovieImages(Movie movie, MovieFile movieFile)
public override List<ImageFileResult> MovieImages(Movie movie)
{
if (!Settings.MovieImages)
{
src/NzbDrone.Core/Extras/Metadata/Consumers/Wdtv/WdtvMetadata.cs
+2 -2
View File
@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -129,7 +129,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Wdtv
return new MetadataFileResult(filename, xmlResult.Trim(Environment.NewLine.ToCharArray()));
}
public override List<ImageFileResult> MovieImages(Movie movie, MovieFile moviefile)
public override List<ImageFileResult> MovieImages(Movie movie)
{
if (!Settings.MovieImages)
{
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcMetadata.cs
+35 -28
View File
@@ -7,6 +7,7 @@ using System.Text.RegularExpressions;
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
{
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(@"^(?<type>poster|banner|fanart|clearart|disc|landscape|logo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex MovieFileImageRegex = new Regex(@"(?<type>-thumb|-poster|-banner|-fanart)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex MovieImagesRegex = new Regex(@"^(?<type>poster|banner|fanart|clearart|discart|landscape|logo|backdrop|clearlogo)\.(?:png|jpg)", RegexOptions.Compiled | RegexOptions.IgnoreCase);
private static readonly Regex MovieFileImageRegex = new Regex(@"(?<type>-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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
_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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
return new MetadataFileResult(metadataFileName, xmlResult.Trim(Environment.NewLine.ToCharArray()));
}
public override List<ImageFileResult> MovieImages(Movie movie, MovieFile movieFile)
public override List<ImageFileResult> MovieImages(Movie movie)
{
if (!Settings.MovieImages)
{
@@ -225,7 +232,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
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, "<watched>true</watched>");
}
}
}
src/NzbDrone.Core/Extras/Metadata/Consumers/Xbmc/XbmcNfoDetector.cs
+40
View File
@@ -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);
}
}
}
src/NzbDrone.Core/Extras/Metadata/Files/MetadataFileService.cs
-2
View File
@@ -16,7 +16,5 @@ namespace NzbDrone.Core.Extras.Metadata.Files
: base(repository, movieService, diskProvider, recycleBinProvider, logger)
{
}
public override bool PermanentlyDelete => true;
}
}
src/NzbDrone.Core/Extras/Metadata/IMetadata.cs
+1 -1
View File
@@ -11,6 +11,6 @@ namespace NzbDrone.Core.Extras.Metadata
string GetFilenameAfterMove(Movie movie, MovieFile movieFile, MetadataFile metadataFile);
MetadataFile FindMetadataFile(Movie movie, string path);
MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile);
List<ImageFileResult> MovieImages(Movie movie, MovieFile movieFile);
List<ImageFileResult> MovieImages(Movie movie);
}
}
src/NzbDrone.Core/Extras/Metadata/MetadataBase.cs
+1 -1
View File
@@ -41,7 +41,7 @@ namespace NzbDrone.Core.Extras.Metadata
public abstract MetadataFile FindMetadataFile(Movie movie, string path);
public abstract MetadataFileResult MovieMetadata(Movie movie, MovieFile movieFile);
public abstract List<ImageFileResult> MovieImages(Movie movie, MovieFile movieFile);
public abstract List<ImageFileResult> MovieImages(Movie movie);
public virtual object RequestAction(string action, IDictionary<string, string> query) { return null; }
src/NzbDrone.Core/Extras/Metadata/MetadataService.cs
+44 -23
View File
@@ -10,6 +10,7 @@ using NzbDrone.Common.Http;
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 @@ namespace NzbDrone.Core.Extras.Metadata
{
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 @@ namespace NzbDrone.Core.Extras.Metadata
public MetadataService(IConfigService configService,
IDiskProvider diskProvider,
IDiskTransferService diskTransferService,
IRecycleBinProvider recycleBinProvider,
IOtherExtraFileRenamer otherExtraFileRenamer,
IMetadataFactory metadataFactory,
ICleanMetadataService cleanMetadataService,
IHttpClient httpClient,
@@ -39,6 +44,8 @@ namespace NzbDrone.Core.Extras.Metadata
{
_metadataFactory = metadataFactory;
_cleanMetadataService = cleanMetadataService;
_otherExtraFileRenamer = otherExtraFileRenamer;
_recycleBinProvider = recycleBinProvider;
_diskTransferService = diskTransferService;
_diskProvider = diskProvider;
_httpClient = httpClient;
@@ -66,10 +73,11 @@ namespace NzbDrone.Core.Extras.Metadata
{
var consumerFiles = GetMetadataFilesForConsumer(consumer, metadataFiles);
files.AddRange(ProcessMovieImages(consumer, movie, consumerFiles));
foreach (var movieFile in movieFiles)
{
files.AddIfNotNull(ProcessMovieMetadata(consumer, movie, movieFile, consumerFiles));
files.AddRange(ProcessMovieImages(consumer, movie, movieFile, consumerFiles));
}
}
@@ -84,9 +92,33 @@ namespace NzbDrone.Core.Extras.Metadata
foreach (var consumer in _metadataFactory.Enabled())
{
files.AddIfNotNull(ProcessMovieMetadata(consumer, movie, movieFile, new List<MetadataFile>()));
files.AddRange(ProcessMovieImages(consumer, movie, movieFile, new List<MetadataFile>()));
}
_metadataFileService.Upsert(files);
return files;
}
public override IEnumerable<ExtraFile> CreateAfterMovieImport(Movie movie, string movieFolder)
{
var metadataFiles = _metadataFileService.GetFilesByMovie(movie.Id);
if (movieFolder.IsNullOrWhiteSpace())
{
return new List<MetadataFile>();
}
var files = new List<MetadataFile>();
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 @@ namespace NzbDrone.Core.Extras.Metadata
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 @@ namespace NzbDrone.Core.Extras.Metadata
return metadata;
}
private List<MetadataFile> ProcessMovieImages(IMetadata consumer, Movie movie, MovieFile movieFile, List<MetadataFile> existingMetadataFiles)
private List<MetadataFile> ProcessMovieImages(IMetadata consumer, Movie movie, List<MetadataFile> existingMetadataFiles)
{
var result = new List<MetadataFile>();
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 @@ namespace NzbDrone.Core.Extras.Metadata
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<MetadataFile>{ 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 @@ namespace NzbDrone.Core.Extras.Metadata
_logger.Debug("Removing duplicate Metadata file: {0}", path);
_diskProvider.DeleteFile(path);
_recycleBinProvider.DeleteFile(path);
_metadataFileService.Delete(file.Id);
}