- Added new ratings scheme

- Added the fields userrating, top250, outline, tagline, playcount, lastplayed, country empty for use in Kodi (need this field in database)
- Added Director and Writer
- Added overview to set (empty, need this field in database)
- Change ID to TMDB (previously IMDB)
- Set True TMDB UniqueID instead of IMDB
- Modified thumb's sentence
- Remove <tmdbid>
- Reordered XML to match Kodi schema (https://kodi.wiki/view/NFO_files/Movies)
pull/5662/head
jasimancas 4 years ago committed by Qstick
parent f734ba2323
commit c046c3c229

@ -1,6 +1,3 @@
// Esquema obtenido de: https://kodi.wiki/view/NFO_files/Movies
// Validado para Kodiv V18 (Leila)
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
@ -129,6 +126,8 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
var selectedSettingsLanguage = Language.FindById(movieMetadataLanguage); var selectedSettingsLanguage = Language.FindById(movieMetadataLanguage);
var movieTranslation = movieTranslations.FirstOrDefault(mt => mt.Language == selectedSettingsLanguage); var movieTranslation = movieTranslations.FirstOrDefault(mt => mt.Language == selectedSettingsLanguage);
var credits = _creditService.GetAllCreditsForMovie(movie.Id);
var watched = GetExistingWatchedStatus(movie, movieFile.RelativePath); var watched = GetExistingWatchedStatus(movie, movieFile.RelativePath);
var sb = new StringBuilder(); var sb = new StringBuilder();
@ -153,44 +152,36 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
if (movie.Ratings != null && movie.Ratings.Votes > 0) if (movie.Ratings != null && movie.Ratings.Votes > 0)
{ {
details.Add(new XElement("rating", movie.Ratings.Value)); var setRating = new XElement("ratings");
var setRatethemoviedb = new XElement("rating", new XAttribute("name", "themoviedb"), new XAttribute("max", "10"), new XAttribute("default", "true"));
setRatethemoviedb.Add(new XElement("value", movie.Ratings.Value));
setRatethemoviedb.Add(new XElement("votes", movie.Ratings.Votes));
setRating.Add(setRatethemoviedb);
details.Add(setRating);
} }
#region userrating details.Add(new XElement("userrating"));
// pendiente de poner
#endregion
#region top250 details.Add(new XElement("top250"));
// pendiente de poner
#endregion
#region outline details.Add(new XElement("outline"));
// pendiente de poner
#endregion
details.Add(new XElement("plot", movieTranslation?.Overview ?? movie.Overview)); details.Add(new XElement("plot", movieTranslation?.Overview ?? movie.Overview));
#region tagline details.Add(new XElement("tagline"));
// pendiente de poner
#endregion
details.Add(new XElement("runtime", movie.Runtime)); details.Add(new XElement("runtime", movie.Runtime));
// banner? clearart? clearlogo? discart? landscape? poster?
if (thumbnail != null) if (thumbnail != null)
{ {
details.Add(new XElement("thumb", thumbnail.Url)); details.Add(new XElement("thumb", thumbnail.Url));
} }
else
{
details.Add(new XElement("thumb"));
}
foreach (var poster in posters) foreach (var poster in posters)
{ {
if (poster != null && poster.Url != null) if (poster != null && poster.Url != null)
{ {
details.Add(new XElement("thumb", new XAttribute("aspect", "poster"), poster.Url)); details.Add(new XElement("thumb", new XAttribute("aspect", "poster"), new XAttribute("preview", poster.Url), poster.Url));
} }
} }
@ -201,7 +192,7 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
{ {
if (fanart != null && fanart.Url != null) if (fanart != null && fanart.Url != null)
{ {
fanartElement.Add(new XElement("thumb", fanart.Url)); fanartElement.Add(new XElement("thumb", new XAttribute("preview", fanart.Url), fanart.Url));
} }
} }
@ -213,28 +204,21 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
details.Add(new XElement("mpaa", movie.Certification)); details.Add(new XElement("mpaa", movie.Certification));
} }
#region playcount details.Add(new XElement("playcount"));
// pendiente de poner
#endregion
#region lastplayed details.Add(new XElement("lastplayed"));
// pendiente de poner
#endregion
// #region id details.Add(new XElement("id", movie.TmdbId));
// details.Add(new XElement("id", movie.ImdbId));
// details.Add(new XElement("tmdbid", movie.TmdbId));
// #endregion
var uniqueId = new XElement("uniqueid", movie.TmdbId); var uniqueId = new XElement("uniqueid", movie.TmdbId);
uniqueId.SetAttributeValue("type", "tmdb"); uniqueId.SetAttributeValue("type", "tmdb");
uniqueId.SetAttributeValue("default", true);
details.Add(uniqueId); details.Add(uniqueId);
if (movie.ImdbId.IsNotNullOrWhiteSpace()) if (movie.ImdbId.IsNotNullOrWhiteSpace())
{ {
var imdbId = new XElement("uniqueid", movie.ImdbId); var imdbId = new XElement("uniqueid", movie.ImdbId);
imdbId.SetAttributeValue("type", "imdb"); imdbId.SetAttributeValue("type", "imdb");
imdbId.SetAttributeValue("default", true);
details.Add(imdbId); details.Add(imdbId);
} }
@ -243,44 +227,36 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
details.Add(new XElement("genre", genre)); details.Add(new XElement("genre", genre));
} }
#region country details.Add(new XElement("country"));
// pendiente de poner
#endregion
if (movie.Collection?.Name != null) if (movie.Collection?.Name != null)
{ {
var setElement = new XElement("set"); var setElement = new XElement("set");
setElement.Add(new XElement("name", movie.Collection.Name)); setElement.Add(new XElement("name", movie.Collection.Name));
setElement.Add(new XElement("overview"));
details.Add(setElement); details.Add(setElement);
} }
#region tag foreach (var tag in movie.Tags)
//details.Add(new XElement("tag", movie.Tags)); //Añadido Tags //Estan vacios en la BBDD... {
#endregion details.Add(new XElement("tag", tag));
}
// esto hay que comprobarlo, porque este credits es el escritor y lo mete como ¿actores?
var credits = _creditService.GetAllCreditsForMovie(movie.Id);
foreach (var credit in credits) foreach (var credit in credits)
{ {
if (credit.Name != null && credit.Character != null) if (credit.Name != null && credit.Job == "Screenplay")
{
var actorElement = new XElement("actor");
actorElement.Add(new XElement("name", credit.Name));
actorElement.Add(new XElement("role", credit.Character));
actorElement.Add(new XElement("order", credit.Order));
var headshot = credit.Images.FirstOrDefault(m => m.CoverType == MediaCoverTypes.Headshot);
if (headshot != null && headshot.Url != null)
{ {
actorElement.Add(new XElement("thumb", headshot.Url)); details.Add(new XElement("writer", credit.Name));
}
} }
details.Add(actorElement); foreach (var credit in credits)
{
if (credit.Name != null && credit.Job == "Director")
{
details.Add(new XElement("director", credit.Name));
} }
} }
@ -291,21 +267,9 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
details.Add(new XElement("year", movie.Year)); details.Add(new XElement("year", movie.Year));
#region collection
// Esto no aparece en el NFO de Kodi, pendiente de ver si borrar o no
// if (movie.Collection?.TmdbId > 0)
// {
// details.Add(new XElement("tmdbCollectionId", movie.Collection.TmdbId));
// var uniqueSetId = new XElement("uniqueid", movie.Collection.TmdbId);
// uniqueSetId.SetAttributeValue("type", "tmdbSet");
// details.Add(uniqueSetId);
// }
#endregion
details.Add(new XElement("studio", movie.Studio)); details.Add(new XElement("studio", movie.Studio));
details.Add(new XElement("trailer", "https://www.youtube.com/watch?v=" + movie.YouTubeTrailerId)); //Añadido el trailer details.Add(new XElement("trailer", "https://www.youtube.com/watch?v=" + movie.YouTubeTrailerId));
if (movieFile.MediaInfo != null) if (movieFile.MediaInfo != null)
{ {
@ -348,7 +312,29 @@ namespace NzbDrone.Core.Extras.Metadata.Consumers.Xbmc
fileInfo.Add(streamDetails); fileInfo.Add(streamDetails);
details.Add(fileInfo); details.Add(fileInfo);
foreach (var credit in credits)
{
if (credit.Name != null && credit.Character != null)
{
var actorElement = new XElement("actor");
actorElement.Add(new XElement("name", credit.Name));
actorElement.Add(new XElement("role", credit.Character));
actorElement.Add(new XElement("order", credit.Order));
var headshot = credit.Images.FirstOrDefault(m => m.CoverType == MediaCoverTypes.Headshot);
if (headshot != null && headshot.Url != null)
{
actorElement.Add(new XElement("thumb", headshot.Url));
} }
details.Add(actorElement);
}
}
}
doc.Add(details); doc.Add(details);
doc.Save(xw); doc.Save(xw);

Loading…
Cancel
Save