From 2467ca966823d78737a268d2c3b3730bc3b286cc Mon Sep 17 00:00:00 2001 From: LukePulverenti Luke Pulverenti luke pulverenti Date: Mon, 10 Sep 2012 21:34:02 -0400 Subject: [PATCH] Moved some entities to the main project --- MediaBrowser.Api/ApiService.cs | 5 +- MediaBrowser.Api/HttpHandlers/AudioHandler.cs | 2 +- .../HttpHandlers/BaseMediaHandler.cs | 2 +- .../HttpHandlers/FavoriteStatusHandler.cs | 1 + MediaBrowser.Api/HttpHandlers/GenreHandler.cs | 2 +- .../HttpHandlers/GenresHandler.cs | 2 +- MediaBrowser.Api/HttpHandlers/ImageHandler.cs | 1 + MediaBrowser.Api/HttpHandlers/ItemHandler.cs | 2 +- .../HttpHandlers/ItemListHandler.cs | 2 +- .../MovieSpecialFeaturesHandler.cs | 4 +- .../HttpHandlers/PersonHandler.cs | 2 +- .../HttpHandlers/PlayedStatusHandler.cs | 1 + .../HttpHandlers/StudioHandler.cs | 2 +- .../HttpHandlers/StudiosHandler.cs | 2 +- .../HttpHandlers/UserAuthenticationHandler.cs | 2 +- MediaBrowser.Api/HttpHandlers/UserHandler.cs | 2 +- .../HttpHandlers/UserItemRatingHandler.cs | 1 + MediaBrowser.Api/HttpHandlers/VideoHandler.cs | 1 + MediaBrowser.Api/HttpHandlers/YearHandler.cs | 2 +- MediaBrowser.Api/HttpHandlers/YearsHandler.cs | 2 +- MediaBrowser.Common/Kernel/BaseKernel.cs | 15 +++-- MediaBrowser.Common/Logging/ThreadedLogger.cs | 2 - MediaBrowser.Common/Logging/TraceLogger.cs | 12 ++++ .../MediaBrowser.Common.csproj | 1 + .../Entities/Audio.cs | 2 +- .../Entities/BaseEntity.cs | 2 +- .../Entities/BaseItem.cs | 5 +- .../Entities/Folder.cs | 5 +- .../Entities/Genre.cs | 2 +- .../Entities/Movies/BoxSet.cs | 7 +++ .../Entities/Movies/Movie.cs | 2 +- .../Entities/Person.cs | 2 +- .../Entities/Studio.cs | 2 +- .../Entities/TV/Episode.cs | 2 +- .../Entities/TV/Season.cs | 2 +- .../Entities/TV/Series.cs | 2 +- .../Entities/User.cs | 2 +- .../Entities/UserItemData.cs | 0 MediaBrowser.Controller/Entities/Video.cs | 20 ++++++ .../Entities/Year.cs | 2 +- MediaBrowser.Controller/FFMpeg/FFProbe.cs | 8 +-- .../IO/DirectoryWatchers.cs | 4 +- MediaBrowser.Controller/Kernel.cs | 4 +- .../Library/ItemController.cs | 4 +- .../Library/ItemResolveEventArgs.cs | 6 +- .../MediaBrowser.Controller.csproj | 17 +++++ .../Providers/AudioInfoProvider.cs | 4 +- .../Providers/BaseItemXmlParser.cs | 3 +- .../Providers/BaseMetadataProvider.cs | 4 +- .../Providers/FolderProviderFromXml.cs | 4 +- .../ImageFromMediaLocationProvider.cs | 4 +- .../Providers/LocalTrailerProvider.cs | 4 +- .../Providers/Movies/MovieProviderFromXml.cs | 7 +-- .../Movies/MovieSpecialFeaturesProvider.cs | 6 +- .../EpisodeImageFromMediaLocationProvider.cs | 6 +- .../Providers/TV/EpisodeProviderFromXml.cs | 6 +- .../Providers/TV/EpisodeXmlParser.cs | 2 +- .../Providers/TV/SeriesProviderFromXml.cs | 6 +- .../Providers/TV/SeriesXmlParser.cs | 4 +- .../Providers/VideoInfoProvider.cs | 3 +- .../Resolvers/AudioResolver.cs | 4 +- .../Resolvers/BaseItemResolver.cs | 6 +- .../Resolvers/FolderResolver.cs | 4 +- .../Resolvers/Movies/BoxSetResolver.cs | 4 +- .../Resolvers/Movies/MovieResolver.cs | 5 +- .../Resolvers/TV/EpisodeResolver.cs | 4 +- .../Resolvers/TV/SeasonResolver.cs | 4 +- .../Resolvers/TV/SeriesResolver.cs | 4 +- .../Resolvers/VideoResolver.cs | 3 +- .../Entities/ItemSpecialCounts.cs | 43 +++++++++++++ MediaBrowser.Model/Entities/Movies/BoxSet.cs | 7 --- MediaBrowser.Model/Entities/Video.cs | 63 ------------------- MediaBrowser.Model/MediaBrowser.Model.csproj | 16 ----- 73 files changed, 212 insertions(+), 190 deletions(-) create mode 100644 MediaBrowser.Common/Logging/TraceLogger.cs rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Audio.cs (84%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/BaseEntity.cs (87%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/BaseItem.cs (94%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Folder.cs (96%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Genre.cs (52%) create mode 100644 MediaBrowser.Controller/Entities/Movies/BoxSet.cs rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Movies/Movie.cs (88%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Person.cs (88%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Studio.cs (53%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/TV/Episode.cs (50%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/TV/Season.cs (90%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/TV/Series.cs (81%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/User.cs (86%) rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/UserItemData.cs (100%) create mode 100644 MediaBrowser.Controller/Entities/Video.cs rename {MediaBrowser.Model => MediaBrowser.Controller}/Entities/Year.cs (52%) delete mode 100644 MediaBrowser.Model/Entities/Movies/BoxSet.cs delete mode 100644 MediaBrowser.Model/Entities/Video.cs diff --git a/MediaBrowser.Api/ApiService.cs b/MediaBrowser.Api/ApiService.cs index a439a88d2a..88af0f8134 100644 --- a/MediaBrowser.Api/ApiService.cs +++ b/MediaBrowser.Api/ApiService.cs @@ -1,8 +1,9 @@ using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.Movies; -using MediaBrowser.Model.Entities.TV; using System; using System.Collections.Generic; using System.Linq; diff --git a/MediaBrowser.Api/HttpHandlers/AudioHandler.cs b/MediaBrowser.Api/HttpHandlers/AudioHandler.cs index b2c0213d54..3d17a3d6a2 100644 --- a/MediaBrowser.Api/HttpHandlers/AudioHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/AudioHandler.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs index 6d52ea07d2..e87af76ea5 100644 --- a/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/BaseMediaHandler.cs @@ -2,7 +2,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; using System; using System.Collections.Generic; using System.Diagnostics; diff --git a/MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs b/MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs index 1c640e89ae..4125b940f1 100644 --- a/MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/FavoriteStatusHandler.cs @@ -1,4 +1,5 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs index 3be952d9d0..cd4d8b9438 100644 --- a/MediaBrowser.Api/HttpHandlers/GenreHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenreHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs index 70449a2356..0ff48761ca 100644 --- a/MediaBrowser.Api/HttpHandlers/GenresHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/GenresHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Linq; diff --git a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs index a00f5cb70e..c5949122fa 100644 --- a/MediaBrowser.Api/HttpHandlers/ImageHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ImageHandler.cs @@ -2,6 +2,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Entities; using System; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs index 024647d8a5..491f45446d 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemHandler.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; using System.Net; using System.Threading.Tasks; diff --git a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs index 9845a5b21e..bce018d3ef 100644 --- a/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/ItemListHandler.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs b/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs index 5b528b3feb..63426be47d 100644 --- a/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/MovieSpecialFeaturesHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.Movies; using System.ComponentModel.Composition; using System.Linq; using System.Net; diff --git a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs index 2089b9e74a..b91ccb9275 100644 --- a/MediaBrowser.Api/HttpHandlers/PersonHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PersonHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Net; diff --git a/MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs b/MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs index ae32b23daa..4fe790c801 100644 --- a/MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PlayedStatusHandler.cs @@ -1,4 +1,5 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs index c665d2523b..cf0b7d38d0 100644 --- a/MediaBrowser.Api/HttpHandlers/StudioHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudioHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs index 3f12df4f7b..f80bed0896 100644 --- a/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/StudiosHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Linq; diff --git a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs index b3867cde7a..fa9d975983 100644 --- a/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UserAuthenticationHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.Authentication; -using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; using System.Net; using System.Threading.Tasks; diff --git a/MediaBrowser.Api/HttpHandlers/UserHandler.cs b/MediaBrowser.Api/HttpHandlers/UserHandler.cs index 39ec9dec2c..5ccf3bb619 100644 --- a/MediaBrowser.Api/HttpHandlers/UserHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UserHandler.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; using System.Net; using System.Threading.Tasks; diff --git a/MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs b/MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs index 216bcac7fb..d040414088 100644 --- a/MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/UserItemRatingHandler.cs @@ -1,4 +1,5 @@ using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs index 3ca00f0d5d..4f8621ce7e 100644 --- a/MediaBrowser.Api/HttpHandlers/VideoHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/VideoHandler.cs @@ -1,5 +1,6 @@ using MediaBrowser.Common.Drawing; using MediaBrowser.Common.Net.Handlers; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; using MediaBrowser.Model.Entities; using System; diff --git a/MediaBrowser.Api/HttpHandlers/YearHandler.cs b/MediaBrowser.Api/HttpHandlers/YearHandler.cs index 5074979708..1bdedf0c63 100644 --- a/MediaBrowser.Api/HttpHandlers/YearHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Net; diff --git a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs index 852ffe2da4..c33464c4cc 100644 --- a/MediaBrowser.Api/HttpHandlers/YearsHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/YearsHandler.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller; +using MediaBrowser.Controller.Entities; using MediaBrowser.Model.DTO; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.Linq; diff --git a/MediaBrowser.Common/Kernel/BaseKernel.cs b/MediaBrowser.Common/Kernel/BaseKernel.cs index b409ba5827..3c8fff2128 100644 --- a/MediaBrowser.Common/Kernel/BaseKernel.cs +++ b/MediaBrowser.Common/Kernel/BaseKernel.cs @@ -9,6 +9,7 @@ using System; using System.Collections.Generic; using System.ComponentModel.Composition; using System.ComponentModel.Composition.Hosting; +using System.Diagnostics; using System.IO; using System.Linq; using System.Reflection; @@ -85,22 +86,18 @@ namespace MediaBrowser.Common.Kernel await ReloadComposableParts().ConfigureAwait(false); } - /// - /// Gets or sets the path to the current log file - /// - public static string LogFilePath { get; set; } - private void ReloadLogger() { DisposeLogger(); DateTime now = DateTime.Now; - LogFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log"); + string logFilePath = Path.Combine(ApplicationPaths.LogDirectoryPath, "log-" + now.ToString("dMyyyy") + "-" + now.Ticks + ".log"); - FileStream fs = new FileStream(LogFilePath, FileMode.Append, FileAccess.Write, FileShare.Read); + Trace.Listeners.Add(new TextWriterTraceListener(logFilePath)); + Trace.AutoFlush = true; - Logger.LoggerInstance = new StreamLogger(fs); + Logger.LoggerInstance = new TraceLogger(); } /// @@ -264,6 +261,8 @@ namespace MediaBrowser.Common.Kernel /// private void DisposeLogger() { + Trace.Listeners.Clear(); + if (Logger.LoggerInstance != null) { Logger.LoggerInstance.Dispose(); diff --git a/MediaBrowser.Common/Logging/ThreadedLogger.cs b/MediaBrowser.Common/Logging/ThreadedLogger.cs index 8713ac2248..f53b3d4260 100644 --- a/MediaBrowser.Common/Logging/ThreadedLogger.cs +++ b/MediaBrowser.Common/Logging/ThreadedLogger.cs @@ -1,7 +1,5 @@ using System; using System.Collections.Generic; -using System.Linq; -using System.Text; using System.Threading; namespace MediaBrowser.Common.Logging diff --git a/MediaBrowser.Common/Logging/TraceLogger.cs b/MediaBrowser.Common/Logging/TraceLogger.cs new file mode 100644 index 0000000000..d152f97806 --- /dev/null +++ b/MediaBrowser.Common/Logging/TraceLogger.cs @@ -0,0 +1,12 @@ +using System.Diagnostics; + +namespace MediaBrowser.Common.Logging +{ + public class TraceLogger : BaseLogger + { + protected override void LogEntry(LogRow row) + { + Trace.WriteLine(row.ToString()); + } + } +} diff --git a/MediaBrowser.Common/MediaBrowser.Common.csproj b/MediaBrowser.Common/MediaBrowser.Common.csproj index 1ea8ba4a47..9b801d9498 100644 --- a/MediaBrowser.Common/MediaBrowser.Common.csproj +++ b/MediaBrowser.Common/MediaBrowser.Common.csproj @@ -84,6 +84,7 @@ + diff --git a/MediaBrowser.Model/Entities/Audio.cs b/MediaBrowser.Controller/Entities/Audio.cs similarity index 84% rename from MediaBrowser.Model/Entities/Audio.cs rename to MediaBrowser.Controller/Entities/Audio.cs index fcf33dbebc..61e901dd22 100644 --- a/MediaBrowser.Model/Entities/Audio.cs +++ b/MediaBrowser.Controller/Entities/Audio.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class Audio : BaseItem { diff --git a/MediaBrowser.Model/Entities/BaseEntity.cs b/MediaBrowser.Controller/Entities/BaseEntity.cs similarity index 87% rename from MediaBrowser.Model/Entities/BaseEntity.cs rename to MediaBrowser.Controller/Entities/BaseEntity.cs index d8f557a31a..53b42da01d 100644 --- a/MediaBrowser.Model/Entities/BaseEntity.cs +++ b/MediaBrowser.Controller/Entities/BaseEntity.cs @@ -1,6 +1,6 @@ using System; -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { /// /// Provides a base entity for all of our types diff --git a/MediaBrowser.Model/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs similarity index 94% rename from MediaBrowser.Model/Entities/BaseItem.cs rename to MediaBrowser.Controller/Entities/BaseItem.cs index 51cb34a531..68a192065f 100644 --- a/MediaBrowser.Model/Entities/BaseItem.cs +++ b/MediaBrowser.Controller/Entities/BaseItem.cs @@ -1,8 +1,9 @@ -using System; +using MediaBrowser.Model.Entities; +using System; using System.Collections.Generic; using System.Linq; -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public abstract class BaseItem : BaseEntity, IHasProviderIds { diff --git a/MediaBrowser.Model/Entities/Folder.cs b/MediaBrowser.Controller/Entities/Folder.cs similarity index 96% rename from MediaBrowser.Model/Entities/Folder.cs rename to MediaBrowser.Controller/Entities/Folder.cs index ef05071385..a9c92c1fa4 100644 --- a/MediaBrowser.Model/Entities/Folder.cs +++ b/MediaBrowser.Controller/Entities/Folder.cs @@ -1,8 +1,9 @@ -using System; +using MediaBrowser.Model.Entities; +using System; using System.Collections.Generic; using System.Linq; -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class Folder : BaseItem { diff --git a/MediaBrowser.Model/Entities/Genre.cs b/MediaBrowser.Controller/Entities/Genre.cs similarity index 52% rename from MediaBrowser.Model/Entities/Genre.cs rename to MediaBrowser.Controller/Entities/Genre.cs index 0ac6c9e38c..ba343a2bc6 100644 --- a/MediaBrowser.Model/Entities/Genre.cs +++ b/MediaBrowser.Controller/Entities/Genre.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class Genre : BaseEntity { diff --git a/MediaBrowser.Controller/Entities/Movies/BoxSet.cs b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs new file mode 100644 index 0000000000..cb841530ee --- /dev/null +++ b/MediaBrowser.Controller/Entities/Movies/BoxSet.cs @@ -0,0 +1,7 @@ + +namespace MediaBrowser.Controller.Entities.Movies +{ + public class BoxSet : Folder + { + } +} diff --git a/MediaBrowser.Model/Entities/Movies/Movie.cs b/MediaBrowser.Controller/Entities/Movies/Movie.cs similarity index 88% rename from MediaBrowser.Model/Entities/Movies/Movie.cs rename to MediaBrowser.Controller/Entities/Movies/Movie.cs index 23203da94a..2d98fa06e8 100644 --- a/MediaBrowser.Model/Entities/Movies/Movie.cs +++ b/MediaBrowser.Controller/Entities/Movies/Movie.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.Linq; -namespace MediaBrowser.Model.Entities.Movies +namespace MediaBrowser.Controller.Entities.Movies { public class Movie : Video { diff --git a/MediaBrowser.Model/Entities/Person.cs b/MediaBrowser.Controller/Entities/Person.cs similarity index 88% rename from MediaBrowser.Model/Entities/Person.cs rename to MediaBrowser.Controller/Entities/Person.cs index 2bd383802d..a12b9e38e2 100644 --- a/MediaBrowser.Model/Entities/Person.cs +++ b/MediaBrowser.Controller/Entities/Person.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { /// /// This is the full Person object that can be retrieved with all of it's data. diff --git a/MediaBrowser.Model/Entities/Studio.cs b/MediaBrowser.Controller/Entities/Studio.cs similarity index 53% rename from MediaBrowser.Model/Entities/Studio.cs rename to MediaBrowser.Controller/Entities/Studio.cs index 16b0bc5373..b7c6e6aa43 100644 --- a/MediaBrowser.Model/Entities/Studio.cs +++ b/MediaBrowser.Controller/Entities/Studio.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class Studio : BaseEntity { diff --git a/MediaBrowser.Model/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs similarity index 50% rename from MediaBrowser.Model/Entities/TV/Episode.cs rename to MediaBrowser.Controller/Entities/TV/Episode.cs index b7c46fdc74..5d599fca7f 100644 --- a/MediaBrowser.Model/Entities/TV/Episode.cs +++ b/MediaBrowser.Controller/Entities/TV/Episode.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities.TV +namespace MediaBrowser.Controller.Entities.TV { public class Episode : Video { diff --git a/MediaBrowser.Model/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs similarity index 90% rename from MediaBrowser.Model/Entities/TV/Season.cs rename to MediaBrowser.Controller/Entities/TV/Season.cs index d63c68aa13..98ad31220f 100644 --- a/MediaBrowser.Model/Entities/TV/Season.cs +++ b/MediaBrowser.Controller/Entities/TV/Season.cs @@ -1,6 +1,6 @@ using System; -namespace MediaBrowser.Model.Entities.TV +namespace MediaBrowser.Controller.Entities.TV { public class Season : Folder { diff --git a/MediaBrowser.Model/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs similarity index 81% rename from MediaBrowser.Model/Entities/TV/Series.cs rename to MediaBrowser.Controller/Entities/TV/Series.cs index fd05f89004..7c228a53df 100644 --- a/MediaBrowser.Model/Entities/TV/Series.cs +++ b/MediaBrowser.Controller/Entities/TV/Series.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; -namespace MediaBrowser.Model.Entities.TV +namespace MediaBrowser.Controller.Entities.TV { public class Series : Folder { diff --git a/MediaBrowser.Model/Entities/User.cs b/MediaBrowser.Controller/Entities/User.cs similarity index 86% rename from MediaBrowser.Model/Entities/User.cs rename to MediaBrowser.Controller/Entities/User.cs index 3c6117fca8..01eadfafb2 100644 --- a/MediaBrowser.Model/Entities/User.cs +++ b/MediaBrowser.Controller/Entities/User.cs @@ -1,6 +1,6 @@ using System; -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class User : BaseEntity { diff --git a/MediaBrowser.Model/Entities/UserItemData.cs b/MediaBrowser.Controller/Entities/UserItemData.cs similarity index 100% rename from MediaBrowser.Model/Entities/UserItemData.cs rename to MediaBrowser.Controller/Entities/UserItemData.cs diff --git a/MediaBrowser.Controller/Entities/Video.cs b/MediaBrowser.Controller/Entities/Video.cs new file mode 100644 index 0000000000..8dd82fab99 --- /dev/null +++ b/MediaBrowser.Controller/Entities/Video.cs @@ -0,0 +1,20 @@ +using MediaBrowser.Model.Entities; +using System.Collections.Generic; + +namespace MediaBrowser.Controller.Entities +{ + public class Video : BaseItem + { + public VideoType VideoType { get; set; } + + public List Subtitles { get; set; } + public List AudioStreams { get; set; } + + public int Height { get; set; } + public int Width { get; set; } + public string ScanType { get; set; } + public float FrameRate { get; set; } + public int BitRate { get; set; } + public string Codec { get; set; } + } +} diff --git a/MediaBrowser.Model/Entities/Year.cs b/MediaBrowser.Controller/Entities/Year.cs similarity index 52% rename from MediaBrowser.Model/Entities/Year.cs rename to MediaBrowser.Controller/Entities/Year.cs index 359bb6aaf8..d0b29de56c 100644 --- a/MediaBrowser.Model/Entities/Year.cs +++ b/MediaBrowser.Controller/Entities/Year.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.Entities +namespace MediaBrowser.Controller.Entities { public class Year : BaseEntity { diff --git a/MediaBrowser.Controller/FFMpeg/FFProbe.cs b/MediaBrowser.Controller/FFMpeg/FFProbe.cs index da5e11c5b7..d4c07f07b0 100644 --- a/MediaBrowser.Controller/FFMpeg/FFProbe.cs +++ b/MediaBrowser.Controller/FFMpeg/FFProbe.cs @@ -1,10 +1,10 @@ -using System; +using MediaBrowser.Common.Logging; +using MediaBrowser.Common.Serialization; +using MediaBrowser.Controller.Entities; +using System; using System.Diagnostics; using System.IO; using System.Threading.Tasks; -using MediaBrowser.Common.Logging; -using MediaBrowser.Common.Serialization; -using MediaBrowser.Model.Entities; namespace MediaBrowser.Controller.FFMpeg { diff --git a/MediaBrowser.Controller/IO/DirectoryWatchers.cs b/MediaBrowser.Controller/IO/DirectoryWatchers.cs index 10d11385ee..837c02cb90 100644 --- a/MediaBrowser.Controller/IO/DirectoryWatchers.cs +++ b/MediaBrowser.Controller/IO/DirectoryWatchers.cs @@ -1,10 +1,10 @@ -using System; +using MediaBrowser.Controller.Entities; +using System; using System.Collections.Generic; using System.IO; using System.Linq; using System.Threading; using System.Threading.Tasks; -using MediaBrowser.Model.Entities; namespace MediaBrowser.Controller.IO { diff --git a/MediaBrowser.Controller/Kernel.cs b/MediaBrowser.Controller/Kernel.cs index f493d33002..47a3773b34 100644 --- a/MediaBrowser.Controller/Kernel.cs +++ b/MediaBrowser.Controller/Kernel.cs @@ -1,5 +1,7 @@ using MediaBrowser.Common.Kernel; using MediaBrowser.Common.Logging; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.Providers; @@ -7,8 +9,6 @@ using MediaBrowser.Controller.Resolvers; using MediaBrowser.Controller.Weather; using MediaBrowser.Model.Authentication; using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; using MediaBrowser.Model.Progress; using System; using System.Collections.Generic; diff --git a/MediaBrowser.Controller/Library/ItemController.cs b/MediaBrowser.Controller/Library/ItemController.cs index 2dae0de041..9e0c94b793 100644 --- a/MediaBrowser.Controller/Library/ItemController.cs +++ b/MediaBrowser.Controller/Library/ItemController.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.IO; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.IO; using System; using System.Collections.Concurrent; using System.Collections.Generic; diff --git a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs index bace0ca49f..5d207de13e 100644 --- a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs @@ -1,7 +1,7 @@ -using System; -using System.IO; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; -using MediaBrowser.Model.Entities; +using System; +using System.IO; namespace MediaBrowser.Controller.Library { diff --git a/MediaBrowser.Controller/MediaBrowser.Controller.csproj b/MediaBrowser.Controller/MediaBrowser.Controller.csproj index 1ebc384d4f..8d1f4965a0 100644 --- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj +++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj @@ -50,6 +50,7 @@ False ..\packages\Rx-Linq.2.0.20823\lib\Net45\System.Reactive.Linq.dll + @@ -57,6 +58,22 @@ + + + + + + + + + + + + + + + + diff --git a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs index 5c2f8dea2e..09cd80a210 100644 --- a/MediaBrowser.Controller/Providers/AudioInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/AudioInfoProvider.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.FFMpeg; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.FFMpeg; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs index 96bc47c8d2..a3b0d2c600 100644 --- a/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs +++ b/MediaBrowser.Controller/Providers/BaseItemXmlParser.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Xml; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Xml; using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; diff --git a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs index 3e3ec59bd9..bae1ff0f9c 100644 --- a/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs +++ b/MediaBrowser.Controller/Providers/BaseMetadataProvider.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using System.Threading.Tasks; namespace MediaBrowser.Controller.Providers diff --git a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs index 59ef9e5dfe..0f655cf0b9 100644 --- a/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/FolderProviderFromXml.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; using System.Threading.Tasks; diff --git a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs index 6c12dac174..6ccb6df7c1 100644 --- a/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Controller/Providers/ImageFromMediaLocationProvider.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs index 0359a10b20..4e6bcdef87 100644 --- a/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs +++ b/MediaBrowser.Controller/Providers/LocalTrailerProvider.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.IO; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs index 6432ebee8a..4f18cd5f91 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieProviderFromXml.cs @@ -1,7 +1,6 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Controller.Xml; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.Movies; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; using System.Threading.Tasks; diff --git a/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs b/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs index cb028602e4..2fb5caf8e2 100644 --- a/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs +++ b/MediaBrowser.Controller/Providers/Movies/MovieSpecialFeaturesProvider.cs @@ -1,7 +1,7 @@ -using MediaBrowser.Controller.IO; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.Movies; using System.Collections.Generic; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs index 10a7045192..8533d19d9e 100644 --- a/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs +++ b/MediaBrowser.Controller/Providers/TV/EpisodeImageFromMediaLocationProvider.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; using System.Linq; diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs index fc52646dfd..953eb1ec42 100644 --- a/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/TV/EpisodeProviderFromXml.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; using System.Threading.Tasks; diff --git a/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs b/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs index 06db12c970..fad1a04b4f 100644 --- a/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs +++ b/MediaBrowser.Controller/Providers/TV/EpisodeXmlParser.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities.TV; using System.IO; using System.Xml; diff --git a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs index aa1dc8aaa8..95f4f9adca 100644 --- a/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs +++ b/MediaBrowser.Controller/Providers/TV/SeriesProviderFromXml.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; using System.Threading.Tasks; diff --git a/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs b/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs index 8ef0ee853e..36c0a99efd 100644 --- a/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs +++ b/MediaBrowser.Controller/Providers/TV/SeriesXmlParser.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Model.Entities; using System; using System.Xml; diff --git a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs index e749165f8d..640d1b27f1 100644 --- a/MediaBrowser.Controller/Providers/VideoInfoProvider.cs +++ b/MediaBrowser.Controller/Providers/VideoInfoProvider.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.FFMpeg; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.FFMpeg; using MediaBrowser.Model.Entities; using System; using System.Collections.Generic; diff --git a/MediaBrowser.Controller/Resolvers/AudioResolver.cs b/MediaBrowser.Controller/Resolvers/AudioResolver.cs index c67bc0d4d7..8f10e45e50 100644 --- a/MediaBrowser.Controller/Resolvers/AudioResolver.cs +++ b/MediaBrowser.Controller/Resolvers/AudioResolver.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs index 1f5a6fe831..1508252ebb 100644 --- a/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs +++ b/MediaBrowser.Controller/Resolvers/BaseItemResolver.cs @@ -1,8 +1,8 @@ -using System; -using System.IO; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using System; +using System.IO; namespace MediaBrowser.Controller.Resolvers { diff --git a/MediaBrowser.Controller/Resolvers/FolderResolver.cs b/MediaBrowser.Controller/Resolvers/FolderResolver.cs index 6857c35742..028c85f862 100644 --- a/MediaBrowser.Controller/Resolvers/FolderResolver.cs +++ b/MediaBrowser.Controller/Resolvers/FolderResolver.cs @@ -1,6 +1,6 @@ -using System.ComponentModel.Composition; +using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities; +using System.ComponentModel.Composition; namespace MediaBrowser.Controller.Resolvers { diff --git a/MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs index ad18762af2..069068067f 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/BoxSetResolver.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities.Movies; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.Library; using System; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index 0f2e81b34e..ae30a63872 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs @@ -1,7 +1,8 @@ -using MediaBrowser.Controller.IO; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Entities.Movies; +using MediaBrowser.Controller.IO; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.Movies; using System.ComponentModel.Composition; namespace MediaBrowser.Controller.Resolvers.Movies diff --git a/MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs index 6d1261dfb0..0961edd1ac 100644 --- a/MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs +++ b/MediaBrowser.Controller/Resolvers/TV/EpisodeResolver.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; namespace MediaBrowser.Controller.Resolvers.TV diff --git a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs index 0bb880b787..3b54a1aff8 100644 --- a/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs +++ b/MediaBrowser.Controller/Resolvers/TV/SeasonResolver.cs @@ -1,5 +1,5 @@ -using MediaBrowser.Controller.Library; -using MediaBrowser.Model.Entities.TV; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs b/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs index dd82b14484..3c43e460c5 100644 --- a/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs +++ b/MediaBrowser.Controller/Resolvers/TV/SeriesResolver.cs @@ -1,6 +1,6 @@ -using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Entities.TV; +using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; -using MediaBrowser.Model.Entities.TV; using System; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Controller/Resolvers/VideoResolver.cs b/MediaBrowser.Controller/Resolvers/VideoResolver.cs index 90bc658b74..316c7798a1 100644 --- a/MediaBrowser.Controller/Resolvers/VideoResolver.cs +++ b/MediaBrowser.Controller/Resolvers/VideoResolver.cs @@ -1,4 +1,5 @@ -using MediaBrowser.Controller.Library; +using MediaBrowser.Controller.Entities; +using MediaBrowser.Controller.Library; using MediaBrowser.Model.Entities; using System.ComponentModel.Composition; using System.IO; diff --git a/MediaBrowser.Model/Entities/ItemSpecialCounts.cs b/MediaBrowser.Model/Entities/ItemSpecialCounts.cs index b57be6ca8b..a1b3c0b610 100644 --- a/MediaBrowser.Model/Entities/ItemSpecialCounts.cs +++ b/MediaBrowser.Model/Entities/ItemSpecialCounts.cs @@ -20,4 +20,47 @@ namespace MediaBrowser.Model.Entities [ProtoMember(4)] public decimal PlayedPercentage { get; set; } } + + [ProtoContract] + public class AudioStream + { + [ProtoMember(1)] + public string Codec { get; set; } + + [ProtoMember(2)] + public string Language { get; set; } + + [ProtoMember(3)] + public int BitRate { get; set; } + + [ProtoMember(4)] + public int Channels { get; set; } + + [ProtoMember(5)] + public int SampleRate { get; set; } + + [ProtoMember(6)] + public bool IsDefault { get; set; } + } + + [ProtoContract] + public class SubtitleStream + { + [ProtoMember(1)] + public string Language { get; set; } + + [ProtoMember(2)] + public bool IsDefault { get; set; } + + [ProtoMember(3)] + public bool IsForced { get; set; } + } + + public enum VideoType + { + VideoFile, + Iso, + DVD, + BluRay + } } diff --git a/MediaBrowser.Model/Entities/Movies/BoxSet.cs b/MediaBrowser.Model/Entities/Movies/BoxSet.cs deleted file mode 100644 index 35097fd613..0000000000 --- a/MediaBrowser.Model/Entities/Movies/BoxSet.cs +++ /dev/null @@ -1,7 +0,0 @@ - -namespace MediaBrowser.Model.Entities.Movies -{ - public class BoxSet : Folder - { - } -} diff --git a/MediaBrowser.Model/Entities/Video.cs b/MediaBrowser.Model/Entities/Video.cs deleted file mode 100644 index 27a9ab8211..0000000000 --- a/MediaBrowser.Model/Entities/Video.cs +++ /dev/null @@ -1,63 +0,0 @@ -using System.Collections.Generic; -using ProtoBuf; - -namespace MediaBrowser.Model.Entities -{ - public class Video : BaseItem - { - public VideoType VideoType { get; set; } - - public List Subtitles { get; set; } - public List AudioStreams { get; set; } - - public int Height { get; set; } - public int Width { get; set; } - public string ScanType { get; set; } - public float FrameRate { get; set; } - public int BitRate { get; set; } - public string Codec { get; set; } - } - - [ProtoContract] - public class AudioStream - { - [ProtoMember(1)] - public string Codec { get; set; } - - [ProtoMember(2)] - public string Language { get; set; } - - [ProtoMember(3)] - public int BitRate { get; set; } - - [ProtoMember(4)] - public int Channels { get; set; } - - [ProtoMember(5)] - public int SampleRate { get; set; } - - [ProtoMember(6)] - public bool IsDefault { get; set; } - } - - [ProtoContract] - public class SubtitleStream - { - [ProtoMember(1)] - public string Language { get; set; } - - [ProtoMember(2)] - public bool IsDefault { get; set; } - - [ProtoMember(3)] - public bool IsForced { get; set; } - } - - public enum VideoType - { - VideoFile, - Iso, - DVD, - BluRay - } -} diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index e39f59cf5e..37597aa42c 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -44,31 +44,15 @@ - - - - - - - - - - - - - - - -