diff options
| -rw-r--r-- | MediaBrowser.Api/SessionsService.cs | 51 | ||||
| -rw-r--r-- | MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IApiClient.cs | 27 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/BrowseRequest.cs | 8 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/MessageCommand.cs | 9 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlayRequest.cs | 14 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlaystateCommand.cs | 5 |
7 files changed, 25 insertions, 96 deletions
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs index 562e45525..b8ca70ba5 100644 --- a/MediaBrowser.Api/SessionsService.cs +++ b/MediaBrowser.Api/SessionsService.cs @@ -47,14 +47,6 @@ namespace MediaBrowser.Api public Guid Id { get; set; } /// <summary> - /// Gets or sets the UserId. - /// </summary> - /// <value>The id.</value> - [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")] - public Guid UserId { get; set; } - //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use - - /// <summary> /// Artist, Genre, Studio, Person, or any kind of BaseItem /// </summary> /// <value>The type of the item.</value> @@ -97,14 +89,6 @@ namespace MediaBrowser.Api public Guid Id { get; set; } /// <summary> - /// Gets or sets the UserId. - /// </summary> - /// <value>The id.</value> - [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")] - public Guid UserId { get; set; } - //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use - - /// <summary> /// Artist, Genre, Studio, Person, or any kind of BaseItem /// </summary> /// <value>The type of the item.</value> @@ -138,14 +122,6 @@ namespace MediaBrowser.Api public Guid Id { get; set; } /// <summary> - /// Gets or sets the UserId. - /// </summary> - /// <value>The id.</value> - [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")] - public Guid UserId { get; set; } - //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use - - /// <summary> /// Gets or sets the position to seek to /// </summary> [ApiMember(Name = "SeekPositionTicks", Description = "The position to seek to.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] @@ -171,14 +147,6 @@ namespace MediaBrowser.Api public Guid Id { get; set; } /// <summary> - /// Gets or sets the UserId. - /// </summary> - /// <value>The id.</value> - [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")] - public Guid UserId { get; set; } - //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use - - /// <summary> /// Gets or sets the command. /// </summary> /// <value>The play command.</value> @@ -197,14 +165,6 @@ namespace MediaBrowser.Api [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] public Guid Id { get; set; } - /// <summary> - /// Gets or sets the UserId. - /// </summary> - /// <value>The id.</value> - [ApiMember(Name = "UserId", Description = "The controlling User Id", IsRequired = false, DataType = "string", ParameterType = "path", Verb = "POST")] - public Guid UserId { get; set; } - //TODO IsRequired = false shall be changed to true once the clients has been updated and the new ApiClient is in use - [ApiMember(Name = "Text", Description = "The message text.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")] public string Text { get; set; } @@ -251,7 +211,7 @@ namespace MediaBrowser.Api [ApiMember(Name = "PlayableMediaTypes", Description = "A list of playable media types, comma delimited. Audio, Video, Book, Game, Photo.", IsRequired = false, DataType = "string", ParameterType = "query", Verb = "POST")] public string PlayableMediaTypes { get; set; } } - + /// <summary> /// Class SessionsService /// </summary> @@ -310,10 +270,9 @@ namespace MediaBrowser.Api } public void Post(SendPlaystateCommand request) - { + { var command = new PlaystateRequest { - UserId = request.UserId, Command = request.Command, SeekPositionTicks = request.SeekPositionTicks }; @@ -331,7 +290,6 @@ namespace MediaBrowser.Api { var command = new BrowseRequest { - UserId = request.UserId, Context = request.Context, ItemId = request.ItemId, ItemName = request.ItemName, @@ -363,7 +321,6 @@ namespace MediaBrowser.Api var command = new MessageCommand { Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header, - UserId = request.UserId, TimeoutMs = request.TimeoutMs, Text = request.Text }; @@ -382,7 +339,7 @@ namespace MediaBrowser.Api var command = new PlayRequest { ItemIds = request.ItemIds.Split(',').ToArray(), - UserId = request.UserId, + PlayCommand = request.PlayCommand, StartPositionTicks = request.StartPositionTicks }; @@ -411,4 +368,4 @@ namespace MediaBrowser.Api .ToList(); } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 6c05f8ee5..c8df3931d 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -11,17 +11,12 @@ <RootNamespace>MediaBrowser.Model</RootNamespace> <AssemblyName>MediaBrowser.Model</AssemblyName> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile158</TargetFrameworkProfile> + <TargetFrameworkProfile>Profile104</TargetFrameworkProfile> <FileAlignment>512</FileAlignment> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <RestorePackages>true</RestorePackages> <FodyPath>..\packages\Fody.1.19.1.0</FodyPath> - <FileUpgradeFlags> - </FileUpgradeFlags> - <UpgradeBackupLocation> - </UpgradeBackupLocation> - <OldToolsVersion>4.0</OldToolsVersion> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <DebugSymbols>true</DebugSymbols> diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index 292489869..46d3dcc3f 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -244,7 +244,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="query">The query.</param> /// <returns>Task{ItemsResult}.</returns> Task<ItemsResult> GetSeasonsAsync(SeasonQuery query); - + /// <summary> /// Queries for items /// </summary> @@ -354,7 +354,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="query">The query.</param> /// <returns>Task{ItemsResult}.</returns> Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query); - + /// <summary> /// Gets a genre /// </summary> @@ -572,18 +572,17 @@ namespace MediaBrowser.Model.ApiClient /// Instructs antoher client to browse to a library item. /// </summary> /// <param name="sessionId">The session id.</param> - /// <param name="userId">The controlling user id.</param> /// <param name="itemId">The id of the item to browse to.</param> /// <param name="itemName">The name of the item to browse to.</param> /// <param name="itemType">The type of the item to browse to.</param> /// <param name="context">Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.</param> /// <returns>Task.</returns> - Task SendBrowseCommandAsync(string sessionId, string userId, string itemId, string itemName, string itemType, string context); + Task SendBrowseCommandAsync(string sessionId, string itemId, string itemName, string itemType, string context); /// <summary> /// Sends the playstate command async. /// </summary> - /// <param name="sessionId">The session id.</param> + /// <param name="sessionId">The session id.</param> /// <param name="request">The request.</param> /// <returns>Task.</returns> Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request); @@ -780,7 +779,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="options">The options.</param> /// <returns>System.String.</returns> string GetImageUrl(ProgramInfoDto item, ImageOptions options); - + /// <summary> /// Gets an image url that can be used to download an image from the api /// </summary> @@ -910,7 +909,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="options">The options.</param> /// <returns>System.String.</returns> string GetThumbImageUrl(BaseItemDto item, ImageOptions options); - + /// <summary> /// Gets the url needed to stream an audio file /// </summary> @@ -966,7 +965,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{ChannelInfoDto}.</returns> Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken); - + /// <summary> /// Gets the live tv recordings asynchronous. /// </summary> @@ -983,7 +982,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{RecordingInfoDto}.</returns> Task<RecordingInfoDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken); - + /// <summary> /// Gets the live tv recording groups asynchronous. /// </summary> @@ -1000,7 +999,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{RecordingGroupDto}.</returns> Task<RecordingGroupDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken); - + /// <summary> /// Gets the live tv timers asynchronous. /// </summary> @@ -1065,7 +1064,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken); - + /// <summary> /// Gets the live tv timer asynchronous. /// </summary> @@ -1073,7 +1072,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{TimerInfoDto}.</returns> Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken); - + /// <summary> /// Gets the live tv series timers asynchronous. /// </summary> @@ -1105,7 +1104,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task.</returns> Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken); - + /// <summary> /// Deletes the live tv recording asynchronous. /// </summary> @@ -1127,7 +1126,7 @@ namespace MediaBrowser.Model.ApiClient /// <param name="cancellationToken">The cancellation token.</param> /// <returns>Task{GuideInfo}.</returns> Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken); - + /// <summary> /// Gets the default timer information. /// </summary> diff --git a/MediaBrowser.Model/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs index 03241860c..e2cdcc1b2 100644 --- a/MediaBrowser.Model/Session/BrowseRequest.cs +++ b/MediaBrowser.Model/Session/BrowseRequest.cs @@ -1,6 +1,4 @@ -using System; - namespace MediaBrowser.Model.Session { /// <summary> @@ -14,8 +12,6 @@ namespace MediaBrowser.Model.Session /// <value>The type of the item.</value> public string ItemType { get; set; } - public Guid UserId { get; set; } - /// <summary> /// Gets or sets the item id. /// </summary> @@ -27,7 +23,7 @@ namespace MediaBrowser.Model.Session /// </summary> /// <value>The name of the item.</value> public string ItemName { get; set; } - + /// <summary> /// Gets or sets the context (Movies, Music, Tv, etc) /// Applicable to genres, studios and persons only because the context of items and artists can be inferred. @@ -44,4 +40,4 @@ namespace MediaBrowser.Model.Session public const string TvShows = "TvShows"; public const string Games = "Games"; } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs index 754c057fa..b028765ed 100644 --- a/MediaBrowser.Model/Session/MessageCommand.cs +++ b/MediaBrowser.Model/Session/MessageCommand.cs @@ -1,15 +1,12 @@ -using System; namespace MediaBrowser.Model.Session { public class MessageCommand - { - public Guid UserId { get; set; } - + { public string Header { get; set; } - + public string Text { get; set; } public long? TimeoutMs { get; set; } } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs index 239fb6572..57f6c37f5 100644 --- a/MediaBrowser.Model/Session/PlayRequest.cs +++ b/MediaBrowser.Model/Session/PlayRequest.cs @@ -1,5 +1,4 @@ -using System; namespace MediaBrowser.Model.Session { /// <summary> @@ -7,11 +6,6 @@ namespace MediaBrowser.Model.Session /// </summary> public class PlayRequest { - public PlayRequest() - { - - } - /// <summary> /// Gets or sets the item ids. /// </summary> @@ -29,12 +23,6 @@ namespace MediaBrowser.Model.Session /// </summary> /// <value>The play command.</value> public PlayCommand PlayCommand { get; set; } - - /// <summary> - /// Gets or sets the play command. - /// </summary> - /// <value>The play command.</value> - public Guid UserId { get; set; } } /// <summary> @@ -55,4 +43,4 @@ namespace MediaBrowser.Model.Session /// </summary> PlayLast } -} +}
\ No newline at end of file diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs index 68e80c452..918f4f70f 100644 --- a/MediaBrowser.Model/Session/PlaystateCommand.cs +++ b/MediaBrowser.Model/Session/PlaystateCommand.cs @@ -1,5 +1,4 @@ -using System; namespace MediaBrowser.Model.Session { /// <summary> @@ -35,10 +34,8 @@ namespace MediaBrowser.Model.Session public class PlaystateRequest { - public Guid UserId { get; set; } - public PlaystateCommand Command { get; set; } public long? SeekPositionTicks { get; set; } } -} +}
\ No newline at end of file |