minor namespace changes in the model

2024-11-15 18:08:53 -07:00 · 2013-03-10 00:36:39 -05:00 · 2013-03-10 00:36:39 -05:00 · b1be6f1d73
commit b1be6f1d73
parent 31d079f1ba
28 changed files with 42 additions and 45 deletions
--- a/MediaBrowser.Api/Library/LibraryService.cs
+++ b/MediaBrowser.Api/Library/LibraryService.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Server.Implementations.HttpServer;
 using ServiceStack.ServiceHost;
 using System;
--- a/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
+++ b/MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Server.Implementations.HttpServer;
 using ServiceStack.ServiceHost;
 using System;
--- a/MediaBrowser.Api/UserLibrary/ItemsService.cs
+++ b/MediaBrowser.Api/UserLibrary/ItemsService.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Server.Implementations.HttpServer;
 using ServiceStack.ServiceHost;
 using System;
@ -84,7 +85,7 @@ namespace MediaBrowser.Api.UserLibrary
        /// What to sort the results by
        /// </summary>
        /// <value>The sort by.</value>
-        [ApiMember(Name = "SortBy", Description = "Optional. Specify one or more sort orders, comma delimeted. Options: Album,AlbumArtist,Artist,DateCreated,DatePlayed,PremiereDate,SortName,Random", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        [ApiMember(Name = "SortBy", Description = "Optional. Specify one or more sort orders, comma delimeted. Options: Album, AlbumArtist, Artist, CommunityRating, DateCreated, DatePlayed, PremiereDate, ProductionYear, SortName, Random, Runtime", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
        public string SortBy { get; set; }

        /// <summary>
@ -98,7 +99,7 @@ namespace MediaBrowser.Api.UserLibrary
        /// Filters to apply to the results
        /// </summary>
        /// <value>The filters.</value>
-        [ApiMember(Name = "Filters", Description = "Optional. Specify additional filters to apply. This allows multiple, comma delimeted. Options: IsFolder,IsNotFolder,IsUnplayed,IsPlayed,IsFavorite,IsResumable", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
+        [ApiMember(Name = "Filters", Description = "Optional. Specify additional filters to apply. This allows multiple, comma delimeted. Options: IsFolder, IsNotFolder, IsUnplayed, IsPlayed, IsFavorite, IsRecentlyAdded, IsResumable", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "GET", AllowMultiple = true)]
        public string Filters { get; set; }

        /// <summary>
--- a/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
+++ b/MediaBrowser.Api/UserLibrary/UserLibraryService.cs
@ -4,6 +4,7 @@ using MediaBrowser.Controller.Library;
 using MediaBrowser.Model.Connectivity;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Server.Implementations.HttpServer;
 using ServiceStack.ServiceHost;
 using ServiceStack.Text.Controller;
--- a/MediaBrowser.Controller/Library/DtoBuilder.cs
+++ b/MediaBrowser.Controller/Library/DtoBuilder.cs
@ -11,6 +11,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading.Tasks;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Controller.Library
 {
--- a/MediaBrowser.Model/DTO/MediaType.cs
+++ b/MediaBrowser.Model/DTO/MediaType.cs
@ -1,22 +0,0 @@
-
-namespace MediaBrowser.Model.Dto
-{
-    /// <summary>
-    /// Enum MediaType
-    /// </summary>
-    public enum MediaType
-    {
-        /// <summary>
-        /// The audio
-        /// </summary>
-        Audio,
-        /// <summary>
-        /// The game
-        /// </summary>
-        Game,
-        /// <summary>
-        /// The video
-        /// </summary>
-        Video
-    }
-}
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@ -45,8 +45,7 @@
    <Compile Include="Dto\BaseItemPerson.cs" />
    <Compile Include="Dto\ChapterInfoDto.cs" />
    <Compile Include="Dto\IItemDto.cs" />
-    <Compile Include="Dto\ItemsByNameQuery.cs" />
-    <Compile Include="Dto\MediaType.cs" />
+    <Compile Include="Querying\ItemsByNameQuery.cs" />
    <Compile Include="Entities\BaseItemInfo.cs" />
    <Compile Include="Connectivity\ClientConnectionInfo.cs" />
    <Compile Include="Connectivity\ClientType.cs" />
@ -63,8 +62,8 @@
    <Compile Include="Globalization\CultureDto.cs" />
    <Compile Include="IO\FileSystemEntryInfo.cs" />
    <Compile Include="Dto\ImageOptions.cs" />
-    <Compile Include="Dto\ItemFilter.cs" />
-    <Compile Include="Dto\ItemQuery.cs" />
+    <Compile Include="Querying\ItemFilter.cs" />
+    <Compile Include="Querying\ItemQuery.cs" />
    <Compile Include="Entities\LibraryUpdateInfo.cs" />
    <Compile Include="Entities\ParentalRating.cs" />
    <Compile Include="Dto\StreamOptions.cs" />
@ -90,11 +89,11 @@
    <Compile Include="Configuration\UserConfiguration.cs" />
    <Compile Include="Drawing\DrawingUtils.cs" />
    <Compile Include="Dto\UserItemDataDto.cs" />
-    <Compile Include="Dto\ItemFields.cs" />
-    <Compile Include="Dto\ItemSortBy.cs" />
+    <Compile Include="Querying\ItemFields.cs" />
+    <Compile Include="Querying\ItemSortBy.cs" />
    <Compile Include="Dto\BaseItemDto.cs" />
    <Compile Include="Dto\UserDto.cs" />
-    <Compile Include="Dto\ItemsResult.cs" />
+    <Compile Include="Querying\ItemsResult.cs" />
    <Compile Include="Entities\DisplayPreferences.cs" />
    <Compile Include="Entities\ImageType.cs" />
    <Compile Include="Entities\IHasProviderIds.cs" />
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@ -1,5 +1,5 @@

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// Used to control the data that gets attached to DtoBaseItems
--- a/MediaBrowser.Model/Querying/ItemFilter.cs
+++ b/MediaBrowser.Model/Querying/ItemFilter.cs
@ -1,5 +1,5 @@

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// Enum ItemFilter
--- a/MediaBrowser.Model/Querying/ItemQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemQuery.cs
@ -1,7 +1,8 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using System;

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// Contains all the possible parameters that can be used to query for items
--- a/MediaBrowser.Model/Querying/ItemSortBy.cs
+++ b/MediaBrowser.Model/Querying/ItemSortBy.cs
@ -1,5 +1,5 @@

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// These represent sort orders that are known by the core
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@ -1,7 +1,8 @@
-using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Entities;
 using System;

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// Class ItemsByNameQuery
--- a/MediaBrowser.Model/Querying/ItemsResult.cs
+++ b/MediaBrowser.Model/Querying/ItemsResult.cs
@ -1,6 +1,7 @@
-using ProtoBuf;
+using MediaBrowser.Model.Dto;
+using ProtoBuf;

-namespace MediaBrowser.Model.Dto
+namespace MediaBrowser.Model.Querying
 {
    /// <summary>
    /// Represents the result of a query for items
--- a/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AlbumArtistComparer.cs
@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/AlbumComparer.cs
@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/ArtistComparer.cs
@ -3,6 +3,7 @@ using MediaBrowser.Controller.Entities.Audio;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/CommunityRatingComparer.cs
@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DateCreatedComparer.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/DatePlayedComparer.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/PremiereDateComparer.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/ProductionYearComparer.cs
@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/RandomComparer.cs
@ -2,6 +2,7 @@
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
 using System;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/RuntimeComparer.cs
@ -1,6 +1,7 @@
 using MediaBrowser.Controller.Entities;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
+++ b/MediaBrowser.Server.Implementations/Sorting/SortNameComparer.cs
@ -2,6 +2,7 @@
 using System;
 using MediaBrowser.Controller.Sorting;
 using MediaBrowser.Model.Dto;
+using MediaBrowser.Model.Querying;

 namespace MediaBrowser.Server.Implementations.Sorting
 {
--- a/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs
+++ b/MediaBrowser.ServerApplication/LibraryExplorer.xaml.cs
@ -7,6 +7,7 @@ using MediaBrowser.Controller.Localization;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Logging;
+using MediaBrowser.Model.Querying;
 using MediaBrowser.Model.Serialization;
 using System;
 using System.Collections.Generic;
--- a/Nuget/MediaBrowser.Common.Internal.nuspec
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Common.Internal</id>
-        <version>3.0.40</version>
+        <version>3.0.42</version>
        <title>MediaBrowser.Common.Internal</title>
        <authors>Luke</authors>
        <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
        <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
        <copyright>Copyright © Media Browser 2013</copyright>
        <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.40" />
+            <dependency id="MediaBrowser.Common" version="3.0.42" />
            <dependency id="NLog" version="2.0.0.2000" />
            <dependency id="ServiceStack.Text" version="3.9.38" />
            <dependency id="protobuf-net" version="2.0.0.621" />
--- a/Nuget/MediaBrowser.Common.nuspec
+++ b/Nuget/MediaBrowser.Common.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Common</id>
-        <version>3.0.40</version>
+        <version>3.0.42</version>
        <title>MediaBrowser.Common</title>
        <authors>Media Browser Team</authors>
        <owners>ebr,Luke,scottisafool</owners>
--- a/Nuget/MediaBrowser.Server.Core.nuspec
+++ b/Nuget/MediaBrowser.Server.Core.nuspec
@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
    <metadata>
        <id>MediaBrowser.Server.Core</id>
-        <version>3.0.40</version>
+        <version>3.0.42</version>
        <title>Media Browser.Server.Core</title>
        <authors>Media Browser Team</authors>
        <owners>ebr,Luke,scottisafool</owners>
@ -12,7 +12,7 @@
        <description>Contains core components required to build plugins for Media Browser Server.</description>
        <copyright>Copyright © Media Browser 2013</copyright>
        <dependencies>
-            <dependency id="MediaBrowser.Common" version="3.0.40" />
+            <dependency id="MediaBrowser.Common" version="3.0.42" />
        </dependencies>
    </metadata>
    <files>