diff options
Diffstat (limited to 'MediaBrowser.Model/ApiClient')
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ConnectionMode.cs | 3 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/IApiClient.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerCredentials.cs | 10 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs | 5 | ||||
| -rw-r--r-- | MediaBrowser.Model/ApiClient/ServerInfo.cs | 21 |
5 files changed, 33 insertions, 8 deletions
diff --git a/MediaBrowser.Model/ApiClient/ConnectionMode.cs b/MediaBrowser.Model/ApiClient/ConnectionMode.cs index f14c88a09..5dc224d95 100644 --- a/MediaBrowser.Model/ApiClient/ConnectionMode.cs +++ b/MediaBrowser.Model/ApiClient/ConnectionMode.cs @@ -3,6 +3,7 @@ namespace MediaBrowser.Model.ApiClient public enum ConnectionMode { Local = 1, - Remote = 2 + Remote = 2, + Manual = 3 } }
\ No newline at end of file diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs index 15ec130cf..b5b0b641a 100644 --- a/MediaBrowser.Model/ApiClient/IApiClient.cs +++ b/MediaBrowser.Model/ApiClient/IApiClient.cs @@ -413,7 +413,7 @@ namespace MediaBrowser.Model.ApiClient /// </summary> /// <param name="query">The query.</param> /// <returns>Task{ItemsResult}.</returns> - Task<ItemsResult> GetUpcomingEpisodesAsync(NextUpQuery query); + Task<ItemsResult> GetUpcomingEpisodesAsync(UpcomingEpisodesQuery query); /// <summary> /// Gets a genre diff --git a/MediaBrowser.Model/ApiClient/ServerCredentials.cs b/MediaBrowser.Model/ApiClient/ServerCredentials.cs index 2490ba606..fbbc6c05d 100644 --- a/MediaBrowser.Model/ApiClient/ServerCredentials.cs +++ b/MediaBrowser.Model/ApiClient/ServerCredentials.cs @@ -50,10 +50,14 @@ namespace MediaBrowser.Model.ApiClient { existing.RemoteAddress = server.RemoteAddress; } - if (!existing.IsLocalAddressFixed && !string.IsNullOrEmpty(server.LocalAddress)) + if (!string.IsNullOrEmpty(server.LocalAddress)) { existing.LocalAddress = server.LocalAddress; } + if (!string.IsNullOrEmpty(server.ManualAddress)) + { + existing.LocalAddress = server.ManualAddress; + } if (!string.IsNullOrEmpty(server.Name)) { existing.Name = server.Name; @@ -62,9 +66,9 @@ namespace MediaBrowser.Model.ApiClient { existing.WakeOnLanInfos = server.WakeOnLanInfos.ToList(); } - if (server.IsLocalAddressFixed) + if (server.LastConnectionMode.HasValue) { - existing.IsLocalAddressFixed = true; + existing.LastConnectionMode = server.LastConnectionMode; } } else diff --git a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs index bb2b48e76..e2f780605 100644 --- a/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs +++ b/MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs @@ -18,5 +18,10 @@ namespace MediaBrowser.Model.ApiClient /// </summary> /// <value>The name.</value> public string Name { get; set; } + /// <summary> + /// Gets or sets the endpoint address. + /// </summary> + /// <value>The endpoint address.</value> + public string EndpointAddress { get; set; } } } diff --git a/MediaBrowser.Model/ApiClient/ServerInfo.cs b/MediaBrowser.Model/ApiClient/ServerInfo.cs index 95cdf006b..46cc560af 100644 --- a/MediaBrowser.Model/ApiClient/ServerInfo.cs +++ b/MediaBrowser.Model/ApiClient/ServerInfo.cs @@ -11,14 +11,14 @@ namespace MediaBrowser.Model.ApiClient public String Id { get; set; } public String LocalAddress { get; set; } public String RemoteAddress { get; set; } + public String ManualAddress { get; set; } public String UserId { get; set; } public String AccessToken { get; set; } public List<WakeOnLanInfo> WakeOnLanInfos { get; set; } public DateTime DateLastAccessed { get; set; } public String ExchangeToken { get; set; } public UserLinkType? UserLinkType { get; set; } - - public bool IsLocalAddressFixed { get; set; } + public ConnectionMode? LastConnectionMode { get; set; } public ServerInfo() { @@ -30,7 +30,7 @@ namespace MediaBrowser.Model.ApiClient Name = systemInfo.ServerName; Id = systemInfo.Id; - if (!IsLocalAddressFixed && !string.IsNullOrEmpty(systemInfo.LocalAddress)) + if (!string.IsNullOrEmpty(systemInfo.LocalAddress)) { LocalAddress = systemInfo.LocalAddress; } @@ -55,5 +55,20 @@ namespace MediaBrowser.Model.ApiClient } } } + + public string GetAddress(ConnectionMode mode) + { + switch (mode) + { + case ConnectionMode.Local: + return LocalAddress; + case ConnectionMode.Manual: + return ManualAddress; + case ConnectionMode.Remote: + return RemoteAddress; + default: + throw new ArgumentException("Unexpected ConnectionMode"); + } + } } } |