pt
/
jellyfin
mirror of https://github.com/jellyfin/jellyfin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Undoing changes

This commit is contained in:
Luke Pulverenti 2014-03-13 05:18:32 -04:00
parent 219e0ef19b
commit b7bcc24506
7 changed files with 25 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
MediaBrowser.Api/SessionsService.cs
View File

@ -46,14 +46,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; } 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> /// <summary>
/// Artist, Genre, Studio, Person, or any kind of BaseItem /// Artist, Genre, Studio, Person, or any kind of BaseItem
/// </summary> /// </summary>
@ -96,14 +88,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; } 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> /// <summary>
/// Artist, Genre, Studio, Person, or any kind of BaseItem /// Artist, Genre, Studio, Person, or any kind of BaseItem
/// </summary> /// </summary>
@ -137,14 +121,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; } 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> /// <summary>
/// Gets or sets the position to seek to /// Gets or sets the position to seek to
/// </summary> /// </summary>
@ -170,14 +146,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; } 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> /// <summary>
/// Gets or sets the command. /// Gets or sets the command.
/// </summary> /// </summary>
@ -197,14 +165,6 @@ namespace MediaBrowser.Api
[ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")] [ApiMember(Name = "Id", Description = "Session Id", IsRequired = true, DataType = "string", ParameterType = "path", Verb = "POST")]
public Guid Id { get; set; } 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")] [ApiMember(Name = "Text", Description = "The message text.", IsRequired = true, DataType = "string", ParameterType = "query", Verb = "POST")]
public string Text { get; set; } 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")] [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; } public string PlayableMediaTypes { get; set; }
} }
/// <summary> /// <summary>
/// Class SessionsService /// Class SessionsService
/// </summary> /// </summary>
@ -310,10 +270,9 @@ namespace MediaBrowser.Api
} }
public void Post(SendPlaystateCommand request) public void Post(SendPlaystateCommand request)
{ {
var command = new PlaystateRequest var command = new PlaystateRequest
{ {
UserId = request.UserId,
Command = request.Command, Command = request.Command,
SeekPositionTicks = request.SeekPositionTicks SeekPositionTicks = request.SeekPositionTicks
}; };
@ -331,7 +290,6 @@ namespace MediaBrowser.Api
{ {
var command = new BrowseRequest var command = new BrowseRequest
{ {
UserId = request.UserId,
Context = request.Context, Context = request.Context,
ItemId = request.ItemId, ItemId = request.ItemId,
ItemName = request.ItemName, ItemName = request.ItemName,
@ -363,7 +321,6 @@ namespace MediaBrowser.Api
var command = new MessageCommand var command = new MessageCommand
{ {
Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header, Header = string.IsNullOrEmpty(request.Header) ? "Message from Server" : request.Header,
UserId = request.UserId,
TimeoutMs = request.TimeoutMs, TimeoutMs = request.TimeoutMs,
Text = request.Text Text = request.Text
}; };
@ -382,7 +339,7 @@ namespace MediaBrowser.Api
var command = new PlayRequest var command = new PlayRequest
{ {
ItemIds = request.ItemIds.Split(',').ToArray(), ItemIds = request.ItemIds.Split(',').ToArray(),
UserId = request.UserId,
PlayCommand = request.PlayCommand, PlayCommand = request.PlayCommand,
StartPositionTicks = request.StartPositionTicks StartPositionTicks = request.StartPositionTicks
}; };
@ -411,4 +368,4 @@ namespace MediaBrowser.Api
.ToList(); .ToList();
} }
} }
} }

7
MediaBrowser.Model.Portable/MediaBrowser.Model.Portable.csproj
View File

@ -11,17 +11,12 @@
<RootNamespace>MediaBrowser.Model</RootNamespace> <RootNamespace>MediaBrowser.Model</RootNamespace>
<AssemblyName>MediaBrowser.Model</AssemblyName> <AssemblyName>MediaBrowser.Model</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion> <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkProfile>Profile158</TargetFrameworkProfile> <TargetFrameworkProfile>Profile104</TargetFrameworkProfile>
<FileAlignment>512</FileAlignment> <FileAlignment>512</FileAlignment>
<ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids> <ProjectTypeGuids>{786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir> <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
<RestorePackages>true</RestorePackages> <RestorePackages>true</RestorePackages>
<FodyPath>..\packages\Fody.1.19.1.0</FodyPath> <FodyPath>..\packages\Fody.1.19.1.0</FodyPath>
<FileUpgradeFlags>
</FileUpgradeFlags>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>4.0</OldToolsVersion>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols> <DebugSymbols>true</DebugSymbols>

27
MediaBrowser.Model/ApiClient/IApiClient.cs
View File

@ -244,7 +244,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>Task{ItemsResult}.</returns> /// <returns>Task{ItemsResult}.</returns>
Task<ItemsResult> GetSeasonsAsync(SeasonQuery query); Task<ItemsResult> GetSeasonsAsync(SeasonQuery query);
/// <summary> /// <summary>
/// Queries for items /// Queries for items
/// </summary> /// </summary>
@ -354,7 +354,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="query">The query.</param> /// <param name="query">The query.</param>
/// <returns>Task{ItemsResult}.</returns> /// <returns>Task{ItemsResult}.</returns>
Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query); Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query);
/// <summary> /// <summary>
/// Gets a genre /// Gets a genre
/// </summary> /// </summary>
@ -572,18 +572,17 @@ namespace MediaBrowser.Model.ApiClient
/// Instructs antoher client to browse to a library item. /// Instructs antoher client to browse to a library item.
/// </summary> /// </summary>
/// <param name="sessionId">The session id.</param> /// <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="itemId">The id of the item to browse to.</param>
/// <param name="itemName">The name 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="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> /// <param name="context">Optional ui context (movies, music, tv, games, etc). The client is free to ignore this.</param>
/// <returns>Task.</returns> /// <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> /// <summary>
/// Sends the playstate command async. /// Sends the playstate command async.
/// </summary> /// </summary>
/// <param name="sessionId">The session id.</param> /// <param name="sessionId">The session id.</param>
/// <param name="request">The request.</param> /// <param name="request">The request.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request); Task SendPlaystateCommandAsync(string sessionId, PlaystateRequest request);
@ -780,7 +779,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="options">The options.</param> /// <param name="options">The options.</param>
/// <returns>System.String.</returns> /// <returns>System.String.</returns>
string GetImageUrl(ProgramInfoDto item, ImageOptions options); string GetImageUrl(ProgramInfoDto item, ImageOptions options);
/// <summary> /// <summary>
/// Gets an image url that can be used to download an image from the api /// Gets an image url that can be used to download an image from the api
/// </summary> /// </summary>
@ -910,7 +909,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="options">The options.</param> /// <param name="options">The options.</param>
/// <returns>System.String.</returns> /// <returns>System.String.</returns>
string GetThumbImageUrl(BaseItemDto item, ImageOptions options); string GetThumbImageUrl(BaseItemDto item, ImageOptions options);
/// <summary> /// <summary>
/// Gets the url needed to stream an audio file /// Gets the url needed to stream an audio file
/// </summary> /// </summary>
@ -966,7 +965,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{ChannelInfoDto}.</returns> /// <returns>Task{ChannelInfoDto}.</returns>
Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken); Task<ChannelInfoDto> GetLiveTvChannelAsync(string id, string userId, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the live tv recordings asynchronous. /// Gets the live tv recordings asynchronous.
/// </summary> /// </summary>
@ -983,7 +982,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{RecordingInfoDto}.</returns> /// <returns>Task{RecordingInfoDto}.</returns>
Task<RecordingInfoDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken); Task<RecordingInfoDto> GetLiveTvRecordingAsync(string id, string userId, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the live tv recording groups asynchronous. /// Gets the live tv recording groups asynchronous.
/// </summary> /// </summary>
@ -1000,7 +999,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{RecordingGroupDto}.</returns> /// <returns>Task{RecordingGroupDto}.</returns>
Task<RecordingGroupDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken); Task<RecordingGroupDto> GetLiveTvRecordingGroupAsync(string id, string userId, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the live tv timers asynchronous. /// Gets the live tv timers asynchronous.
/// </summary> /// </summary>
@ -1065,7 +1064,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken); Task UpdateLiveTvSeriesTimerAsync(SeriesTimerInfoDto timer, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the live tv timer asynchronous. /// Gets the live tv timer asynchronous.
/// </summary> /// </summary>
@ -1073,7 +1072,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{TimerInfoDto}.</returns> /// <returns>Task{TimerInfoDto}.</returns>
Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken); Task<TimerInfoDto> GetLiveTvTimerAsync(string id, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the live tv series timers asynchronous. /// Gets the live tv series timers asynchronous.
/// </summary> /// </summary>
@ -1105,7 +1104,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task.</returns> /// <returns>Task.</returns>
Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken); Task CancelLiveTvSeriesTimerAsync(string id, CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Deletes the live tv recording asynchronous. /// Deletes the live tv recording asynchronous.
/// </summary> /// </summary>
@ -1127,7 +1126,7 @@ namespace MediaBrowser.Model.ApiClient
/// <param name="cancellationToken">The cancellation token.</param> /// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task{GuideInfo}.</returns> /// <returns>Task{GuideInfo}.</returns>
Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken); Task<GuideInfo> GetLiveTvGuideInfo(CancellationToken cancellationToken);
/// <summary> /// <summary>
/// Gets the default timer information. /// Gets the default timer information.
/// </summary> /// </summary>

8
MediaBrowser.Model/Session/BrowseRequest.cs
View File

@ -1,6 +1,4 @@
 
using System;
namespace MediaBrowser.Model.Session namespace MediaBrowser.Model.Session
{ {
/// <summary> /// <summary>
@ -14,8 +12,6 @@ namespace MediaBrowser.Model.Session
/// <value>The type of the item.</value> /// <value>The type of the item.</value>
public string ItemType { get; set; } public string ItemType { get; set; }
public Guid UserId { get; set; }
/// <summary> /// <summary>
/// Gets or sets the item id. /// Gets or sets the item id.
/// </summary> /// </summary>
@ -27,7 +23,7 @@ namespace MediaBrowser.Model.Session
/// </summary> /// </summary>
/// <value>The name of the item.</value> /// <value>The name of the item.</value>
public string ItemName { get; set; } public string ItemName { get; set; }
/// <summary> /// <summary>
/// Gets or sets the context (Movies, Music, Tv, etc) /// 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. /// 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 TvShows = "TvShows";
public const string Games = "Games"; public const string Games = "Games";
} }
} }

9
MediaBrowser.Model/Session/MessageCommand.cs
View File

@ -1,15 +1,12 @@
 
using System;
namespace MediaBrowser.Model.Session namespace MediaBrowser.Model.Session
{ {
public class MessageCommand public class MessageCommand
{ {
public Guid UserId { get; set; }
public string Header { get; set; } public string Header { get; set; }
public string Text { get; set; } public string Text { get; set; }
public long? TimeoutMs { get; set; } public long? TimeoutMs { get; set; }
} }
} }

14
MediaBrowser.Model/Session/PlayRequest.cs
View File

@ -1,5 +1,4 @@
 
using System;
namespace MediaBrowser.Model.Session namespace MediaBrowser.Model.Session
{ {
/// <summary> /// <summary>
@ -7,11 +6,6 @@ namespace MediaBrowser.Model.Session
/// </summary> /// </summary>
public class PlayRequest public class PlayRequest
{ {
public PlayRequest()
{
}
/// <summary> /// <summary>
/// Gets or sets the item ids. /// Gets or sets the item ids.
/// </summary> /// </summary>
@ -29,12 +23,6 @@ namespace MediaBrowser.Model.Session
/// </summary> /// </summary>
/// <value>The play command.</value> /// <value>The play command.</value>
public PlayCommand PlayCommand { get; set; } public PlayCommand PlayCommand { get; set; }
/// <summary>
/// Gets or sets the play command.
/// </summary>
/// <value>The play command.</value>
public Guid UserId { get; set; }
} }
/// <summary> /// <summary>
@ -55,4 +43,4 @@ namespace MediaBrowser.Model.Session
/// </summary> /// </summary>
PlayLast PlayLast
} }
} }

5
MediaBrowser.Model/Session/PlaystateCommand.cs
View File

@ -1,5 +1,4 @@
 
using System;
namespace MediaBrowser.Model.Session namespace MediaBrowser.Model.Session
{ {
/// <summary> /// <summary>
@ -35,10 +34,8 @@ namespace MediaBrowser.Model.Session
public class PlaystateRequest public class PlaystateRequest
{ {
public Guid UserId { get; set; }
public PlaystateCommand Command { get; set; } public PlaystateCommand Command { get; set; }
public long? SeekPositionTicks { get; set; } public long? SeekPositionTicks { get; set; }
} }
} }