cotugno/jellyfin
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-11-15 18:08:53 -07:00
Code Issues Packages Projects Releases Wiki Activity

update cinema mode on/off setting

Browse Source
This commit is contained in:
Luke Pulverenti 2015-11-19 00:19:54 -05:00
parent 252dde1722
commit b28be7e986
4 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
MediaBrowser.Model/ApiClient/ServerCredentials.cs
View File

@ -42,6 +42,11 @@ namespace MediaBrowser.Model.ApiClient
existing.DateLastAccessed = server.DateLastAccessed; existing.DateLastAccessed = server.DateLastAccessed;
} }
if (server.DateLastLocalConnection > existing.DateLastLocalConnection)
{
existing.DateLastLocalConnection = server.DateLastLocalConnection;
}
existing.UserLinkType = server.UserLinkType; existing.UserLinkType = server.UserLinkType;
if (!string.IsNullOrEmpty(server.AccessToken)) if (!string.IsNullOrEmpty(server.AccessToken))

1
MediaBrowser.Model/ApiClient/ServerInfo.cs
View File

@ -19,6 +19,7 @@ namespace MediaBrowser.Model.ApiClient
public String AccessToken { get; set; } public String AccessToken { get; set; }
public List<WakeOnLanInfo> WakeOnLanInfos { get; set; } public List<WakeOnLanInfo> WakeOnLanInfos { get; set; }
public DateTime DateLastAccessed { get; set; } public DateTime DateLastAccessed { get; set; }
public DateTime DateLastLocalConnection { get; set; }
public String ExchangeToken { get; set; } public String ExchangeToken { get; set; }
public UserLinkType? UserLinkType { get; set; } public UserLinkType? UserLinkType { get; set; }
public ConnectionMode? LastConnectionMode { get; set; } public ConnectionMode? LastConnectionMode { get; set; }

6
MediaBrowser.Model/Dto/BaseItemDto.cs
View File

@ -554,6 +554,12 @@ namespace MediaBrowser.Model.Dto
/// <value>The type of the collection.</value> /// <value>The type of the collection.</value>
public string CollectionType { get; set; } public string CollectionType { get; set; }
/// <summary>
/// Gets or sets the type of the original collection.
/// </summary>
/// <value>The type of the original collection.</value>
public string OriginalCollectionType { get; set; }
/// <summary> /// <summary>
/// Gets or sets the display order. /// Gets or sets the display order.
/// </summary> /// </summary>

2
MediaBrowser.Server.Implementations/Dto/DtoService.cs
View File

@ -356,6 +356,8 @@ namespace MediaBrowser.Server.Implementations.Dto
var collectionFolder = item as ICollectionFolder; var collectionFolder = item as ICollectionFolder;
if (collectionFolder != null) if (collectionFolder != null)
{ {
dto.OriginalCollectionType = collectionFolder.CollectionType;
dto.CollectionType = user == null ? dto.CollectionType = user == null ?
collectionFolder.CollectionType : collectionFolder.CollectionType :
collectionFolder.GetViewType(user); collectionFolder.GetViewType(user);