alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-04-27 12:34:56 +01:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into quickconnect

Browse Source
This commit is contained in:
ConfusedPolarBear
2020-06-19 23:33:43 -05:00
parent 329980c727 e8e5208fbd
commit e2f16fc255
725 changed files with 8927 additions and 5743 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
MediaBrowser.Controller/Session/AuthenticationRequest.cs
View File

@@ -5,13 +5,21 @@ namespace MediaBrowser.Controller.Session
public class AuthenticationRequest
{
public string Username { get; set; }
public Guid UserId { get; set; }
public string Password { get; set; }
public string PasswordSha1 { get; set; }
public string App { get; set; }
public string AppVersion { get; set; }
public string DeviceId { get; set; }
public string DeviceName { get; set; }
public string RemoteEndPoint { get; set; }
}
}

11
MediaBrowser.Controller/Session/ISessionManager.cs
View File

@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using MediaBrowser.Controller.Authentication;
using MediaBrowser.Controller.Entities;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Security;
using MediaBrowser.Model.Dto;
@@ -14,7 +13,7 @@ using MediaBrowser.Model.SyncPlay;
namespace MediaBrowser.Controller.Session
{
/// <summary>
/// Interface ISessionManager
/// Interface ISessionManager.
/// </summary>
public interface ISessionManager
{
@@ -75,19 +74,19 @@ namespace MediaBrowser.Controller.Session
/// <param name="deviceName">Name of the device.</param>
/// <param name="remoteEndPoint">The remote end point.</param>
/// <param name="user">The user.</param>
SessionInfo LogSessionActivity(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, User user);
SessionInfo LogSessionActivity(string appName, string appVersion, string deviceId, string deviceName, string remoteEndPoint, Jellyfin.Data.Entities.User user);
void UpdateDeviceName(string sessionId, string reportedDeviceName);
/// <summary>
/// Used to report that playback has started for an item
/// Used to report that playback has started for an item.
/// </summary>
/// <param name="info">The info.</param>
/// <returns>Task.</returns>
Task OnPlaybackStart(PlaybackStartInfo info);
/// <summary>
/// Used to report playback progress for an item
/// Used to report playback progress for an item.
/// </summary>
/// <param name="info">The info.</param>
/// <returns>Task.</returns>
@@ -97,7 +96,7 @@ namespace MediaBrowser.Controller.Session
Task OnPlaybackProgress(PlaybackProgressInfo info, bool isAutomated);
/// <summary>
/// Used to report that playback has ended for an item
/// Used to report that playback has ended for an item.
/// </summary>
/// <param name="info">The info.</param>
/// <returns>Task.</returns>

5
MediaBrowser.Controller/Session/SessionInfo.cs
View File

@@ -61,6 +61,7 @@ namespace MediaBrowser.Controller.Session
{
return Array.Empty<string>();
}
return Capabilities.PlayableMediaTypes;
}
}
@@ -154,6 +155,7 @@ namespace MediaBrowser.Controller.Session
return true;
}
}
if (controllers.Length > 0)
{
return false;
@@ -255,6 +257,7 @@ namespace MediaBrowser.Controller.Session
return true;
}
}
return false;
}
@@ -292,6 +295,7 @@ namespace MediaBrowser.Controller.Session
{
return;
}
if (progressInfo.IsPaused)
{
return;
@@ -334,6 +338,7 @@ namespace MediaBrowser.Controller.Session
_progressTimer.Dispose();
_progressTimer = null;
}
_lastProgressInfo = null;
}
}