diff --git a/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs b/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs index c6f11e5bbc..b608d831b3 100644 --- a/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs +++ b/MediaBrowser.Api/HttpHandlers/PlaybackCheckInHandler.cs @@ -3,7 +3,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Connectivity; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.ComponentModel.Composition; using System.Threading.Tasks; @@ -14,13 +14,13 @@ namespace MediaBrowser.Api.HttpHandlers /// Provides a handler to set played status for an item /// [Export(typeof(IHttpServerHandler))] - public class PlaybackCheckInHandler : BaseSerializationHandler + public class PlaybackCheckInHandler : BaseSerializationHandler { /// /// Gets the object to serialize. /// /// Task{DtoUserItemData}. - protected override async Task GetObjectToSerialize() + protected override async Task GetObjectToSerialize() { // Get the user var user = await this.GetCurrentUser().ConfigureAwait(false); diff --git a/MediaBrowser.Api/LibraryService.cs b/MediaBrowser.Api/LibraryService.cs index a8eb46105f..ee484b85d2 100644 --- a/MediaBrowser.Api/LibraryService.cs +++ b/MediaBrowser.Api/LibraryService.cs @@ -3,7 +3,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; @@ -38,7 +38,7 @@ namespace MediaBrowser.Api /// Class GetPerson /// [Route("/Library/Persons/{Name}", "GET")] - public class GetPerson : IReturn + public class GetPerson : IReturn { /// /// Gets or sets the name. @@ -51,7 +51,7 @@ namespace MediaBrowser.Api /// Class GetStudio /// [Route("/Library/Studios/{Name}", "GET")] - public class GetStudio : IReturn + public class GetStudio : IReturn { /// /// Gets or sets the name. @@ -64,7 +64,7 @@ namespace MediaBrowser.Api /// Class GetGenre /// [Route("/Library/Genres/{Name}", "GET")] - public class GetGenre : IReturn + public class GetGenre : IReturn { /// /// Gets or sets the name. @@ -77,7 +77,7 @@ namespace MediaBrowser.Api /// Class GetYear /// [Route("/Library/Years/{Year}", "GET")] - public class GetYear : IReturn + public class GetYear : IReturn { /// /// Gets or sets the year. diff --git a/MediaBrowser.Api/Streaming/AudioHandler.cs b/MediaBrowser.Api/Streaming/AudioHandler.cs index 685e17dbc4..b7d5afbb9a 100644 --- a/MediaBrowser.Api/Streaming/AudioHandler.cs +++ b/MediaBrowser.Api/Streaming/AudioHandler.cs @@ -2,7 +2,7 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Resolvers; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Collections.Generic; using System.ComponentModel.Composition; diff --git a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs index 417f1513c1..44a1ba10cb 100644 --- a/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs +++ b/MediaBrowser.Api/Streaming/BaseStreamingHandler.cs @@ -7,7 +7,7 @@ using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; using MediaBrowser.Model.Drawing; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using System; using System.ComponentModel; diff --git a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs index dc2a8fa666..7aea163af6 100644 --- a/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs +++ b/MediaBrowser.Api/Streaming/HlsAudioPlaylistHandler.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Net.Handlers; using MediaBrowser.Controller.Entities.Audio; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.ComponentModel.Composition; using System.Net; diff --git a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs index 709450bb23..795bcda692 100644 --- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs +++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs @@ -2,7 +2,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; @@ -100,7 +100,7 @@ namespace MediaBrowser.Api.UserLibrary /// The user. /// The fields. /// Task{DtoBaseItem}. - private async Task GetDto(Tuple> stub, User user, List fields) + private async Task GetDto(Tuple> stub, User user, List fields) { BaseItem item; diff --git a/MediaBrowser.Api/UserLibrary/ItemsService.cs b/MediaBrowser.Api/UserLibrary/ItemsService.cs index 764d099e71..166b2639a3 100644 --- a/MediaBrowser.Api/UserLibrary/ItemsService.cs +++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs @@ -3,7 +3,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; diff --git a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs index 09c39b5d39..c5d7e471d4 100644 --- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs +++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs @@ -4,7 +4,7 @@ using MediaBrowser.Controller; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using ServiceStack.ServiceHost; using System; @@ -22,7 +22,7 @@ namespace MediaBrowser.Api.UserLibrary /// [Route("/Users/{UserId}/Items/{Id}", "GET")] [Route("/Users/{UserId}/Items/Root", "GET")] - public class GetItem : IReturn + public class GetItem : IReturn { /// /// Gets or sets the user id. @@ -217,7 +217,7 @@ namespace MediaBrowser.Api.UserLibrary } [Route("/Users/{UserId}/Items/{Id}/LocalTrailers", "GET")] - public class GetLocalTrailers : IReturn> + public class GetLocalTrailers : IReturn> { /// /// Gets or sets the user id. @@ -233,7 +233,7 @@ namespace MediaBrowser.Api.UserLibrary } [Route("/Users/{UserId}/Items/{Id}/SpecialFeatures", "GET")] - public class GetSpecialFeatures : IReturn> + public class GetSpecialFeatures : IReturn> { /// /// Gets or sets the user id. diff --git a/MediaBrowser.Api/UserService.cs b/MediaBrowser.Api/UserService.cs index d5db2b6e87..79f703e840 100644 --- a/MediaBrowser.Api/UserService.cs +++ b/MediaBrowser.Api/UserService.cs @@ -3,7 +3,7 @@ using MediaBrowser.Common.Net; using MediaBrowser.Common.Serialization; using MediaBrowser.Controller; using MediaBrowser.Controller.Library; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; @@ -19,7 +19,7 @@ namespace MediaBrowser.Api /// Class GetUsers /// [Route("/Users", "GET")] - public class GetUsers : IReturn> + public class GetUsers : IReturn> { } @@ -27,7 +27,7 @@ namespace MediaBrowser.Api /// Class GetUser /// [Route("/Users/{Id}", "GET")] - public class GetUser : IReturn + public class GetUser : IReturn { /// /// Gets or sets the id. @@ -122,7 +122,7 @@ namespace MediaBrowser.Api /// Class CreateUser /// [Route("/Users", "POST")] - public class CreateUser : IRequiresRequestStream, IReturn + public class CreateUser : IRequiresRequestStream, IReturn { /// /// The raw Http Request Input Stream @@ -265,7 +265,7 @@ namespace MediaBrowser.Api var kernel = (Kernel)Kernel; - var dtoUser = JsonSerializer.DeserializeFromStream(request.RequestStream); + var dtoUser = JsonSerializer.DeserializeFromStream(request.RequestStream); var user = kernel.GetUserById(id); @@ -285,7 +285,7 @@ namespace MediaBrowser.Api { var kernel = (Kernel)Kernel; - var dtoUser = JsonSerializer.DeserializeFromStream(request.RequestStream); + var dtoUser = JsonSerializer.DeserializeFromStream(request.RequestStream); var newUser = kernel.UserManager.CreateUser(dtoUser.Name).Result; diff --git a/MediaBrowser.ApiInteraction/ApiClient.cs b/MediaBrowser.ApiInteraction/ApiClient.cs index 1d7216f59a..cecb6a30bb 100644 --- a/MediaBrowser.ApiInteraction/ApiClient.cs +++ b/MediaBrowser.ApiInteraction/ApiClient.cs @@ -1,5 +1,5 @@ using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Globalization; using MediaBrowser.Model.Logging; @@ -75,9 +75,9 @@ namespace MediaBrowser.ApiInteraction /// /// The id. /// The user id. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// id - public async Task GetItemAsync(string id, Guid userId) + public async Task GetItemAsync(string id, Guid userId) { if (string.IsNullOrEmpty(id)) { @@ -93,7 +93,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -128,9 +128,9 @@ namespace MediaBrowser.ApiInteraction /// Gets a BaseItem /// /// The user id. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// userId - public async Task GetRootFolderAsync(Guid userId) + public async Task GetRootFolderAsync(Guid userId) { if (userId == Guid.Empty) { @@ -141,21 +141,21 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } /// /// Gets all Users /// - /// Task{DtoUser[]}. - public async Task GetAllUsersAsync() + /// Task{UserDto[]}. + public async Task GetAllUsersAsync() { var url = GetApiUrl("Users"); using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -233,9 +233,9 @@ namespace MediaBrowser.ApiInteraction /// Gets a studio /// /// The name. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// userId - public async Task GetStudioAsync(string name) + public async Task GetStudioAsync(string name) { if (string.IsNullOrEmpty(name)) { @@ -246,7 +246,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -254,9 +254,9 @@ namespace MediaBrowser.ApiInteraction /// Gets a genre /// /// The name. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// userId - public async Task GetGenreAsync(string name) + public async Task GetGenreAsync(string name) { if (string.IsNullOrEmpty(name)) { @@ -267,7 +267,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -302,9 +302,9 @@ namespace MediaBrowser.ApiInteraction /// Gets a person /// /// The name. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// userId - public async Task GetPersonAsync(string name) + public async Task GetPersonAsync(string name) { if (string.IsNullOrEmpty(name)) { @@ -315,7 +315,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -323,15 +323,15 @@ namespace MediaBrowser.ApiInteraction /// Gets a year /// /// The year. - /// Task{DtoBaseItem}. + /// Task{BaseItemDto}. /// userId - public async Task GetYearAsync(int year) + public async Task GetYearAsync(int year) { var url = GetApiUrl("Library/Years/" + year); using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -438,9 +438,9 @@ namespace MediaBrowser.ApiInteraction /// Gets a user by id /// /// The id. - /// Task{DtoUser}. + /// Task{UserDto}. /// id - public async Task GetUserAsync(Guid id) + public async Task GetUserAsync(Guid id) { if (id == Guid.Empty) { @@ -451,7 +451,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -517,7 +517,7 @@ namespace MediaBrowser.ApiInteraction /// The item id. /// Task{ItemsResult}. /// query - public async Task GetLocalTrailersAsync(Guid userId, string itemId) + public async Task GetLocalTrailersAsync(Guid userId, string itemId) { if (userId == Guid.Empty) { @@ -532,7 +532,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -541,9 +541,9 @@ namespace MediaBrowser.ApiInteraction /// /// The user id. /// The item id. - /// Task{DtoBaseItem[]}. + /// Task{BaseItemDto[]}. /// userId - public async Task GetSpecialFeaturesAsync(Guid userId, string itemId) + public async Task GetSpecialFeaturesAsync(Guid userId, string itemId) { if (userId == Guid.Empty) { @@ -558,7 +558,7 @@ namespace MediaBrowser.ApiInteraction using (var stream = await GetSerializedStreamAsync(url).ConfigureAwait(false)) { - return DeserializeFromStream(stream); + return DeserializeFromStream(stream); } } @@ -658,7 +658,7 @@ namespace MediaBrowser.ApiInteraction /// The user id. /// Task{DtoUserItemData}. /// itemId - public Task ReportPlaybackStartAsync(string itemId, Guid userId) + public Task ReportPlaybackStartAsync(string itemId, Guid userId) { if (string.IsNullOrEmpty(itemId)) { @@ -677,7 +677,7 @@ namespace MediaBrowser.ApiInteraction var url = GetApiUrl("playbackcheckin", dict); - return PostAsync(url, new Dictionary()); + return PostAsync(url, new Dictionary()); } /// @@ -688,7 +688,7 @@ namespace MediaBrowser.ApiInteraction /// The position ticks. /// Task{DtoUserItemData}. /// itemId - public Task ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks) + public Task ReportPlaybackProgressAsync(string itemId, Guid userId, long? positionTicks) { if (string.IsNullOrEmpty(itemId)) { @@ -709,7 +709,7 @@ namespace MediaBrowser.ApiInteraction var url = GetApiUrl("playbackcheckin", dict); - return PostAsync(url, new Dictionary()); + return PostAsync(url, new Dictionary()); } /// @@ -720,7 +720,7 @@ namespace MediaBrowser.ApiInteraction /// The position ticks. /// Task{DtoUserItemData}. /// itemId - public Task ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks) + public Task ReportPlaybackStoppedAsync(string itemId, Guid userId, long? positionTicks) { if (string.IsNullOrEmpty(itemId)) { @@ -741,7 +741,7 @@ namespace MediaBrowser.ApiInteraction var url = GetApiUrl("playbackcheckin", dict); - return PostAsync(url, new Dictionary()); + return PostAsync(url, new Dictionary()); } /// @@ -776,7 +776,7 @@ namespace MediaBrowser.ApiInteraction /// if set to true [likes]. /// Task{DtoUserItemData}. /// itemId - public Task UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes) + public Task UpdateUserItemRatingAsync(string itemId, Guid userId, bool likes) { if (string.IsNullOrEmpty(itemId)) { @@ -794,7 +794,7 @@ namespace MediaBrowser.ApiInteraction var url = GetApiUrl("Users/" + userId + "/Items/" + itemId + "/Rating", dict); - return PostAsync(url, new Dictionary()); + return PostAsync(url, new Dictionary()); } /// diff --git a/MediaBrowser.ApiInteraction/BaseApiClient.cs b/MediaBrowser.ApiInteraction/BaseApiClient.cs index 67ae3da759..242fc23591 100644 --- a/MediaBrowser.ApiInteraction/BaseApiClient.cs +++ b/MediaBrowser.ApiInteraction/BaseApiClient.cs @@ -1,5 +1,5 @@ using MediaBrowser.Model.Connectivity; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Web; @@ -275,7 +275,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetImageUrl(DtoBaseItem item, ImageOptions options) + public string GetImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -331,7 +331,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// user - public string GetUserImageUrl(DtoUser user, ImageOptions options) + public string GetUserImageUrl(UserDto user, ImageOptions options) { if (user == null) { @@ -398,7 +398,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetPersonImageUrl(DtoBaseItem item, ImageOptions options) + public string GetPersonImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -441,7 +441,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetYearImageUrl(DtoBaseItem item, ImageOptions options) + public string GetYearImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -478,7 +478,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetGenreImageUrl(DtoBaseItem item, ImageOptions options) + public string GetGenreImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -521,7 +521,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetStudioImageUrl(DtoBaseItem item, ImageOptions options) + public string GetStudioImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -564,7 +564,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String[][]. /// item - public string[] GetBackdropImageUrls(DtoBaseItem item, ImageOptions options) + public string[] GetBackdropImageUrls(BaseItemDto item, ImageOptions options) { if (item == null) { @@ -617,7 +617,7 @@ namespace MediaBrowser.ApiInteraction /// The options. /// System.String. /// item - public string GetLogoImageUrl(DtoBaseItem item, ImageOptions options) + public string GetLogoImageUrl(BaseItemDto item, ImageOptions options) { if (item == null) { diff --git a/MediaBrowser.Controller/Library/DtoBuilder.cs b/MediaBrowser.Controller/Library/DtoBuilder.cs index 3fa438175a..6e0735a548 100644 --- a/MediaBrowser.Controller/Library/DtoBuilder.cs +++ b/MediaBrowser.Controller/Library/DtoBuilder.cs @@ -4,7 +4,7 @@ using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Entities.Movies; using MediaBrowser.Controller.Entities.TV; using MediaBrowser.Model.Drawing; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Logging; using System; @@ -34,7 +34,7 @@ namespace MediaBrowser.Controller.Library /// The fields. /// Task{DtoBaseItem}. /// item - public async static Task GetDtoBaseItem(BaseItem item, List fields) + public async static Task GetDtoBaseItem(BaseItem item, List fields) { if (item == null) { @@ -45,7 +45,7 @@ namespace MediaBrowser.Controller.Library throw new ArgumentNullException("fields"); } - var dto = new DtoBaseItem(); + var dto = new BaseItemDto(); var tasks = new List(); @@ -91,7 +91,7 @@ namespace MediaBrowser.Controller.Library /// The fields. /// Task{DtoBaseItem}. /// - public async static Task GetDtoBaseItem(BaseItem item, User user, List fields) + public async static Task GetDtoBaseItem(BaseItem item, User user, List fields) { if (item == null) { @@ -106,7 +106,7 @@ namespace MediaBrowser.Controller.Library throw new ArgumentNullException("fields"); } - var dto = new DtoBaseItem(); + var dto = new BaseItemDto(); var tasks = new List(); @@ -153,7 +153,7 @@ namespace MediaBrowser.Controller.Library /// The item. /// The user. /// The fields. - private static void AttachUserSpecificInfo(DtoBaseItem dto, BaseItem item, User user, List fields) + private static void AttachUserSpecificInfo(BaseItemDto dto, BaseItem item, User user, List fields) { dto.IsNew = item.IsRecentlyAdded(user); @@ -192,7 +192,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// Task. - private static async Task AttachPrimaryImageAspectRatio(DtoBaseItem dto, BaseItem item) + private static async Task AttachPrimaryImageAspectRatio(BaseItemDto dto, BaseItem item) { var path = item.PrimaryImagePath; @@ -234,7 +234,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// The fields. - private static void AttachBasicFields(DtoBaseItem dto, BaseItem item, List fields) + private static void AttachBasicFields(BaseItemDto dto, BaseItem item, List fields) { if (fields.Contains(ItemFields.DateCreated)) { @@ -467,7 +467,7 @@ namespace MediaBrowser.Controller.Library /// The folder. /// The user. /// The dto. - private static void SetSpecialCounts(Folder folder, User user, DtoBaseItem dto) + private static void SetSpecialCounts(Folder folder, User user, BaseItemDto dto) { var utcNow = DateTime.UtcNow; @@ -555,7 +555,7 @@ namespace MediaBrowser.Controller.Library /// The dto. /// The item. /// Task. - private static async Task AttachPeople(DtoBaseItem dto, BaseItem item) + private static async Task AttachPeople(BaseItemDto dto, BaseItem item) { if (item.People == null) { @@ -675,14 +675,14 @@ namespace MediaBrowser.Controller.Library /// The data. /// DtoUserItemData. /// - public static DtoUserItemData GetDtoUserItemData(UserItemData data) + public static UserItemDataDto GetDtoUserItemData(UserItemData data) { if (data == null) { throw new ArgumentNullException(); } - return new DtoUserItemData + return new UserItemDataDto { IsFavorite = data.IsFavorite, Likes = data.Likes, @@ -786,14 +786,14 @@ namespace MediaBrowser.Controller.Library /// The user. /// DtoUser. /// user - public static DtoUser GetDtoUser(User user) + public static UserDto GetDtoUser(User user) { if (user == null) { throw new ArgumentNullException("user"); } - var dto = new DtoUser + var dto = new UserDto { Id = user.Id, Name = user.Name, diff --git a/MediaBrowser.Model/DTO/DTOBaseItem.cs b/MediaBrowser.Model/DTO/BaseItemDto.cs similarity index 99% rename from MediaBrowser.Model/DTO/DTOBaseItem.cs rename to MediaBrowser.Model/DTO/BaseItemDto.cs index e860b3ac10..416e9fc132 100644 --- a/MediaBrowser.Model/DTO/DTOBaseItem.cs +++ b/MediaBrowser.Model/DTO/BaseItemDto.cs @@ -5,14 +5,14 @@ using System; using System.Collections.Generic; using System.Runtime.Serialization; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// This is strictly used as a data transfer object from the api layer. /// This holds information about a BaseItem in a format that is convenient for the client. /// [ProtoContract] - public class DtoBaseItem : IHasProviderIds, INotifyPropertyChanged + public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged { /// /// Gets or sets the name. @@ -229,7 +229,7 @@ namespace MediaBrowser.Model.DTO /// /// The user data. [ProtoMember(36)] - public DtoUserItemData UserData { get; set; } + public UserItemDataDto UserData { get; set; } /// /// Gets or sets a value indicating whether this instance is new. diff --git a/MediaBrowser.Model/DTO/BaseItemPerson.cs b/MediaBrowser.Model/DTO/BaseItemPerson.cs index 442dfa8a41..2bdca84c1c 100644 --- a/MediaBrowser.Model/DTO/BaseItemPerson.cs +++ b/MediaBrowser.Model/DTO/BaseItemPerson.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel; using System.Runtime.Serialization; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// This is used by the api to get information about a Person within a BaseItem diff --git a/MediaBrowser.Model/DTO/ChapterInfoDto.cs b/MediaBrowser.Model/DTO/ChapterInfoDto.cs index 89c5b53be9..c52f1cadc9 100644 --- a/MediaBrowser.Model/DTO/ChapterInfoDto.cs +++ b/MediaBrowser.Model/DTO/ChapterInfoDto.cs @@ -3,7 +3,7 @@ using System; using System.ComponentModel; using System.Runtime.Serialization; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Class ChapterInfo diff --git a/MediaBrowser.Model/DTO/ImageOptions.cs b/MediaBrowser.Model/DTO/ImageOptions.cs index 803ad59878..6b85cb78f4 100644 --- a/MediaBrowser.Model/DTO/ImageOptions.cs +++ b/MediaBrowser.Model/DTO/ImageOptions.cs @@ -2,7 +2,7 @@ using System; using MediaBrowser.Model.Entities; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Class ImageOptions diff --git a/MediaBrowser.Model/DTO/ItemFields.cs b/MediaBrowser.Model/DTO/ItemFields.cs index 9badf9ca97..a24c8a8f01 100644 --- a/MediaBrowser.Model/DTO/ItemFields.cs +++ b/MediaBrowser.Model/DTO/ItemFields.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Used to control the data that gets attached to DtoBaseItems diff --git a/MediaBrowser.Model/DTO/ItemFilter.cs b/MediaBrowser.Model/DTO/ItemFilter.cs index a282bbbe0b..cdf3900201 100644 --- a/MediaBrowser.Model/DTO/ItemFilter.cs +++ b/MediaBrowser.Model/DTO/ItemFilter.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Enum ItemFilter diff --git a/MediaBrowser.Model/DTO/ItemQuery.cs b/MediaBrowser.Model/DTO/ItemQuery.cs index dd2fef79e8..6d64a093bc 100644 --- a/MediaBrowser.Model/DTO/ItemQuery.cs +++ b/MediaBrowser.Model/DTO/ItemQuery.cs @@ -1,7 +1,7 @@ using MediaBrowser.Model.Entities; using System; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Contains all the possible parameters that can be used to query for items diff --git a/MediaBrowser.Model/DTO/ItemSortBy.cs b/MediaBrowser.Model/DTO/ItemSortBy.cs index 13d0c2e1fd..30cd1c3a45 100644 --- a/MediaBrowser.Model/DTO/ItemSortBy.cs +++ b/MediaBrowser.Model/DTO/ItemSortBy.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Enum ItemSortBy diff --git a/MediaBrowser.Model/DTO/ItemsResult.cs b/MediaBrowser.Model/DTO/ItemsResult.cs index e155136d41..623e04fdd2 100644 --- a/MediaBrowser.Model/DTO/ItemsResult.cs +++ b/MediaBrowser.Model/DTO/ItemsResult.cs @@ -1,6 +1,6 @@ using ProtoBuf; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Represents the result of a query for items @@ -13,7 +13,7 @@ namespace MediaBrowser.Model.DTO /// /// The items. [ProtoMember(1)] - public DtoBaseItem[] Items { get; set; } + public BaseItemDto[] Items { get; set; } /// /// The total number of records available diff --git a/MediaBrowser.Model/DTO/MediaType.cs b/MediaBrowser.Model/DTO/MediaType.cs index 6ea730816e..eae97e6163 100644 --- a/MediaBrowser.Model/DTO/MediaType.cs +++ b/MediaBrowser.Model/DTO/MediaType.cs @@ -1,5 +1,5 @@  -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Enum MediaType diff --git a/MediaBrowser.Model/DTO/StreamOptions.cs b/MediaBrowser.Model/DTO/StreamOptions.cs index fac12220a2..0191e25a91 100644 --- a/MediaBrowser.Model/DTO/StreamOptions.cs +++ b/MediaBrowser.Model/DTO/StreamOptions.cs @@ -1,4 +1,4 @@ -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Class VideoStreamOptions diff --git a/MediaBrowser.Model/DTO/DTOUser.cs b/MediaBrowser.Model/DTO/UserDto.cs similarity index 95% rename from MediaBrowser.Model/DTO/DTOUser.cs rename to MediaBrowser.Model/DTO/UserDto.cs index 77627f86b0..cfdba14fbe 100644 --- a/MediaBrowser.Model/DTO/DTOUser.cs +++ b/MediaBrowser.Model/DTO/UserDto.cs @@ -4,13 +4,13 @@ using ProtoBuf; using System; using System.Runtime.Serialization; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// - /// Class DtoUser + /// Class UserDto /// [ProtoContract] - public class DtoUser : INotifyPropertyChanged + public class UserDto : INotifyPropertyChanged { /// /// Gets or sets the name. diff --git a/MediaBrowser.Model/DTO/DTOUserItemData.cs b/MediaBrowser.Model/DTO/UserItemDataDto.cs similarity index 91% rename from MediaBrowser.Model/DTO/DTOUserItemData.cs rename to MediaBrowser.Model/DTO/UserItemDataDto.cs index 8d24316d01..bcfbce49ef 100644 --- a/MediaBrowser.Model/DTO/DTOUserItemData.cs +++ b/MediaBrowser.Model/DTO/UserItemDataDto.cs @@ -1,13 +1,13 @@ using System.ComponentModel; using ProtoBuf; -namespace MediaBrowser.Model.DTO +namespace MediaBrowser.Model.Dto { /// /// Class DtoUserItemData /// [ProtoContract] - public class DtoUserItemData : INotifyPropertyChanged + public class UserItemDataDto : INotifyPropertyChanged { /// /// Gets or sets the rating. @@ -38,14 +38,14 @@ namespace MediaBrowser.Model.DTO public bool IsFavorite { get; set; } /// - /// Gets or sets a value indicating whether this is likes. + /// Gets or sets a value indicating whether this is likes. /// /// null if [likes] contains no value, true if [likes]; otherwise, false. [ProtoMember(5)] public bool? Likes { get; set; } /// - /// Gets or sets a value indicating whether this is played. + /// Gets or sets a value indicating whether this is played. /// /// true if played; otherwise, false. [ProtoMember(6)] diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj index a9c3fcfece..804228b351 100644 --- a/MediaBrowser.Model/MediaBrowser.Model.csproj +++ b/MediaBrowser.Model/MediaBrowser.Model.csproj @@ -76,11 +76,11 @@ - + - - + + diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/BaseItemTile.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/BaseItemTile.xaml.cs index 7789584ed7..690a539f81 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/BaseItemTile.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/BaseItemTile.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI; using MediaBrowser.UI.Controls; @@ -28,7 +28,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls /// Gets the item. /// /// The item. - private DtoBaseItem Item + private BaseItemDto Item { get { return ViewModel.Item; } } diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/BaseDetailsControl.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/BaseDetailsControl.cs index 66dbb9c987..530788aead 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/BaseDetailsControl.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/BaseDetailsControl.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Controls; namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details @@ -19,12 +19,12 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details /// /// The _item /// - private DtoBaseItem _item; + private BaseItemDto _item; /// /// Gets or sets the item. /// /// The item. - public DtoBaseItem Item + public BaseItemDto Item { get { return _item; } diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemChapters.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemChapters.xaml.cs index 196b92b699..d9f40b0149 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemChapters.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemChapters.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Controller; using MediaBrowser.UI.Controls; using MediaBrowser.UI.Playback; @@ -35,7 +35,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details UIKernel.Instance.PlaybackManager.Play(new PlayOptions { - Items = new List { Item }, + Items = new List { Item }, StartPositionTicks = chapterViewModel.Chapter.StartPositionTicks }); } diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemGallery.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemGallery.xaml.cs index d0fa85bf20..c315a0f7fa 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemGallery.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemGallery.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.UI; @@ -101,7 +101,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details /// /// The item. /// List{System.String}. - internal static List GetImages(DtoBaseItem item) + internal static List GetImages(BaseItemDto item) { var images = new List { }; diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemOverview.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemOverview.xaml.cs index 1654c2c7b6..3c1eb52ec3 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemOverview.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemOverview.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Linq; using System.Windows; diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemPerformers.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemPerformers.xaml.cs index 9ad5fdcac3..0ea9a052e7 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemPerformers.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemPerformers.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI; using MediaBrowser.UI.Controller; using MediaBrowser.UI.ViewModels; diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemSpecialFeatures.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemSpecialFeatures.xaml.cs index 46b9ac3119..d62c6d157e 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemSpecialFeatures.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemSpecialFeatures.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI; using MediaBrowser.UI.Controller; @@ -36,7 +36,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details UIKernel.Instance.PlaybackManager.Play(new PlayOptions { - Items = new List { viewModel.Item } + Items = new List { viewModel.Item } }); } @@ -45,7 +45,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details /// protected override async void OnItemChanged() { - DtoBaseItem[] result; + BaseItemDto[] result; try { @@ -58,7 +58,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details return; } - var resultItems = result ?? new DtoBaseItem[] { }; + var resultItems = result ?? new BaseItemDto[] { }; const int height = 297; var aspectRatio = DtoBaseItemViewModel.GetAveragePrimaryImageAspectRatio(resultItems); diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemTrailers.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemTrailers.xaml.cs index e8134b634e..9d92aafbb1 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemTrailers.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/Details/ItemTrailers.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI; using MediaBrowser.UI.Controller; @@ -36,7 +36,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details UIKernel.Instance.PlaybackManager.Play(new PlayOptions { - Items = new List { viewModel.Item } + Items = new List { viewModel.Item } }); } @@ -45,7 +45,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details /// protected override async void OnItemChanged() { - DtoBaseItem[] result; + BaseItemDto[] result; try { @@ -58,7 +58,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls.Details return; } - var resultItems = result ?? new DtoBaseItem[] { }; + var resultItems = result ?? new BaseItemDto[] { }; const int height = 297; var aspectRatio = DtoBaseItemViewModel.GetAveragePrimaryImageAspectRatio(resultItems); diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/HomePageTile.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/HomePageTile.xaml.cs index a8e2386819..9753851fac 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/HomePageTile.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/HomePageTile.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.UI; @@ -27,7 +27,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls /// Gets the item. /// /// The item. - private DtoBaseItem Item + private BaseItemDto Item { get { return ViewModel.Item; } } diff --git a/MediaBrowser.Plugins.DefaultTheme/Controls/MultiItemTile.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Controls/MultiItemTile.xaml.cs index 66a30bffff..51339647a7 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Controls/MultiItemTile.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Controls/MultiItemTile.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.UI; @@ -179,7 +179,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Controls /// /// The item. /// Uri. - private string GetImageSource(DtoBaseItem item) + private string GetImageSource(BaseItemDto item) { if (item != null) { diff --git a/MediaBrowser.Plugins.DefaultTheme/Pages/DetailPage.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Pages/DetailPage.xaml.cs index 4efb615942..e907ca6a05 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Pages/DetailPage.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Pages/DetailPage.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.Plugins.DefaultTheme.Controls.Details; diff --git a/MediaBrowser.Plugins.DefaultTheme/Pages/HomePage.xaml.cs b/MediaBrowser.Plugins.DefaultTheme/Pages/HomePage.xaml.cs index 922f5e870f..719a31f34e 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Pages/HomePage.xaml.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Pages/HomePage.xaml.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.Plugins.DefaultTheme.Resources; @@ -192,7 +192,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages } else { - SetResumableItems(new DtoBaseItem[] { }); + SetResumableItems(new BaseItemDto[] { }); } // Recently Added Items @@ -202,7 +202,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages } else { - SetRecentlyAddedItems(new DtoBaseItem[] { }); + SetRecentlyAddedItems(new BaseItemDto[] { }); } // Recently Played Items @@ -212,7 +212,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages } else { - SetRecentlyPlayedItems(new DtoBaseItem[] { }); + SetRecentlyPlayedItems(new BaseItemDto[] { }); } tasks.Add(RefreshTopPicksAsync()); @@ -407,7 +407,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages /// Sets the favorite items. /// /// The items. - private void SetFavoriteItems(DtoBaseItem[] items) + private void SetFavoriteItems(BaseItemDto[] items) { FavoriteItems = new ItemCollectionViewModel { Items = items, Name = "Favorites" }; } @@ -416,7 +416,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages /// Sets the resumable items. /// /// The items. - private void SetResumableItems(DtoBaseItem[] items) + private void SetResumableItems(BaseItemDto[] items) { ResumableItems = new ItemCollectionViewModel { Items = items, Name = "Resume" }; } @@ -425,7 +425,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages /// Sets the recently played items. /// /// The items. - private void SetRecentlyPlayedItems(DtoBaseItem[] items) + private void SetRecentlyPlayedItems(BaseItemDto[] items) { RecentlyPlayedItems = new ItemCollectionViewModel { Items = items, Name = "Recently Played" }; } @@ -434,7 +434,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Pages /// Sets the recently added items. /// /// The items. - private void SetRecentlyAddedItems(DtoBaseItem[] items) + private void SetRecentlyAddedItems(BaseItemDto[] items) { RecentlyAddedItems = new ItemCollectionViewModel { Items = items, Name = "Recently Added" }; } diff --git a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs index 549fad481d..81ed462174 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.cs @@ -1,5 +1,5 @@ using System.Threading.Tasks; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI; using MediaBrowser.UI.Controller; @@ -162,7 +162,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Resources /// Sets the page title. /// /// The item. - public async Task SetPageTitle(DtoBaseItem item) + public async Task SetPageTitle(BaseItemDto item) { if (item.HasLogo || !string.IsNullOrEmpty(item.ParentLogoItemId)) { @@ -193,7 +193,7 @@ namespace MediaBrowser.Plugins.DefaultTheme.Resources /// Sets the page title text. /// /// The item. - private void SetPageTitleText(DtoBaseItem item) + private void SetPageTitleText(BaseItemDto item) { SetPageTitle(item.SeriesName ?? item.Album ?? item.Name); } diff --git a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.xaml b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.xaml index 89261bbd1d..8a8d0ceaa4 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.xaml +++ b/MediaBrowser.Plugins.DefaultTheme/Resources/AppResources.xaml @@ -1,11 +1,11 @@  @@ -45,7 +45,7 @@ #ffffff - + diff --git a/MediaBrowser.Plugins.DefaultTheme/Theme.cs b/MediaBrowser.Plugins.DefaultTheme/Theme.cs index c855bc1a20..f8d6d87241 100644 --- a/MediaBrowser.Plugins.DefaultTheme/Theme.cs +++ b/MediaBrowser.Plugins.DefaultTheme/Theme.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Plugins.DefaultTheme.Pages; using MediaBrowser.Plugins.DefaultTheme.Resources; using MediaBrowser.UI; @@ -21,7 +21,7 @@ namespace MediaBrowser.Plugins.DefaultTheme /// /// The item. /// Page. - public override Page GetDetailPage(DtoBaseItem item) + public override Page GetDetailPage(BaseItemDto item) { return new DetailPage(item.Id); } @@ -31,7 +31,7 @@ namespace MediaBrowser.Plugins.DefaultTheme /// /// The item. /// Page. - public override Page GetListPage(DtoBaseItem item) + public override Page GetListPage(BaseItemDto item) { return new ListPage(item.Id); } diff --git a/MediaBrowser.Plugins.MpcHc/MpcHcMediaPlayer.cs b/MediaBrowser.Plugins.MpcHc/MpcHcMediaPlayer.cs index bbeff22063..baad046dd1 100644 --- a/MediaBrowser.Plugins.MpcHc/MpcHcMediaPlayer.cs +++ b/MediaBrowser.Plugins.MpcHc/MpcHcMediaPlayer.cs @@ -1,5 +1,5 @@ using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.UI.Configuration; using MediaBrowser.UI.Controller; @@ -122,7 +122,7 @@ namespace MediaBrowser.Plugins.MpcHc /// /// The item. /// true if this instance can play the specified item; otherwise, false. - public override bool CanPlay(DtoBaseItem item) + public override bool CanPlay(BaseItemDto item) { return item.IsVideo || item.IsAudio; } @@ -134,7 +134,7 @@ namespace MediaBrowser.Plugins.MpcHc /// The options. /// The player configuration. /// System.String. - protected override string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected override string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { var formatString = "{0} /play /fullscreen /close"; @@ -160,7 +160,7 @@ namespace MediaBrowser.Plugins.MpcHc /// /// The item. /// System.String. - protected override string GetPathForCommandLine(DtoBaseItem item) + protected override string GetPathForCommandLine(BaseItemDto item) { var path = base.GetPathForCommandLine(item); diff --git a/MediaBrowser.Plugins.Tmt5/Tmt5MediaPlayer.cs b/MediaBrowser.Plugins.Tmt5/Tmt5MediaPlayer.cs index 96b1a83d4a..fc6b4e37f2 100644 --- a/MediaBrowser.Plugins.Tmt5/Tmt5MediaPlayer.cs +++ b/MediaBrowser.Plugins.Tmt5/Tmt5MediaPlayer.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.IO; using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Configuration; using MediaBrowser.UI.Playback; using MediaBrowser.UI.Playback.ExternalPlayer; @@ -124,7 +124,7 @@ namespace MediaBrowser.Plugins.Tmt5 /// /// The item. /// true if this instance can play the specified item; otherwise, false. - public override bool CanPlay(DtoBaseItem item) + public override bool CanPlay(BaseItemDto item) { return item.IsVideo || item.IsAudio; } @@ -150,7 +150,7 @@ namespace MediaBrowser.Plugins.Tmt5 /// The options. /// The player configuration. /// System.String. - protected override string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected override string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { return "\"" + items[0].Path + "\""; } diff --git a/MediaBrowser.UI/App.xaml.cs b/MediaBrowser.UI/App.xaml.cs index bc68df234f..16795b08ad 100644 --- a/MediaBrowser.UI/App.xaml.cs +++ b/MediaBrowser.UI/App.xaml.cs @@ -6,7 +6,7 @@ using MediaBrowser.Common.Logging; using MediaBrowser.Common.UI; using MediaBrowser.IsoMounter; using MediaBrowser.Model.Configuration; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.Model.Weather; using MediaBrowser.UI.Controller; @@ -114,12 +114,12 @@ namespace MediaBrowser.UI /// /// The _current user /// - private DtoUser _currentUser; + private UserDto _currentUser; /// /// Gets or sets the current user. /// /// The current user. - public DtoUser CurrentUser + public UserDto CurrentUser { get { @@ -545,7 +545,7 @@ namespace MediaBrowser.UI /// Navigates to item. /// /// The item. - public void NavigateToItem(DtoBaseItem item) + public void NavigateToItem(BaseItemDto item) { if (item.IsRoot.HasValue && item.IsRoot.Value) { diff --git a/MediaBrowser.UI/Controller/BaseTheme.cs b/MediaBrowser.UI/Controller/BaseTheme.cs index 7d88f93a04..bcf882f689 100644 --- a/MediaBrowser.UI/Controller/BaseTheme.cs +++ b/MediaBrowser.UI/Controller/BaseTheme.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Collections.Generic; using System.Windows; @@ -22,13 +22,13 @@ namespace MediaBrowser.UI.Controller /// /// The item. /// Page. - public abstract Page GetListPage(DtoBaseItem item); + public abstract Page GetListPage(BaseItemDto item); /// /// Gets the detail page. /// /// The item. /// Page. - public abstract Page GetDetailPage(DtoBaseItem item); + public abstract Page GetDetailPage(BaseItemDto item); /// /// Gets the home page. /// diff --git a/MediaBrowser.UI/Converters/BaseItemImageVisibilityConverter.cs b/MediaBrowser.UI/Converters/BaseItemImageVisibilityConverter.cs index 55a90a0b80..6e69326fcf 100644 --- a/MediaBrowser.UI/Converters/BaseItemImageVisibilityConverter.cs +++ b/MediaBrowser.UI/Converters/BaseItemImageVisibilityConverter.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using System; using System.Windows; @@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Converters /// A converted value. If the method returns null, the valid null value is used. public object Convert(object value, Type targetType, object parameter, System.Globalization.CultureInfo culture) { - var item = value as DtoBaseItem; + var item = value as BaseItemDto; if (item != null) { @@ -45,7 +45,7 @@ namespace MediaBrowser.UI.Converters /// The type. /// if set to true [reverse]. /// Visibility. - private Visibility GetVisibility(DtoBaseItem item, ImageType type, bool reverse) + private Visibility GetVisibility(BaseItemDto item, ImageType type, bool reverse) { var hasImageVisibility = reverse ? Visibility.Collapsed : Visibility.Visible; var hasNoImageVisibility = reverse ? Visibility.Visible : Visibility.Collapsed; diff --git a/MediaBrowser.UI/Converters/LastSeenTextConverter.cs b/MediaBrowser.UI/Converters/LastSeenTextConverter.cs index d8056a1e20..13e6c54b96 100644 --- a/MediaBrowser.UI/Converters/LastSeenTextConverter.cs +++ b/MediaBrowser.UI/Converters/LastSeenTextConverter.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Globalization; using System.Windows.Data; @@ -9,7 +9,7 @@ namespace MediaBrowser.UI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var user = value as DtoUser; + var user = value as UserDto; if (user != null) { diff --git a/MediaBrowser.UI/Converters/UserImageConverter.cs b/MediaBrowser.UI/Converters/UserImageConverter.cs index 9101c5c46b..f979107c88 100644 --- a/MediaBrowser.UI/Converters/UserImageConverter.cs +++ b/MediaBrowser.UI/Converters/UserImageConverter.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using System; using System.Globalization; @@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Converters /// A converted value. If the method returns null, the valid null value is used. public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var user = value as DtoUser; + var user = value as UserDto; if (user != null && user.HasPrimaryImage) { diff --git a/MediaBrowser.UI/Converters/WatchedVisibilityConverter.cs b/MediaBrowser.UI/Converters/WatchedVisibilityConverter.cs index 485386ae91..797bb54880 100644 --- a/MediaBrowser.UI/Converters/WatchedVisibilityConverter.cs +++ b/MediaBrowser.UI/Converters/WatchedVisibilityConverter.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Globalization; using System.Windows; @@ -10,7 +10,7 @@ namespace MediaBrowser.UI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var item = value as DtoBaseItem; + var item = value as BaseItemDto; if (item == null) { @@ -40,7 +40,7 @@ namespace MediaBrowser.UI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var item = value as DtoBaseItem; + var item = value as BaseItemDto; if (item == null) { @@ -65,7 +65,7 @@ namespace MediaBrowser.UI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var item = value as DtoBaseItem; + var item = value as BaseItemDto; if (item == null) { @@ -92,7 +92,7 @@ namespace MediaBrowser.UI.Converters { public object Convert(object value, Type targetType, object parameter, CultureInfo culture) { - var item = value as DtoBaseItem; + var item = value as BaseItemDto; if (item == null) { diff --git a/MediaBrowser.UI/MainWindow.xaml.cs b/MediaBrowser.UI/MainWindow.xaml.cs index 71ea664879..060e951c1e 100644 --- a/MediaBrowser.UI/MainWindow.xaml.cs +++ b/MediaBrowser.UI/MainWindow.xaml.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI.Controller; using MediaBrowser.UI.Controls; @@ -197,10 +197,10 @@ namespace MediaBrowser.UI } /// - /// Sets the backdrop based on a DtoBaseItem + /// Sets the backdrop based on a BaseItemDto /// /// The item. - public void SetBackdrops(DtoBaseItem item) + public void SetBackdrops(BaseItemDto item) { var urls = App.Instance.ApiClient.GetBackdropImageUrls(item, new ImageOptions { diff --git a/MediaBrowser.UI/Pages/BaseDetailPage.cs b/MediaBrowser.UI/Pages/BaseDetailPage.cs index c7a2859a09..b7c54ce2ef 100644 --- a/MediaBrowser.UI/Pages/BaseDetailPage.cs +++ b/MediaBrowser.UI/Pages/BaseDetailPage.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI.Controller; using MediaBrowser.UI.Playback; @@ -33,12 +33,12 @@ namespace MediaBrowser.UI.Pages /// /// The _item /// - private DtoBaseItem _item; + private BaseItemDto _item; /// /// Gets or sets the item. /// /// The item. - public DtoBaseItem Item + public BaseItemDto Item { get { return _item; } @@ -133,7 +133,7 @@ namespace MediaBrowser.UI.Pages { await UIKernel.Instance.PlaybackManager.Play(new PlayOptions { - Items = new List { Item } + Items = new List { Item } }); } @@ -144,7 +144,7 @@ namespace MediaBrowser.UI.Pages { await UIKernel.Instance.PlaybackManager.Play(new PlayOptions { - Items = new List { Item }, + Items = new List { Item }, Resume = true }); } diff --git a/MediaBrowser.UI/Pages/BaseFolderPage.cs b/MediaBrowser.UI/Pages/BaseFolderPage.cs index 3be7db91c9..52bddcd90e 100644 --- a/MediaBrowser.UI/Pages/BaseFolderPage.cs +++ b/MediaBrowser.UI/Pages/BaseFolderPage.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.UI.ViewModels; @@ -83,12 +83,12 @@ namespace MediaBrowser.UI.Pages /// /// The _folder /// - private DtoBaseItem _folder; + private BaseItemDto _folder; /// /// Gets or sets the Folder being displayed /// /// The folder. - public DtoBaseItem Folder + public BaseItemDto Folder { get { return _folder; } diff --git a/MediaBrowser.UI/Pages/BaseListPage.cs b/MediaBrowser.UI/Pages/BaseListPage.cs index 040d6a525b..5196e2b32f 100644 --- a/MediaBrowser.UI/Pages/BaseListPage.cs +++ b/MediaBrowser.UI/Pages/BaseListPage.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.UI.Controls; using MediaBrowser.UI.ViewModels; @@ -49,12 +49,12 @@ namespace MediaBrowser.UI.Pages /// /// The _current item /// - private DtoBaseItem _currentItem; + private BaseItemDto _currentItem; /// /// Gets or sets the current selected item /// /// The current item. - public DtoBaseItem CurrentItem + public BaseItemDto CurrentItem { get { return _currentItem; } @@ -102,7 +102,7 @@ namespace MediaBrowser.UI.Pages /// Updates the current item index based on the current selection /// /// The value. - private void UpdateCurrentItemIndex(DtoBaseItem value) + private void UpdateCurrentItemIndex(BaseItemDto value) { if (value == null) { diff --git a/MediaBrowser.UI/Pages/BaseLoginPage.cs b/MediaBrowser.UI/Pages/BaseLoginPage.cs index eb7d2300c8..cc8f96427a 100644 --- a/MediaBrowser.UI/Pages/BaseLoginPage.cs +++ b/MediaBrowser.UI/Pages/BaseLoginPage.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Net; using MediaBrowser.UI.Controls; using System; @@ -14,12 +14,12 @@ namespace MediaBrowser.UI.Pages /// /// The _users /// - private DtoUser[] _users; + private UserDto[] _users; /// /// Gets or sets the users. /// /// The users. - public DtoUser[] Users + public UserDto[] Users { get { return _users; } @@ -72,7 +72,7 @@ namespace MediaBrowser.UI.Pages /// The e. async void ItemsList_ItemInvoked(object sender, ItemEventArgs e) { - var user = (DtoUser)e.Argument; + var user = (UserDto)e.Argument; try { @@ -97,7 +97,7 @@ namespace MediaBrowser.UI.Pages /// The user. /// The password. /// Task{AuthenticationResult}. - protected async Task LoginUser(DtoUser user, string password) + protected async Task LoginUser(UserDto user, string password) { await App.Instance.ApiClient.AuthenticateUserAsync(user.Id, password); @@ -111,7 +111,7 @@ namespace MediaBrowser.UI.Pages /// /// The user. /// Task{AuthenticationResult}. - protected Task LoginUser(DtoUser user) + protected Task LoginUser(UserDto user) { return LoginUser(user, null); } diff --git a/MediaBrowser.UI/Pages/BasePage.cs b/MediaBrowser.UI/Pages/BasePage.cs index c07c194c6c..667a29ff37 100644 --- a/MediaBrowser.UI/Pages/BasePage.cs +++ b/MediaBrowser.UI/Pages/BasePage.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.ComponentModel; using System.Windows; @@ -53,9 +53,9 @@ namespace MediaBrowser.UI.Pages } /// - /// Sets the backdrop based on a DtoBaseItem + /// Sets the backdrop based on a BaseItemDto /// - public void SetBackdrops(DtoBaseItem item) + public void SetBackdrops(BaseItemDto item) { App.Instance.ApplicationWindow.SetBackdrops(item); } diff --git a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs index 4d466e3cb4..dded1b0a08 100644 --- a/MediaBrowser.UI/Playback/BaseMediaPlayer.cs +++ b/MediaBrowser.UI/Playback/BaseMediaPlayer.cs @@ -1,6 +1,6 @@ using MediaBrowser.Common.Events; using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Logging; using MediaBrowser.Model.Net; using MediaBrowser.UI.Configuration; @@ -60,7 +60,7 @@ namespace MediaBrowser.UI.Playback /// /// The currently playing items /// - public List Playlist = new List(); + public List Playlist = new List(); /// /// The _play state @@ -135,7 +135,7 @@ namespace MediaBrowser.UI.Playback /// /// The item. /// true if this instance can play the specified item; otherwise, false. - public abstract bool CanPlay(DtoBaseItem item); + public abstract bool CanPlay(BaseItemDto item); /// /// Gets a value indicating whether this instance can change volume. @@ -180,7 +180,7 @@ namespace MediaBrowser.UI.Playback /// Gets the current media. /// /// The current media. - public DtoBaseItem CurrentMedia + public BaseItemDto CurrentMedia { get { @@ -248,13 +248,13 @@ namespace MediaBrowser.UI.Playback /// The items. /// The options. /// The player configuration. - protected abstract void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration); + protected abstract void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration); /// /// Queues the internal. /// /// The items. - protected virtual void QueueInternal(List items) + protected virtual void QueueInternal(List items) { } @@ -393,7 +393,7 @@ namespace MediaBrowser.UI.Playback /// The items. /// items /// - internal void Queue(List items) + internal void Queue(List items) { if (items == null) { @@ -632,7 +632,7 @@ namespace MediaBrowser.UI.Playback /// Sends the playback start check in. /// /// The item. - protected async void SendPlaybackStartCheckIn(DtoBaseItem item) + protected async void SendPlaybackStartCheckIn(BaseItemDto item) { if (string.IsNullOrEmpty(item.Id)) { @@ -656,7 +656,7 @@ namespace MediaBrowser.UI.Playback /// /// The item. /// The position ticks. - protected async void SendPlaybackProgressCheckIn(DtoBaseItem item, long? positionTicks) + protected async void SendPlaybackProgressCheckIn(BaseItemDto item, long? positionTicks) { if (string.IsNullOrEmpty(item.Id)) { @@ -681,7 +681,7 @@ namespace MediaBrowser.UI.Playback /// /// The item. /// The position ticks. - protected async void SendPlaybackStopCheckIn(DtoBaseItem item, long? positionTicks) + protected async void SendPlaybackStopCheckIn(BaseItemDto item, long? positionTicks) { if (string.IsNullOrEmpty(item.Id)) { @@ -705,7 +705,7 @@ namespace MediaBrowser.UI.Playback /// Marks the watched. /// /// The items. - protected async void MarkWatched(IEnumerable items) + protected async void MarkWatched(IEnumerable items) { var idList = items.Where(i => !string.IsNullOrEmpty(i.Id)).Select(i => i.Id); diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs index ca7f333f52..0b05a64820 100644 --- a/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs +++ b/MediaBrowser.UI/Playback/ExternalPlayer/BaseExternalPlayer.cs @@ -1,5 +1,5 @@ using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Configuration; using MediaBrowser.UI.UserInput; using System; @@ -71,7 +71,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// The options. /// The player configuration. /// ProcessStartInfo. - protected virtual ProcessStartInfo GetProcessStartInfo(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected virtual ProcessStartInfo GetProcessStartInfo(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { return new ProcessStartInfo { @@ -87,7 +87,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// The options. /// The player configuration. /// System.String. - protected virtual string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected virtual string GetCommandArguments(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { var args = playerConfiguration.Args; @@ -105,7 +105,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// The items. /// The format string. /// System.String. - protected string GetCommandArguments(List items, string formatString) + protected string GetCommandArguments(List items, string formatString) { var paths = items.Select(i => "\"" + GetPathForCommandLine(i) + "\""); @@ -117,7 +117,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// /// The item. /// System.String. - protected virtual string GetPathForCommandLine(DtoBaseItem item) + protected virtual string GetPathForCommandLine(BaseItemDto item) { return item.Path; } @@ -155,7 +155,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// The items. /// The options. /// The player configuration. - protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { CurrentProcess = new Process { diff --git a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs index 5b5e248bd0..0144ce47a2 100644 --- a/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs +++ b/MediaBrowser.UI/Playback/ExternalPlayer/GenericExternalPlayer.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System.ComponentModel.Composition; namespace MediaBrowser.UI.Playback.ExternalPlayer @@ -23,7 +23,7 @@ namespace MediaBrowser.UI.Playback.ExternalPlayer /// /// The item. /// true if this instance can play the specified item; otherwise, false. - public override bool CanPlay(DtoBaseItem item) + public override bool CanPlay(BaseItemDto item) { return false; } diff --git a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs index 0c75190ce7..2ff17b7897 100644 --- a/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs +++ b/MediaBrowser.UI/Playback/InternalPlayer/BaseInternalMediaPlayer.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Configuration; using System.Collections.Generic; using System.Windows; @@ -21,7 +21,7 @@ namespace MediaBrowser.UI.Playback.InternalPlayer /// The items. /// The options. /// The player configuration. - protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { App.Instance.ApplicationWindow.Dispatcher.Invoke(() => { diff --git a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs index c055f49d91..08c9acfcb0 100644 --- a/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs +++ b/MediaBrowser.UI/Playback/NVlc/InternalMediaPlayerNVlc.cs @@ -3,7 +3,7 @@ using Declarations.Events; using Declarations.Media; using Declarations.Players; using Implementation; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.UI.Configuration; using MediaBrowser.UI.Playback.InternalPlayer; @@ -183,7 +183,7 @@ namespace MediaBrowser.UI.Playback.NVlc /// /// The item. /// true if this instance can play the specified item; otherwise, false. - public override bool CanPlay(DtoBaseItem item) + public override bool CanPlay(BaseItemDto item) { return item.IsVideo || item.IsAudio; } @@ -203,7 +203,7 @@ namespace MediaBrowser.UI.Playback.NVlc /// The items. /// The options. /// The player configuration. - protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) + protected override void PlayInternal(List items, PlayOptions options, PlayerConfiguration playerConfiguration) { EnsureMediaPlayerCreated(); @@ -234,7 +234,7 @@ namespace MediaBrowser.UI.Playback.NVlc /// /// The item. /// System.String. - private string GetPlayablePath(DtoBaseItem item) + private string GetPlayablePath(BaseItemDto item) { if (item.VideoType.HasValue && item.VideoType.Value == VideoType.BluRay) { @@ -289,7 +289,7 @@ namespace MediaBrowser.UI.Playback.NVlc /// Queues the internal. /// /// The items. - protected override void QueueInternal(List items) + protected override void QueueInternal(List items) { } diff --git a/MediaBrowser.UI/Playback/PlayOptions.cs b/MediaBrowser.UI/Playback/PlayOptions.cs index b5e3301689..276e611b9c 100644 --- a/MediaBrowser.UI/Playback/PlayOptions.cs +++ b/MediaBrowser.UI/Playback/PlayOptions.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Collections.Generic; @@ -13,7 +13,7 @@ namespace MediaBrowser.UI.Playback /// Gets or sets the items. /// /// The items. - public List Items { get; set; } + public List Items { get; set; } /// /// If true, the PlayableItems will be shuffled before playback diff --git a/MediaBrowser.UI/Playback/PlaybackEventArgs.cs b/MediaBrowser.UI/Playback/PlaybackEventArgs.cs index 0793313e4a..a2eef782a6 100644 --- a/MediaBrowser.UI/Playback/PlaybackEventArgs.cs +++ b/MediaBrowser.UI/Playback/PlaybackEventArgs.cs @@ -1,5 +1,5 @@ using System.Collections.Generic; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.UI.Configuration; using System; @@ -44,6 +44,6 @@ namespace MediaBrowser.UI.Playback /// Gets or sets the items. /// /// The items. - public List Items { get; set; } + public List Items { get; set; } } } diff --git a/MediaBrowser.UI/Playback/PlaybackManager.cs b/MediaBrowser.UI/Playback/PlaybackManager.cs index 5ad1c9f557..808d605e94 100644 --- a/MediaBrowser.UI/Playback/PlaybackManager.cs +++ b/MediaBrowser.UI/Playback/PlaybackManager.cs @@ -1,7 +1,7 @@ using MediaBrowser.Common.Events; using MediaBrowser.Common.Extensions; using MediaBrowser.Common.Kernel; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using MediaBrowser.UI.Configuration; @@ -64,7 +64,7 @@ namespace MediaBrowser.UI.Playback /// /// The player. /// The items. - internal void OnPlaybackCompleted(BaseMediaPlayer player, List items) + internal void OnPlaybackCompleted(BaseMediaPlayer player, List items) { EventHelper.QueueEventIfNotNull(PlaybackCompleted, this, new PlaybackStopEventArgs { @@ -167,10 +167,10 @@ namespace MediaBrowser.UI.Playback /// Gets the playable item. /// /// The path. - /// DtoBaseItem. - public DtoBaseItem GetPlayableItem(string path) + /// BaseItemDto. + public BaseItemDto GetPlayableItem(string path) { - return new DtoBaseItem + return new BaseItemDto { Path = path, Name = Path.GetFileName(path), @@ -185,10 +185,10 @@ namespace MediaBrowser.UI.Playback /// /// The URI. /// The name. - /// DtoBaseItem. - public DtoBaseItem GetPlayableItem(Uri uri, string name) + /// BaseItemDto. + public BaseItemDto GetPlayableItem(Uri uri, string name) { - return new DtoBaseItem + return new BaseItemDto { Path = uri.ToString(), Name = name, @@ -215,7 +215,7 @@ namespace MediaBrowser.UI.Playback /// /// The items. /// BaseMediaPlayer. - private Tuple GetPlayer(List items) + private Tuple GetPlayer(List items) { var player = GetConfiguredPlayer(items); @@ -240,7 +240,7 @@ namespace MediaBrowser.UI.Playback /// /// The items. /// BaseMediaPlayer. - private Tuple GetConfiguredPlayer(List items) + private Tuple GetConfiguredPlayer(List items) { if (UIKernel.Instance.Configuration.MediaPlayers == null) { @@ -258,7 +258,7 @@ namespace MediaBrowser.UI.Playback /// The configuration. /// The items. /// true if [is configured to play] [the specified configuration]; otherwise, false. - private bool IsConfiguredToPlay(PlayerConfiguration configuration, List items) + private bool IsConfiguredToPlay(PlayerConfiguration configuration, List items) { if (configuration.ItemTypes != null && configuration.ItemTypes.Length > 0) { diff --git a/MediaBrowser.UI/ViewModels/BaseItemPersonViewModel.cs b/MediaBrowser.UI/ViewModels/BaseItemPersonViewModel.cs index 95ff86094c..3de9d72cf1 100644 --- a/MediaBrowser.UI/ViewModels/BaseItemPersonViewModel.cs +++ b/MediaBrowser.UI/ViewModels/BaseItemPersonViewModel.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; namespace MediaBrowser.UI.ViewModels { diff --git a/MediaBrowser.UI/ViewModels/ChapterInfoDtoViewModel.cs b/MediaBrowser.UI/ViewModels/ChapterInfoDtoViewModel.cs index 53ab787c48..131294ff25 100644 --- a/MediaBrowser.UI/ViewModels/ChapterInfoDtoViewModel.cs +++ b/MediaBrowser.UI/ViewModels/ChapterInfoDtoViewModel.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using System; @@ -80,12 +80,12 @@ namespace MediaBrowser.UI.ViewModels /// /// The _item /// - private DtoBaseItem _item; + private BaseItemDto _item; /// /// Gets or sets the item. /// /// The item. - public DtoBaseItem Item + public BaseItemDto Item { get { return _item; } @@ -154,7 +154,7 @@ namespace MediaBrowser.UI.ViewModels /// The height. /// The default width. /// System.Double. - public static double GetChapterImageWidth(DtoBaseItem item, double height, double defaultWidth) + public static double GetChapterImageWidth(BaseItemDto item, double height, double defaultWidth) { var width = defaultWidth; diff --git a/MediaBrowser.UI/ViewModels/DtoBaseItemViewModel.cs b/MediaBrowser.UI/ViewModels/DtoBaseItemViewModel.cs index 0c9e27db32..5f28bdc18e 100644 --- a/MediaBrowser.UI/ViewModels/DtoBaseItemViewModel.cs +++ b/MediaBrowser.UI/ViewModels/DtoBaseItemViewModel.cs @@ -1,5 +1,5 @@ using MediaBrowser.Common.Logging; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.UI.Pages; using System; @@ -55,12 +55,12 @@ namespace MediaBrowser.UI.ViewModels /// /// The _item /// - private DtoBaseItem _item; + private BaseItemDto _item; /// /// Gets or sets the item. /// /// The item. - public DtoBaseItem Item + public BaseItemDto Item { get { return _item; } @@ -122,7 +122,7 @@ namespace MediaBrowser.UI.ViewModels /// The items. /// System.Double. /// items - public static double GetAveragePrimaryImageAspectRatio(IEnumerable items) + public static double GetAveragePrimaryImageAspectRatio(IEnumerable items) { if (items == null) { @@ -153,7 +153,7 @@ namespace MediaBrowser.UI.ViewModels /// /// The items. /// ObservableCollection{DtoBaseItemViewModel}. - public static ObservableCollection GetObservableItems(DtoBaseItem[] items) + public static ObservableCollection GetObservableItems(BaseItemDto[] items) { return GetObservableItems(items, GetAveragePrimaryImageAspectRatio(items)); } @@ -166,7 +166,7 @@ namespace MediaBrowser.UI.ViewModels /// The parent display preferences. /// ObservableCollection{DtoBaseItemViewModel}. /// items - public static ObservableCollection GetObservableItems(IEnumerable items, double averagePrimaryImageAspectRatio, DisplayPreferences parentDisplayPreferences = null) + public static ObservableCollection GetObservableItems(IEnumerable items, double averagePrimaryImageAspectRatio, DisplayPreferences parentDisplayPreferences = null) { if (items == null) { diff --git a/MediaBrowser.UI/ViewModels/ItemCollectionViewModel.cs b/MediaBrowser.UI/ViewModels/ItemCollectionViewModel.cs index 82feedbd70..3e7f6b8413 100644 --- a/MediaBrowser.UI/ViewModels/ItemCollectionViewModel.cs +++ b/MediaBrowser.UI/ViewModels/ItemCollectionViewModel.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using System; using System.Threading; using System.Windows; @@ -44,16 +44,16 @@ namespace MediaBrowser.UI.ViewModels } } - private DtoBaseItem[] _items; + private BaseItemDto[] _items; /// /// Gets or sets the list of items /// - public DtoBaseItem[] Items + public BaseItemDto[] Items { get { return _items; } set { - _items = value ?? new DtoBaseItem[] { }; + _items = value ?? new BaseItemDto[] { }; OnPropertyChanged("Items"); CurrentItemIndex = Items.Length == 0 ? -1 : 0; @@ -80,7 +80,7 @@ namespace MediaBrowser.UI.ViewModels /// /// Gets the current item /// - public DtoBaseItem CurrentItem + public BaseItemDto CurrentItem { get { return CurrentItemIndex == -1 ? null : Items[CurrentItemIndex]; } } @@ -88,7 +88,7 @@ namespace MediaBrowser.UI.ViewModels /// /// Gets the next item /// - public DtoBaseItem NextItem + public BaseItemDto NextItem { get { diff --git a/MediaBrowser.UI/ViewModels/SpecialFeatureViewModel.cs b/MediaBrowser.UI/ViewModels/SpecialFeatureViewModel.cs index 9d7b9d39db..f6d51d6dbf 100644 --- a/MediaBrowser.UI/ViewModels/SpecialFeatureViewModel.cs +++ b/MediaBrowser.UI/ViewModels/SpecialFeatureViewModel.cs @@ -1,4 +1,4 @@ -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.Entities; using MediaBrowser.Model.Net; using System; @@ -58,12 +58,12 @@ namespace MediaBrowser.UI.ViewModels /// /// The _item /// - private DtoBaseItem _item; + private BaseItemDto _item; /// /// Gets or sets the item. /// /// The item. - public DtoBaseItem Item + public BaseItemDto Item { get { return _item; } diff --git a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs b/MediaBrowser.WebDashboard/Api/DashboardInfo.cs index a11e565bc6..31f0f47284 100644 --- a/MediaBrowser.WebDashboard/Api/DashboardInfo.cs +++ b/MediaBrowser.WebDashboard/Api/DashboardInfo.cs @@ -1,5 +1,5 @@ using MediaBrowser.Model.Connectivity; -using MediaBrowser.Model.DTO; +using MediaBrowser.Model.Dto; using MediaBrowser.Model.System; using MediaBrowser.Model.Tasks; using System; @@ -39,7 +39,7 @@ namespace MediaBrowser.WebDashboard.Api /// Gets or sets the users. /// /// The users. - public DtoUser[] Users { get; set; } + public UserDto[] Users { get; set; } } }