aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Model
diff options
context:
space:
mode:
Diffstat (limited to 'MediaBrowser.Model')
-rw-r--r--MediaBrowser.Model/ApiClient/IApiClient.cs9
-rw-r--r--MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs1
-rw-r--r--MediaBrowser.Model/Configuration/DlnaOptions.cs2
-rw-r--r--MediaBrowser.Model/Configuration/ServerConfiguration.cs31
-rw-r--r--MediaBrowser.Model/Dto/BaseItemDto.cs1
-rw-r--r--MediaBrowser.Model/Dto/MediaSourceInfo.cs2
-rw-r--r--MediaBrowser.Model/Entities/Video3DFormat.cs3
-rw-r--r--MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs7
-rw-r--r--MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs16
-rw-r--r--MediaBrowser.Model/LiveTv/LiveTvOptions.cs1
-rw-r--r--MediaBrowser.Model/MediaBrowser.Model.csproj1
-rw-r--r--MediaBrowser.Model/Querying/ItemFields.cs7
12 files changed, 51 insertions, 30 deletions
diff --git a/MediaBrowser.Model/ApiClient/IApiClient.cs b/MediaBrowser.Model/ApiClient/IApiClient.cs
index 6107c0fbe..904beb736 100644
--- a/MediaBrowser.Model/ApiClient/IApiClient.cs
+++ b/MediaBrowser.Model/ApiClient/IApiClient.cs
@@ -1413,6 +1413,13 @@ namespace MediaBrowser.Model.ApiClient
/// </summary>
/// <param name="cancellationToken">The cancellation token.</param>
/// <returns>Task&lt;System.Int32&gt;.</returns>
- Task<int> GetSupportedBitrate(CancellationToken cancellationToken);
+ Task<int> DetectMaxBitrate(CancellationToken cancellationToken);
+
+ /// <summary>
+ /// Gets the end point information.
+ /// </summary>
+ /// <param name="cancellationToken">The cancellation token.</param>
+ /// <returns>System.Threading.Tasks.Task&lt;MediaBrowser.Model.Net.EndPointInfo&gt;.</returns>
+ Task<EndPointInfo> GetEndPointInfo(CancellationToken cancellationToken);
}
} \ No newline at end of file
diff --git a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
index 764a7222f..c4b96ea2e 100644
--- a/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/CinemaModeConfiguration.cs
@@ -11,6 +11,7 @@ namespace MediaBrowser.Model.Configuration
public bool EnableIntrosParentalControl { get; set; }
public bool EnableIntrosFromSimilarMovies { get; set; }
public string CustomIntroPath { get; set; }
+ public string MediaInfoIntroPath { get; set; }
public bool EnableIntrosFromUpcomingDvdMovies { get; set; }
public bool EnableIntrosFromUpcomingStreamingMovies { get; set; }
diff --git a/MediaBrowser.Model/Configuration/DlnaOptions.cs b/MediaBrowser.Model/Configuration/DlnaOptions.cs
index c1974b877..6eaf01c4a 100644
--- a/MediaBrowser.Model/Configuration/DlnaOptions.cs
+++ b/MediaBrowser.Model/Configuration/DlnaOptions.cs
@@ -5,7 +5,7 @@ namespace MediaBrowser.Model.Configuration
{
public bool EnablePlayTo { get; set; }
public bool EnableServer { get; set; }
- public bool EnableDebugLogging { get; set; }
+ public bool EnableDebugLog { get; set; }
public bool BlastAliveMessages { get; set; }
public int ClientDiscoveryIntervalSeconds { get; set; }
public int BlastAliveMessageIntervalSeconds { get; set; }
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 152bdd993..3cb543e5d 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -93,24 +93,6 @@ namespace MediaBrowser.Model.Configuration
public bool EnableLocalizedGuids { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether [disable startup scan].
- /// </summary>
- /// <value><c>true</c> if [disable startup scan]; otherwise, <c>false</c>.</value>
- public bool DisableStartupScan { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether [enable user views].
- /// </summary>
- /// <value><c>true</c> if [enable user views]; otherwise, <c>false</c>.</value>
- public bool EnableUserViews { get; set; }
-
- /// <summary>
- /// Gets or sets a value indicating whether [enable library metadata sub folder].
- /// </summary>
- /// <value><c>true</c> if [enable library metadata sub folder]; otherwise, <c>false</c>.</value>
- public bool EnableLibraryMetadataSubFolder { get; set; }
-
- /// <summary>
/// Gets or sets the preferred metadata language.
/// </summary>
/// <value>The preferred metadata language.</value>
@@ -179,9 +161,7 @@ namespace MediaBrowser.Model.Configuration
/// </summary>
/// <value>The dashboard source path.</value>
public string DashboardSourcePath { get; set; }
-
- public bool MergeMetadataAndImagesByName { get; set; }
-
+
/// <summary>
/// Gets or sets the image saving convention.
/// </summary>
@@ -220,18 +200,18 @@ namespace MediaBrowser.Model.Configuration
public bool EnableWindowsShortcuts { get; set; }
- public bool EnableVideoFrameByFrameAnalysis { get; set; }
-
public bool EnableDateLastRefresh { get; set; }
public string[] Migrations { get; set; }
+ public int MigrationVersion { get; set; }
+
/// <summary>
/// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
/// </summary>
public ServerConfiguration()
{
- Migrations = new string[] {};
+ Migrations = new string[] { };
ImageSavingConvention = ImageSavingConvention.Compatible;
PublicPort = 8096;
@@ -576,7 +556,7 @@ namespace MediaBrowser.Model.Configuration
Type = ImageType.Thumb
}
},
- DisabledMetadataFetchers = new []{ "TheMovieDb" }
+ DisabledMetadataFetchers = new []{ "The Open Movie Database", "TheMovieDb" }
},
new MetadataOptions(0, 1280)
@@ -597,6 +577,7 @@ namespace MediaBrowser.Model.Configuration
Type = ImageType.Primary
}
},
+ DisabledMetadataFetchers = new []{ "The Open Movie Database" },
DisabledImageFetchers = new []{ "TheMovieDb" }
}
};
diff --git a/MediaBrowser.Model/Dto/BaseItemDto.cs b/MediaBrowser.Model/Dto/BaseItemDto.cs
index 935d280cd..ef2de5d78 100644
--- a/MediaBrowser.Model/Dto/BaseItemDto.cs
+++ b/MediaBrowser.Model/Dto/BaseItemDto.cs
@@ -192,6 +192,7 @@ namespace MediaBrowser.Model.Dto
/// <value>The channel identifier.</value>
public string ChannelId { get; set; }
public string ChannelName { get; set; }
+ public string ServiceName { get; set; }
/// <summary>
/// Gets or sets the overview.
diff --git a/MediaBrowser.Model/Dto/MediaSourceInfo.cs b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
index 8897edcbd..f09a8b3a7 100644
--- a/MediaBrowser.Model/Dto/MediaSourceInfo.cs
+++ b/MediaBrowser.Model/Dto/MediaSourceInfo.cs
@@ -51,7 +51,7 @@ namespace MediaBrowser.Model.Dto
public string TranscodingUrl { get; set; }
public string TranscodingSubProtocol { get; set; }
public string TranscodingContainer { get; set; }
-
+
public MediaSourceInfo()
{
Formats = new List<string>();
diff --git a/MediaBrowser.Model/Entities/Video3DFormat.cs b/MediaBrowser.Model/Entities/Video3DFormat.cs
index 064b02edd..722df4281 100644
--- a/MediaBrowser.Model/Entities/Video3DFormat.cs
+++ b/MediaBrowser.Model/Entities/Video3DFormat.cs
@@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities
HalfSideBySide,
FullSideBySide,
FullTopAndBottom,
- HalfTopAndBottom
+ HalfTopAndBottom,
+ MVC
}
}
diff --git a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
index ae701ea68..830d55bf5 100644
--- a/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
+++ b/MediaBrowser.Model/FileOrganization/AutoOrganizeOptions.cs
@@ -9,9 +9,16 @@ namespace MediaBrowser.Model.FileOrganization
/// <value>The tv options.</value>
public TvFileOrganizationOptions TvOptions { get; set; }
+ /// <summary>
+ /// Gets or sets a list of smart match entries.
+ /// </summary>
+ /// <value>The smart match entries.</value>
+ public SmartMatchInfo[] SmartMatchInfos { get; set; }
+
public AutoOrganizeOptions()
{
TvOptions = new TvFileOrganizationOptions();
+ SmartMatchInfos = new SmartMatchInfo[]{};
}
}
}
diff --git a/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
new file mode 100644
index 000000000..28c99b89b
--- /dev/null
+++ b/MediaBrowser.Model/FileOrganization/SmartMatchInfo.cs
@@ -0,0 +1,16 @@
+
+namespace MediaBrowser.Model.FileOrganization
+{
+ public class SmartMatchInfo
+ {
+ public string ItemName { get; set; }
+ public string DisplayName { get; set; }
+ public FileOrganizerType OrganizerType { get; set; }
+ public string[] MatchStrings { get; set; }
+
+ public SmartMatchInfo()
+ {
+ MatchStrings = new string[] { };
+ }
+ }
+}
diff --git a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
index 2b45422ec..838325d68 100644
--- a/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
+++ b/MediaBrowser.Model/LiveTv/LiveTvOptions.cs
@@ -8,6 +8,7 @@ namespace MediaBrowser.Model.LiveTv
public bool EnableMovieProviders { get; set; }
public string RecordingPath { get; set; }
public bool EnableAutoOrganize { get; set; }
+ public bool EnableRecordingEncoding { get; set; }
public List<TunerHostInfo> TunerHosts { get; set; }
public List<ListingsProviderInfo> ListingProviders { get; set; }
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index db278baa1..a5191192c 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -137,6 +137,7 @@
<Compile Include="Dto\MetadataEditorInfo.cs" />
<Compile Include="Dto\NameIdPair.cs" />
<Compile Include="Dto\NameValuePair.cs" />
+ <Compile Include="FileOrganization\SmartMatchInfo.cs" />
<Compile Include="MediaInfo\LiveStreamRequest.cs" />
<Compile Include="MediaInfo\LiveStreamResponse.cs" />
<Compile Include="MediaInfo\PlaybackInfoRequest.cs" />
diff --git a/MediaBrowser.Model/Querying/ItemFields.cs b/MediaBrowser.Model/Querying/ItemFields.cs
index e8b1414b7..97fec8fdd 100644
--- a/MediaBrowser.Model/Querying/ItemFields.cs
+++ b/MediaBrowser.Model/Querying/ItemFields.cs
@@ -253,6 +253,11 @@
/// <summary>
/// The season user data
/// </summary>
- SeasonUserData
+ SeasonUserData,
+
+ /// <summary>
+ /// The service name
+ /// </summary>
+ ServiceName
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2026-01-07 19:51:40 +0000