diff options
| -rw-r--r-- | MediaBrowser.Api/SessionsService.cs | 47 | ||||
| -rw-r--r-- | MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj | 7 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/BrowseRequest.cs | 4 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/MessageCommand.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlayRequest.cs | 12 | ||||
| -rw-r--r-- | MediaBrowser.Model/Session/PlaystateCommand.cs | 3 |
6 files changed, 74 insertions, 4 deletions
diff --git a/MediaBrowser.Api/SessionsService.cs b/MediaBrowser.Api/SessionsService.cs index f662e3817..562e45525 100644 --- a/MediaBrowser.Api/SessionsService.cs +++ b/MediaBrowser.Api/SessionsService.cs @@ -47,6 +47,14 @@ 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> @@ -89,6 +97,14 @@ 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> @@ -122,6 +138,14 @@ 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")] @@ -147,6 +171,14 @@ 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> @@ -165,6 +197,14 @@ 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; } @@ -270,9 +310,10 @@ namespace MediaBrowser.Api } public void Post(SendPlaystateCommand request) - { + { var command = new PlaystateRequest { + UserId = request.UserId, Command = request.Command, SeekPositionTicks = request.SeekPositionTicks }; @@ -290,6 +331,7 @@ namespace MediaBrowser.Api { var command = new BrowseRequest { + UserId = request.UserId, Context = request.Context, ItemId = request.ItemId, ItemName = request.ItemName, @@ -321,6 +363,7 @@ 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 }; @@ -339,7 +382,7 @@ namespace MediaBrowser.Api var command = new PlayRequest { ItemIds = request.ItemIds.Split(',').ToArray(), - + UserId = request.UserId, PlayCommand = request.PlayCommand, StartPositionTicks = request.StartPositionTicks }; diff --git a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj index 04296de35..ccc05492c 100644 --- a/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj +++ b/MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj @@ -11,12 +11,17 @@ <RootNamespace>MediaBrowser.Model</RootNamespace> <AssemblyName>MediaBrowser.Model</AssemblyName> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion> - <TargetFrameworkProfile>Profile104</TargetFrameworkProfile> + <TargetFrameworkProfile>Profile158</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/Session/BrowseRequest.cs b/MediaBrowser.Model/Session/BrowseRequest.cs index abb3a30ab..03241860c 100644 --- a/MediaBrowser.Model/Session/BrowseRequest.cs +++ b/MediaBrowser.Model/Session/BrowseRequest.cs @@ -1,4 +1,6 @@ +using System; + namespace MediaBrowser.Model.Session { /// <summary> @@ -12,6 +14,8 @@ 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> diff --git a/MediaBrowser.Model/Session/MessageCommand.cs b/MediaBrowser.Model/Session/MessageCommand.cs index 5ab580815..754c057fa 100644 --- a/MediaBrowser.Model/Session/MessageCommand.cs +++ b/MediaBrowser.Model/Session/MessageCommand.cs @@ -1,8 +1,11 @@ +using System; namespace MediaBrowser.Model.Session { public class MessageCommand - { + { + public Guid UserId { get; set; } + public string Header { get; set; } public string Text { get; set; } diff --git a/MediaBrowser.Model/Session/PlayRequest.cs b/MediaBrowser.Model/Session/PlayRequest.cs index c9bb58693..239fb6572 100644 --- a/MediaBrowser.Model/Session/PlayRequest.cs +++ b/MediaBrowser.Model/Session/PlayRequest.cs @@ -1,4 +1,5 @@ +using System; namespace MediaBrowser.Model.Session { /// <summary> @@ -6,6 +7,11 @@ namespace MediaBrowser.Model.Session /// </summary> public class PlayRequest { + public PlayRequest() + { + + } + /// <summary> /// Gets or sets the item ids. /// </summary> @@ -23,6 +29,12 @@ 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> diff --git a/MediaBrowser.Model/Session/PlaystateCommand.cs b/MediaBrowser.Model/Session/PlaystateCommand.cs index 7e85d9d27..68e80c452 100644 --- a/MediaBrowser.Model/Session/PlaystateCommand.cs +++ b/MediaBrowser.Model/Session/PlaystateCommand.cs @@ -1,4 +1,5 @@ +using System; namespace MediaBrowser.Model.Session { /// <summary> @@ -34,6 +35,8 @@ namespace MediaBrowser.Model.Session public class PlaystateRequest { + public Guid UserId { get; set; } + public PlaystateCommand Command { get; set; } public long? SeekPositionTicks { get; set; } |