alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-21 17:44:43 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge branch 'dev' into code-cleanup

Browse Source
This commit is contained in:
Erwin de Haan
2019-01-11 12:50:36 +01:00
parent ec1f5dc317 e5c2dbdf23
commit e2751d42e8
345 changed files with 2991 additions and 3236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MediaBrowser.Controller/Net/AuthorizationInfo.cs
View File

@@ -9,12 +9,12 @@ namespace MediaBrowser.Controller.Net
/// Gets or sets the user identifier.
/// </summary>
/// <value>The user identifier.</value>
public Guid UserId {
public Guid UserId {
get {
return User == null ? Guid.Empty : User.Id;
}
}
/// <summary>
/// Gets or sets the device identifier.
/// </summary>

2
MediaBrowser.Controller/Net/BasePeriodicWebSocketListener.cs
View File

@@ -93,7 +93,7 @@ namespace MediaBrowser.Controller.Net
protected virtual void ParseMessageParams(string[] values)
{
}
/// <summary>

2
MediaBrowser.Controller/Net/IAuthorizationContext.cs
View File

@@ -10,7 +10,7 @@ namespace MediaBrowser.Controller.Net
/// <param name="requestContext">The request context.</param>
/// <returns>AuthorizationInfo.</returns>
AuthorizationInfo GetAuthorizationInfo(object requestContext);
/// <summary>
/// Gets the authorization information.
/// </summary>

10
MediaBrowser.Controller/Net/IHttpResultFactory.cs
View File

@@ -24,7 +24,7 @@ namespace MediaBrowser.Controller.Net
object GetResult(IRequest requestContext, byte[] content, string contentType, IDictionary<string, string> responseHeaders = null);
object GetResult(IRequest requestContext, Stream content, string contentType, IDictionary<string, string> responseHeaders = null);
object GetResult(IRequest requestContext, string content, string contentType, IDictionary<string, string> responseHeaders = null);
object GetResult(IRequest requestContext, string content, string contentType, IDictionary<string, string> responseHeaders = null);
object GetRedirectResult(string url);
@@ -43,10 +43,10 @@ namespace MediaBrowser.Controller.Net
/// <param name="responseHeaders">The response headers.</param>
/// <param name="isHeadRequest">if set to <c>true</c> [is head request].</param>
/// <returns>System.Object.</returns>
Task<object> GetStaticResult(IRequest requestContext,
Guid cacheKey,
Task<object> GetStaticResult(IRequest requestContext,
Guid cacheKey,
DateTime? lastDateModified,
TimeSpan? cacheDuration,
TimeSpan? cacheDuration,
string contentType, Func<Task<Stream>> factoryFn,
IDictionary<string, string> responseHeaders = null,
bool isHeadRequest = false);
@@ -74,7 +74,7 @@ namespace MediaBrowser.Controller.Net
/// <param name="requestContext">The request context.</param>
/// <param name="options">The options.</param>
/// <returns>System.Object.</returns>
Task<object> GetStaticFileResult(IRequest requestContext,
Task<object> GetStaticFileResult(IRequest requestContext,
StaticFileResultOptions options);
}
}

2
MediaBrowser.Controller/Net/ISessionContext.cs
View File

@@ -5,7 +5,7 @@ using MediaBrowser.Model.Services;
namespace MediaBrowser.Controller.Net
{
public interface ISessionContext
public interface ISessionContext
{
SessionInfo GetSession(object requestContext);
User GetUser(object requestContext);