starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 22:43:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

disable nuget package restore

Browse Source
This commit is contained in:
Luke Pulverenti
2014-10-18 15:02:54 -04:00
parent 76cabe8226
commit f1a602f5a8
32 changed files with 218 additions and 151 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,7 +30,32 @@ namespace MediaBrowser.Model.ApiClient
if (index != -1)
{
list[index] = server;
var existing = list[index];
// Merge the data
existing.DateLastAccessed = new[] { existing.DateLastAccessed, server.DateLastAccessed }.Max();
if (!string.IsNullOrEmpty(server.AccessToken))
{
existing.AccessToken = server.AccessToken;
existing.UserId = server.UserId;
}
if (!string.IsNullOrEmpty(server.RemoteAddress))
{
existing.RemoteAddress = server.RemoteAddress;
}
if (!string.IsNullOrEmpty(server.LocalAddress))
{
existing.LocalAddress = server.LocalAddress;
}
if (!string.IsNullOrEmpty(server.Name))
{
existing.Name = server.Name;
}
if (server.WakeOnLanInfos != null && server.WakeOnLanInfos.Count > 0)
{
existing.WakeOnLanInfos = server.WakeOnLanInfos.ToList();
}
}
else
{