aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/ApiClient/ConnectionMode.cs3
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs2
-rw-r--r--MediaBrowser.Model/ApiClient/ServerCredentials.cs10
-rw-r--r--MediaBrowser.Model/ApiClient/ServerDiscoveryInfo.cs5
-rw-r--r--MediaBrowser.Model/ApiClient/ServerInfo.cs21
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs5
-rw-r--r--MediaBrowser.Model/Querying/ItemFields.cs5
-rw-r--r--MediaBrowser.Model/Querying/ItemQuery.cs23
-rw-r--r--MediaBrowser.Model/Querying/ItemsByNameQuery.cs5
-rw-r--r--MediaBrowser.Model/Querying/LatestItemsQuery.cs9
-rw-r--r--MediaBrowser.Model/Querying/NextUpQuery.cs9
-rw-r--r--MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs11
12 files changed, 72 insertions, 36 deletions
diff --git a/MediaBrowser.Model/ApiClient/ConnectionMode.cs b/MediaBrowser.Model/ApiClient/ConnectionMode.cs
index f14c88a093..5dc224d959 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 15ec130cfe..b5b0b641a3 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 2490ba606c..fbbc6c05de 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 bb2b48e76f..e2f7806055 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 95cdf006b5..46cc560af2 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");
+ }
+ }
}
}
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index e0f250deb1..b83243ba8d 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -708,11 +708,6 @@ namespace MediaBrowser.Model.Dto
/// <value>The game count.</value>
public int? GameCount { get; set; }
/// <summary>
- /// Gets or sets the trailer count.
- /// </summary>
- /// <value>The trailer count.</value>
- public int? TrailerCount { get; set; }
- /// <summary>
/// Gets or sets the song count.
/// </summary>
/// <value>The song count.</value>
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index ec37c75d01..d0e2c95119 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -117,11 +117,6 @@ namespace MediaBrowser.Model.Querying
ParentId,
/// <summary>
- /// The part count
- /// </summary>
- PartCount,
-
- /// <summary>
/// The physical path of the item
/// </summary>
Path,
diff --git a/MediaBrowser.Model/Querying/ItemQuery.cs b/MediaBrowser.Model/Querying/ItemQuery.cs
index e535e8218e..0f929fa9bb 100644
--- a/MediaBrowser.Model/Querying/ItemQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemQuery.cs
@@ -97,7 +97,7 @@ namespace MediaBrowser.Model.Querying
/// </summary>
/// <value>The genres.</value>
public string[] AllGenres { get; set; }
-
+
/// <summary>
/// Limit results to items containing specific studios
/// </summary>
@@ -211,7 +211,7 @@ namespace MediaBrowser.Model.Querying
/// </summary>
/// <value>The max players.</value>
public int? MaxPlayers { get; set; }
-
+
/// <summary>
/// Gets or sets the name starts with or greater.
/// </summary>
@@ -223,7 +223,7 @@ namespace MediaBrowser.Model.Querying
/// </summary>
/// <value>The name starts with or greater.</value>
public string NameStartsWith { get; set; }
-
+
/// <summary>
/// Gets or sets the name starts with.
/// </summary>
@@ -267,7 +267,7 @@ namespace MediaBrowser.Model.Querying
public bool? CollapseBoxSetItems { get; set; }
public bool? IsPlayed { get; set; }
-
+
/// <summary>
/// Gets or sets the exclude location types.
/// </summary>
@@ -285,8 +285,8 @@ namespace MediaBrowser.Model.Querying
public bool? EnableImages { get; set; }
public int? ImageTypeLimit { get; set; }
- public string EnableImageTypes { get; set; }
-
+ public ImageType[] EnableImageTypes { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="ItemQuery" /> class.
/// </summary>
@@ -294,16 +294,16 @@ namespace MediaBrowser.Model.Querying
{
LocationTypes = new LocationType[] { };
ExcludeLocationTypes = new LocationType[] { };
-
+
SortBy = new string[] { };
- Filters = new ItemFilter[] {};
+ Filters = new ItemFilter[] { };
- Fields = new ItemFields[] {};
+ Fields = new ItemFields[] { };
- MediaTypes = new string[] {};
+ MediaTypes = new string[] { };
- VideoTypes = new VideoType[] {};
+ VideoTypes = new VideoType[] { };
Genres = new string[] { };
Studios = new string[] { };
@@ -317,6 +317,7 @@ namespace MediaBrowser.Model.Querying
ImageTypes = new ImageType[] { };
AirDays = new DayOfWeek[] { };
SeriesStatuses = new SeriesStatus[] { };
+ EnableImageTypes = new ImageType[] { };
}
}
}
diff --git a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
index 1780226288..578f22f600 100644
--- a/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
+++ b/MediaBrowser.Model/Querying/ItemsByNameQuery.cs
@@ -115,8 +115,8 @@ namespace MediaBrowser.Model.Querying
/// Gets or sets the enable image types.
/// </summary>
/// <value>The enable image types.</value>
- public string EnableImageTypes { get; set; }
-
+ public ImageType[] EnableImageTypes { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="ItemsByNameQuery" /> class.
/// </summary>
@@ -130,6 +130,7 @@ namespace MediaBrowser.Model.Querying
SortBy = new string[] { };
ExcludeItemTypes = new string[] { };
IncludeItemTypes = new string[] { };
+ EnableImageTypes = new ImageType[] { };
}
}
}
diff --git a/MediaBrowser.Model/Querying/LatestItemsQuery.cs b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
index 4537378f58..a8086e5cd9 100644
--- a/MediaBrowser.Model/Querying/LatestItemsQuery.cs
+++ b/MediaBrowser.Model/Querying/LatestItemsQuery.cs
@@ -1,4 +1,6 @@

+using MediaBrowser.Model.Entities;
+
namespace MediaBrowser.Model.Querying
{
public class LatestItemsQuery
@@ -64,6 +66,11 @@ namespace MediaBrowser.Model.Querying
/// Gets or sets the enable image types.
/// </summary>
/// <value>The enable image types.</value>
- public string EnableImageTypes { get; set; }
+ public ImageType[] EnableImageTypes { get; set; }
+
+ public LatestItemsQuery()
+ {
+ EnableImageTypes = new ImageType[] {};
+ }
}
}
diff --git a/MediaBrowser.Model/Querying/NextUpQuery.cs b/MediaBrowser.Model/Querying/NextUpQuery.cs
index c3178b8eb6..b5f50bde03 100644
--- a/MediaBrowser.Model/Querying/NextUpQuery.cs
+++ b/MediaBrowser.Model/Querying/NextUpQuery.cs
@@ -1,4 +1,5 @@
-
+using MediaBrowser.Model.Entities;
+
namespace MediaBrowser.Model.Querying
{
public class NextUpQuery
@@ -52,7 +53,11 @@ namespace MediaBrowser.Model.Querying
/// Gets or sets the enable image types.
/// </summary>
/// <value>The enable image types.</value>
- public string EnableImageTypes { get; set; }
+ public ImageType[] EnableImageTypes { get; set; }
+ public NextUpQuery()
+ {
+ EnableImageTypes = new ImageType[] {};
+ }
}
}
diff --git a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
index 359babeb23..665b980eb8 100644
--- a/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
+++ b/MediaBrowser.Model/Querying/UpcomingEpisodesQuery.cs
@@ -1,4 +1,6 @@
-namespace MediaBrowser.Model.Querying
+using MediaBrowser.Model.Entities;
+
+namespace MediaBrowser.Model.Querying
{
public class UpcomingEpisodesQuery
{
@@ -45,6 +47,11 @@
/// Gets or sets the enable image types.
/// </summary>
/// <value>The enable image types.</value>
- public string EnableImageTypes { get; set; }
+ public ImageType[] EnableImageTypes { get; set; }
+
+ public UpcomingEpisodesQuery()
+ {
+ EnableImageTypes = new ImageType[] {};
+ }
}
} \ No newline at end of file
generated by cgit v1.2.3 (git 2.46.0) at 2026-04-28 08:27:33 +0000