diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-06-26 06:21:00 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-26 06:21:00 +0900 |
| commit | 57caa9fdba984d0c4813c642f2617be905205d49 (patch) | |
| tree | 5a1aae16a71a90850758f5200a03cce7c164e891 | |
| parent | d0bc93e947af39c012d1b643ca2a183841c72a66 (diff) | |
| parent | ef8bec23c4f1ce9b97a155913ed57bc387184e22 (diff) | |
Merge pull request #3435 from crobibero/revert-missing-fields
revert missing session fields
| -rw-r--r-- | Emby.Server.Implementations/Session/SessionManager.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Controller/Session/SessionInfo.cs | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Session/SessionManager.cs b/Emby.Server.Implementations/Session/SessionManager.cs index 75fdedd107..d069d1ada8 100644 --- a/Emby.Server.Implementations/Session/SessionManager.cs +++ b/Emby.Server.Implementations/Session/SessionManager.cs @@ -502,7 +502,8 @@ namespace Emby.Server.Implementations.Session Client = appName, DeviceId = deviceId, ApplicationVersion = appVersion, - Id = key.GetMD5().ToString("N", CultureInfo.InvariantCulture) + Id = key.GetMD5().ToString("N", CultureInfo.InvariantCulture), + ServerId = _appHost.SystemId }; var username = user?.Username; diff --git a/MediaBrowser.Controller/Session/SessionInfo.cs b/MediaBrowser.Controller/Session/SessionInfo.cs index 36bc11be4f..4b088998cd 100644 --- a/MediaBrowser.Controller/Session/SessionInfo.cs +++ b/MediaBrowser.Controller/Session/SessionInfo.cs @@ -109,6 +109,12 @@ namespace MediaBrowser.Controller.Session public string DeviceName { get; set; } /// <summary> + /// Gets or sets the type of the device. + /// </summary> + /// <value>The type of the device.</value> + public string DeviceType { get; set; } + + /// <summary> /// Gets or sets the now playing item. /// </summary> /// <value>The now playing item.</value> @@ -215,8 +221,17 @@ namespace MediaBrowser.Controller.Session public string PlaylistItemId { get; set; } + public string ServerId { get; set; } + public string UserPrimaryImageTag { get; set; } + /// <summary> + /// Gets or sets the supported commands. + /// </summary> + /// <value>The supported commands.</value> + public string[] SupportedCommands + => Capabilities == null ? Array.Empty<string>() : Capabilities.SupportedCommands; + public Tuple<ISessionController, bool> EnsureController<T>(Func<SessionInfo, ISessionController> factory) { var controllers = SessionControllers.ToList(); |