From ffc49c9049ee5a8f7d26c290ce334d1267efd13c Mon Sep 17 00:00:00 2001 From: Mark McDowall Date: Fri, 31 Aug 2018 19:35:14 -0700 Subject: [PATCH] Fixed: Removed old Media Browser metadata --- .../124_remove_media_browser_metadata.cs | 15 ++ .../MediaBrowser/MediaBrowserMetadata.cs | 158 ------------------ .../MediaBrowserMetadataSettings.cs | 34 ---- src/NzbDrone.Core/NzbDrone.Core.csproj | 5 +- 4 files changed, 17 insertions(+), 195 deletions(-) create mode 100644 src/NzbDrone.Core/Datastore/Migration/124_remove_media_browser_metadata.cs delete mode 100644 src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs delete mode 100644 src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs diff --git a/src/NzbDrone.Core/Datastore/Migration/124_remove_media_browser_metadata.cs b/src/NzbDrone.Core/Datastore/Migration/124_remove_media_browser_metadata.cs new file mode 100644 index 000000000..08659e336 --- /dev/null +++ b/src/NzbDrone.Core/Datastore/Migration/124_remove_media_browser_metadata.cs @@ -0,0 +1,15 @@ +using FluentMigrator; +using NzbDrone.Core.Datastore.Migration.Framework; + +namespace NzbDrone.Core.Datastore.Migration +{ + [Migration(124)] + public class remove_media_browser_metadata : NzbDroneMigrationBase + { + protected override void MainDbUpgrade() + { + Delete.FromTable("Metadata").Row(new { Implementation = "MediaBrowserMetadata" }); + Delete.FromTable("MetadataFiles").Row(new { Consumer = "MediaBrowserMetadata" }); + } + } +} diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs deleted file mode 100644 index d2ea82bae..000000000 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadata.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using System.Xml; -using System.Xml.Linq; -using NLog; -using NzbDrone.Common.Extensions; -using NzbDrone.Core.Extras.Metadata.Files; -using NzbDrone.Core.MediaFiles; -using NzbDrone.Core.Tv; - -namespace NzbDrone.Core.Extras.Metadata.Consumers.MediaBrowser -{ - public class MediaBrowserMetadata : MetadataBase - { - private readonly Logger _logger; - - public MediaBrowserMetadata( - Logger logger) - { - _logger = logger; - } - - public override string Name => "Emby (Legacy)"; - - public override MetadataFile FindMetadataFile(Series series, string path) - { - var filename = Path.GetFileName(path); - - if (filename == null) return null; - - var metadata = new MetadataFile - { - SeriesId = series.Id, - Consumer = GetType().Name, - RelativePath = series.Path.GetRelativePath(path) - }; - - if (filename.Equals("series.xml", StringComparison.InvariantCultureIgnoreCase)) - { - metadata.Type = MetadataType.SeriesMetadata; - return metadata; - } - - return null; - } - - public override MetadataFileResult SeriesMetadata(Series series) - { - if (!Settings.SeriesMetadata) - { - return null; - } - - _logger.Debug("Generating series.xml for: {0}", series.Title); - var sb = new StringBuilder(); - var xws = new XmlWriterSettings(); - xws.OmitXmlDeclaration = true; - xws.Indent = false; - - using (var xw = XmlWriter.Create(sb, xws)) - { - var tvShow = new XElement("Series"); - - tvShow.Add(new XElement("id", series.TvdbId)); - tvShow.Add(new XElement("Status", series.Status)); - tvShow.Add(new XElement("Network", series.Network)); - tvShow.Add(new XElement("Airs_Time", series.AirTime)); - - if (series.FirstAired.HasValue) - { - tvShow.Add(new XElement("FirstAired", series.FirstAired.Value.ToString("yyyy-MM-dd"))); - } - - tvShow.Add(new XElement("ContentRating", series.Certification)); - tvShow.Add(new XElement("Added", series.Added.ToString("MM/dd/yyyy HH:mm:ss tt"))); - tvShow.Add(new XElement("LockData", "false")); - tvShow.Add(new XElement("Overview", series.Overview)); - tvShow.Add(new XElement("LocalTitle", series.Title)); - - if (series.FirstAired.HasValue) - { - tvShow.Add(new XElement("PremiereDate", series.FirstAired.Value.ToString("yyyy-MM-dd"))); - } - - tvShow.Add(new XElement("Rating", series.Ratings.Value)); - tvShow.Add(new XElement("ProductionYear", series.Year)); - tvShow.Add(new XElement("RunningTime", series.Runtime)); - tvShow.Add(new XElement("IMDB", series.ImdbId)); - tvShow.Add(new XElement("TVRageId", series.TvRageId)); - tvShow.Add(new XElement("Genres", series.Genres.Select(genre => new XElement("Genre", genre)))); - - var persons = new XElement("Persons"); - - foreach (var person in series.Actors) - { - persons.Add(new XElement("Person", - new XElement("Name", person.Name), - new XElement("Type", "Actor"), - new XElement("Role", person.Character) - )); - } - - tvShow.Add(persons); - - - var doc = new XDocument(tvShow); - doc.Save(xw); - - _logger.Debug("Saving series.xml for {0}", series.Title); - - return new MetadataFileResult("series.xml", doc.ToString()); - } - } - - public override MetadataFileResult EpisodeMetadata(Series series, EpisodeFile episodeFile) - { - return null; - } - - public override List SeriesImages(Series series) - { - return new List(); - } - - public override List SeasonImages(Series series, Season season) - { - return new List(); - } - - public override List EpisodeImages(Series series, EpisodeFile episodeFile) - { - return new List(); - } - - private IEnumerable ProcessSeriesImages(Series series) - { - return new List(); - } - - private IEnumerable ProcessSeasonImages(Series series, Season season) - { - return new List(); - } - - private string GetEpisodeNfoFilename(string episodeFilePath) - { - return null; - } - - private string GetEpisodeImageFilename(string episodeFilePath) - { - return null; - } - } -} \ No newline at end of file diff --git a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs b/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs deleted file mode 100644 index 0f6265bc3..000000000 --- a/src/NzbDrone.Core/Extras/Metadata/Consumers/MediaBrowser/MediaBrowserMetadataSettings.cs +++ /dev/null @@ -1,34 +0,0 @@ -using FluentValidation; -using NzbDrone.Core.Annotations; -using NzbDrone.Core.ThingiProvider; -using NzbDrone.Core.Validation; - -namespace NzbDrone.Core.Extras.Metadata.Consumers.MediaBrowser -{ - public class MediaBrowserSettingsValidator : AbstractValidator - { - public MediaBrowserSettingsValidator() - { - } - } - - public class MediaBrowserMetadataSettings : IProviderConfig - { - private static readonly MediaBrowserSettingsValidator Validator = new MediaBrowserSettingsValidator(); - - public MediaBrowserMetadataSettings() - { - SeriesMetadata = true; - } - - [FieldDefinition(0, Label = "Series Metadata", Type = FieldType.Checkbox, HelpText = "series.xml")] - public bool SeriesMetadata { get; set; } - - public bool IsValid => true; - - public NzbDroneValidationResult Validate() - { - return new NzbDroneValidationResult(Validator.Validate(this)); - } - } -} diff --git a/src/NzbDrone.Core/NzbDrone.Core.csproj b/src/NzbDrone.Core/NzbDrone.Core.csproj index 93c112169..a985e359d 100644 --- a/src/NzbDrone.Core/NzbDrone.Core.csproj +++ b/src/NzbDrone.Core/NzbDrone.Core.csproj @@ -314,6 +314,7 @@ + @@ -907,8 +908,6 @@ - - @@ -1339,4 +1338,4 @@ --> - \ No newline at end of file +