mirror of https://github.com/jellyfin/jellyfin.git
Merge branch 'master' into gzip
This commit is contained in:
commit
b8afdd892a
|
@ -36,7 +36,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Naming</PackageId>
|
<PackageId>Jellyfin.Naming</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -82,6 +82,7 @@ using MediaBrowser.Controller.SyncPlay;
|
||||||
using MediaBrowser.Controller.TV;
|
using MediaBrowser.Controller.TV;
|
||||||
using MediaBrowser.LocalMetadata.Savers;
|
using MediaBrowser.LocalMetadata.Savers;
|
||||||
using MediaBrowser.MediaEncoding.BdInfo;
|
using MediaBrowser.MediaEncoding.BdInfo;
|
||||||
|
using MediaBrowser.MediaEncoding.Subtitles;
|
||||||
using MediaBrowser.Model.Cryptography;
|
using MediaBrowser.Model.Cryptography;
|
||||||
using MediaBrowser.Model.Dlna;
|
using MediaBrowser.Model.Dlna;
|
||||||
using MediaBrowser.Model.Globalization;
|
using MediaBrowser.Model.Globalization;
|
||||||
|
@ -110,7 +111,7 @@ namespace Emby.Server.Implementations
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class CompositionRoot.
|
/// Class CompositionRoot.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public abstract class ApplicationHost : IServerApplicationHost, IDisposable
|
public abstract class ApplicationHost : IServerApplicationHost, IAsyncDisposable, IDisposable
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The environment variable prefixes to log at server startup.
|
/// The environment variable prefixes to log at server startup.
|
||||||
|
@ -631,7 +632,8 @@ namespace Emby.Server.Implementations
|
||||||
serviceCollection.AddSingleton<IAuthService, AuthService>();
|
serviceCollection.AddSingleton<IAuthService, AuthService>();
|
||||||
serviceCollection.AddSingleton<IQuickConnect, QuickConnectManager>();
|
serviceCollection.AddSingleton<IQuickConnect, QuickConnectManager>();
|
||||||
|
|
||||||
serviceCollection.AddSingleton<ISubtitleEncoder, MediaBrowser.MediaEncoding.Subtitles.SubtitleEncoder>();
|
serviceCollection.AddSingleton<ISubtitleParser, SubtitleEditParser>();
|
||||||
|
serviceCollection.AddSingleton<ISubtitleEncoder, SubtitleEncoder>();
|
||||||
|
|
||||||
serviceCollection.AddSingleton<IAttachmentExtractor, MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor>();
|
serviceCollection.AddSingleton<IAttachmentExtractor, MediaBrowser.MediaEncoding.Attachments.AttachmentExtractor>();
|
||||||
|
|
||||||
|
@ -1229,5 +1231,49 @@ namespace Emby.Server.Implementations
|
||||||
|
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
await DisposeAsyncCore().ConfigureAwait(false);
|
||||||
|
Dispose(false);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Used to perform asynchronous cleanup of managed resources or for cascading calls to <see cref="DisposeAsync"/>.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A ValueTask.</returns>
|
||||||
|
protected virtual async ValueTask DisposeAsyncCore()
|
||||||
|
{
|
||||||
|
var type = GetType();
|
||||||
|
|
||||||
|
Logger.LogInformation("Disposing {Type}", type.Name);
|
||||||
|
|
||||||
|
foreach (var (part, _) in _disposableParts)
|
||||||
|
{
|
||||||
|
var partType = part.GetType();
|
||||||
|
if (partType == type)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
Logger.LogInformation("Disposing {Type}", partType.Name);
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
part.Dispose();
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
Logger.LogError(ex, "Error disposing {Type}", partType.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// used for closing websockets
|
||||||
|
foreach (var session in _sessionManager.Sessions)
|
||||||
|
{
|
||||||
|
await session.DisposeAsync().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -4934,6 +4934,7 @@ SELECT key FROM UserDatas WHERE isFavorite=@IsFavorite AND userId=@UserId)
|
||||||
AND Type = @InternalPersonType)");
|
AND Type = @InternalPersonType)");
|
||||||
statement?.TryBind("@IsFavorite", query.IsFavorite.Value);
|
statement?.TryBind("@IsFavorite", query.IsFavorite.Value);
|
||||||
statement?.TryBind("@InternalPersonType", typeof(Person).FullName);
|
statement?.TryBind("@InternalPersonType", typeof(Person).FullName);
|
||||||
|
statement?.TryBind("@UserId", query.User.InternalId);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!query.ItemId.Equals(default))
|
if (!query.ItemId.Equals(default))
|
||||||
|
@ -4988,11 +4989,6 @@ AND Type = @InternalPersonType)");
|
||||||
statement?.TryBind("@NameContains", "%" + query.NameContains + "%");
|
statement?.TryBind("@NameContains", "%" + query.NameContains + "%");
|
||||||
}
|
}
|
||||||
|
|
||||||
if (query.User != null)
|
|
||||||
{
|
|
||||||
statement?.TryBind("@UserId", query.User.InternalId);
|
|
||||||
}
|
|
||||||
|
|
||||||
return whereClauses;
|
return whereClauses;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -29,7 +29,7 @@
|
||||||
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="6.0.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
|
||||||
<PackageReference Include="Mono.Nat" Version="3.0.3" />
|
<PackageReference Include="Mono.Nat" Version="3.0.3" />
|
||||||
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.2.4" />
|
<PackageReference Include="prometheus-net.DotNetRuntime" Version="4.2.4" />
|
||||||
<PackageReference Include="SQLitePCL.pretty.netstandard" Version="3.1.0" />
|
<PackageReference Include="SQLitePCL.pretty.netstandard" Version="3.1.0" />
|
||||||
|
|
|
@ -19,7 +19,7 @@ namespace Emby.Server.Implementations.HttpServer
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class WebSocketConnection.
|
/// Class WebSocketConnection.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public class WebSocketConnection : IWebSocketConnection, IDisposable
|
public class WebSocketConnection : IWebSocketConnection
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The logger.
|
/// The logger.
|
||||||
|
@ -36,6 +36,8 @@ namespace Emby.Server.Implementations.HttpServer
|
||||||
/// </summary>
|
/// </summary>
|
||||||
private readonly WebSocket _socket;
|
private readonly WebSocket _socket;
|
||||||
|
|
||||||
|
private bool _disposed = false;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="WebSocketConnection" /> class.
|
/// Initializes a new instance of the <see cref="WebSocketConnection" /> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
@ -244,10 +246,39 @@ namespace Emby.Server.Implementations.HttpServer
|
||||||
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
|
/// <param name="dispose"><c>true</c> to release both managed and unmanaged resources; <c>false</c> to release only unmanaged resources.</param>
|
||||||
protected virtual void Dispose(bool dispose)
|
protected virtual void Dispose(bool dispose)
|
||||||
{
|
{
|
||||||
|
if (_disposed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (dispose)
|
if (dispose)
|
||||||
{
|
{
|
||||||
_socket.Dispose();
|
_socket.Dispose();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_disposed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
await DisposeAsyncCore().ConfigureAwait(false);
|
||||||
|
Dispose(false);
|
||||||
|
GC.SuppressFinalize(this);
|
||||||
|
}
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Used to perform asynchronous cleanup of managed resources or for cascading calls to <see cref="DisposeAsync"/>.
|
||||||
|
/// </summary>
|
||||||
|
/// <returns>A ValueTask.</returns>
|
||||||
|
protected virtual async ValueTask DisposeAsyncCore()
|
||||||
|
{
|
||||||
|
if (_socket.State == WebSocketState.Open)
|
||||||
|
{
|
||||||
|
await _socket.CloseOutputAsync(WebSocketCloseStatus.NormalClosure, "System Shutdown", CancellationToken.None).ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
|
||||||
|
_socket.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -2453,6 +2453,12 @@ namespace Emby.Server.Implementations.Library
|
||||||
return RootFolder;
|
return RootFolder;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public void QueueLibraryScan()
|
||||||
|
{
|
||||||
|
_taskManager.QueueScheduledTask<RefreshMediaLibraryTask>();
|
||||||
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public int? GetSeasonNumberFromPath(string path)
|
public int? GetSeasonNumberFromPath(string path)
|
||||||
=> SeasonPathParser.Parse(path, true, true).SeasonNumber;
|
=> SeasonPathParser.Parse(path, true, true).SeasonNumber;
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
{
|
{
|
||||||
"Albums": "ألبومات",
|
"Albums": "البومات",
|
||||||
"AppDeviceValues": "تطبيق: {0}, جهاز: {1}",
|
"AppDeviceValues": "تطبيق: {0}, جهاز: {1}",
|
||||||
"Application": "تطبيق",
|
"Application": "تطبيق",
|
||||||
"Artists": "الفنانين",
|
"Artists": "الفنانين",
|
||||||
|
@ -92,22 +92,22 @@
|
||||||
"ValueHasBeenAddedToLibrary": "تمت اضافت {0} إلى مكتبة الوسائط",
|
"ValueHasBeenAddedToLibrary": "تمت اضافت {0} إلى مكتبة الوسائط",
|
||||||
"ValueSpecialEpisodeName": "حلقه خاصه - {0}",
|
"ValueSpecialEpisodeName": "حلقه خاصه - {0}",
|
||||||
"VersionNumber": "النسخة {0}",
|
"VersionNumber": "النسخة {0}",
|
||||||
"TaskCleanCacheDescription": "يحذف ملفات ذاكرة التخزين المؤقت التي لم يعد النظام بحاجة إليها.",
|
"TaskCleanCacheDescription": "يحذف الملفات المؤقتة التي لم يعد النظام بحاجة إليها.",
|
||||||
"TaskCleanCache": "احذف مجلد ذاكرة التخزين المؤقت",
|
"TaskCleanCache": "احذف ما بمجلد الملفات المؤقتة",
|
||||||
"TasksChannelsCategory": "قنوات الإنترنت",
|
"TasksChannelsCategory": "قنوات الإنترنت",
|
||||||
"TasksLibraryCategory": "مكتبة",
|
"TasksLibraryCategory": "مكتبة",
|
||||||
"TasksMaintenanceCategory": "صيانة",
|
"TasksMaintenanceCategory": "صيانة",
|
||||||
"TaskRefreshLibraryDescription": "يقوم بفصح مكتبة الوسائط الخاصة بك بحثًا عن ملفات جديدة وتحديث البيانات الوصفية.",
|
"TaskRefreshLibraryDescription": "يفصح مكتبة الوسائط الخاصة بك بحثًا عن ملفات جديدة، ومن ثم يتحدث البيانات الوصفية.",
|
||||||
"TaskRefreshLibrary": "افحص مكتبة الوسائط",
|
"TaskRefreshLibrary": "افحص مكتبة الوسائط",
|
||||||
"TaskRefreshChapterImagesDescription": "يقوم بانشاء صور مصغرة لمقاطع الفيديو التي تحتوي على فصول.",
|
"TaskRefreshChapterImagesDescription": "يُنشئ صور مصغرة لمقاطع الفيديو التي تحتوي على فصول.",
|
||||||
"TaskRefreshChapterImages": "استخراج صور الفصل",
|
"TaskRefreshChapterImages": "استخراج صور الفصل",
|
||||||
"TasksApplicationCategory": "تطبيق",
|
"TasksApplicationCategory": "تطبيق",
|
||||||
"TaskDownloadMissingSubtitlesDescription": "يقوم بالبحث في الإنترنت على الترجمات المفقودة إستنادا على البيانات الوصفية.",
|
"TaskDownloadMissingSubtitlesDescription": "يبحث في الإنترنت على الترجمات الناقصة استنادا على البيانات الوصفية.",
|
||||||
"TaskDownloadMissingSubtitles": "تحميل الترجمات المفقودة",
|
"TaskDownloadMissingSubtitles": "تحميل الترجمات الناقصة",
|
||||||
"TaskRefreshChannelsDescription": "يقوم بتحديث معلومات قنوات الإنترنت.",
|
"TaskRefreshChannelsDescription": "يحدث معلومات قنوات الإنترنت.",
|
||||||
"TaskRefreshChannels": "إعادة تحديث القنوات",
|
"TaskRefreshChannels": "إعادة تحديث القنوات",
|
||||||
"TaskCleanTranscodeDescription": "يقوم بحذف ملفات الترميز الأقدم من يوم واحد.",
|
"TaskCleanTranscodeDescription": "يحذف ملفات الترميز الأقدم من يوم واحد.",
|
||||||
"TaskCleanTranscode": "حذف سجلات الترميز",
|
"TaskCleanTranscode": "حذف ما بمجلد الترميز",
|
||||||
"TaskUpdatePluginsDescription": "تحميل وتثبيت الإضافات التي تم تفعيل التحديث التلقائي لها.",
|
"TaskUpdatePluginsDescription": "تحميل وتثبيت الإضافات التي تم تفعيل التحديث التلقائي لها.",
|
||||||
"TaskUpdatePlugins": "تحديث الإضافات",
|
"TaskUpdatePlugins": "تحديث الإضافات",
|
||||||
"TaskRefreshPeopleDescription": "يقوم بتحديث البيانات الوصفية للممثلين والمخرجين في مكتبة الوسائط الخاصة بك.",
|
"TaskRefreshPeopleDescription": "يقوم بتحديث البيانات الوصفية للممثلين والمخرجين في مكتبة الوسائط الخاصة بك.",
|
||||||
|
@ -116,12 +116,12 @@
|
||||||
"TaskCleanLogs": "حذف مسار السجل",
|
"TaskCleanLogs": "حذف مسار السجل",
|
||||||
"TaskCleanActivityLogDescription": "يحذف سجل الأنشطة الأقدم من الوقت الذي تم تحديده.",
|
"TaskCleanActivityLogDescription": "يحذف سجل الأنشطة الأقدم من الوقت الذي تم تحديده.",
|
||||||
"TaskCleanActivityLog": "حذف سجل الأنشطة",
|
"TaskCleanActivityLog": "حذف سجل الأنشطة",
|
||||||
"Default": "إفتراضي",
|
"Default": "افتراضي",
|
||||||
"Undefined": "غير معرف",
|
"Undefined": "غير معرف",
|
||||||
"Forced": "ملحقة",
|
"Forced": "ملحقة",
|
||||||
"TaskOptimizeDatabaseDescription": "يضغط قاعدة البيانات ويقتطع المساحة الحرة. تشغيل هذه المهمة بعد فحص المكتبة أو إجراء تغييرات أخرى تتضمن تعديلات في قاعدة البيانات قد تؤدي إلى تحسين الأداء.",
|
"TaskOptimizeDatabaseDescription": "يضغط قاعدة البيانات ويقتطع المساحة الحرة. تشغيل هذه المهمة بعد فحص المكتبة أو إجراء تغييرات أخرى تتضمن تعديلات في قاعدة البيانات قد تؤدي إلى تحسين الأداء.",
|
||||||
"TaskOptimizeDatabase": "تحسين قاعدة البيانات",
|
"TaskOptimizeDatabase": "تحسين قاعدة البيانات",
|
||||||
"TaskKeyframeExtractorDescription": "يقوم باستخراج الإطارات الرئيسيه من ملفات الفيديو لكي ينشئ قوائم تشغيل بث HTTP المباشر. هذه المهمه قد تستمر لاوقات طويلة.",
|
"TaskKeyframeExtractorDescription": "يستخرج الإطارات الرئيسية من ملفات الفيديو لكي ينشئ قوائم تشغيل بث HTTP المباشر. قد تستمر هذه العملية لوقت طويل.",
|
||||||
"TaskKeyframeExtractor": "مستخرج الإطار الرئيسي",
|
"TaskKeyframeExtractor": "مستخرج الإطار الرئيسي",
|
||||||
"External": "خارجي"
|
"External": "خارجي"
|
||||||
}
|
}
|
||||||
|
|
|
@ -121,7 +121,7 @@
|
||||||
"Default": "Standard",
|
"Default": "Standard",
|
||||||
"TaskOptimizeDatabaseDescription": "Komprimiert die Datenbank und trimmt den freien Speicherplatz. Die Ausführung dieser Aufgabe nach dem Scannen der Bibliothek oder nach anderen Änderungen, die Datenbankänderungen implizieren, kann die Leistung verbessern.",
|
"TaskOptimizeDatabaseDescription": "Komprimiert die Datenbank und trimmt den freien Speicherplatz. Die Ausführung dieser Aufgabe nach dem Scannen der Bibliothek oder nach anderen Änderungen, die Datenbankänderungen implizieren, kann die Leistung verbessern.",
|
||||||
"TaskOptimizeDatabase": "Datenbank optimieren",
|
"TaskOptimizeDatabase": "Datenbank optimieren",
|
||||||
"TaskKeyframeExtractorDescription": "Extrahiere Keyframes aus Videodateien, um präzisere HLS-Playlisten zu erzeugen. Diese Aufgabe kann sehr lange dauern.",
|
"TaskKeyframeExtractorDescription": "Extrahiere Keyframes aus Videodateien, um präzisere HLS-Playlisten zu erzeugen. Dieser Vorgang kann sehr lange dauern.",
|
||||||
"TaskKeyframeExtractor": "Keyframe Extraktor",
|
"TaskKeyframeExtractor": "Keyframe Extraktor",
|
||||||
"External": "Extern"
|
"External": "Extern"
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,7 +5,7 @@
|
||||||
"Artists": "Artistes",
|
"Artists": "Artistes",
|
||||||
"AuthenticationSucceededWithUserName": "{0} authentifié avec succès",
|
"AuthenticationSucceededWithUserName": "{0} authentifié avec succès",
|
||||||
"Books": "Livres",
|
"Books": "Livres",
|
||||||
"CameraImageUploadedFrom": "Une photo a été chargée depuis {0}",
|
"CameraImageUploadedFrom": "Une photo a été téléversée depuis {0}",
|
||||||
"Channels": "Chaînes",
|
"Channels": "Chaînes",
|
||||||
"ChapterNameValue": "Chapitre {0}",
|
"ChapterNameValue": "Chapitre {0}",
|
||||||
"Collections": "Collections",
|
"Collections": "Collections",
|
||||||
|
@ -42,13 +42,13 @@
|
||||||
"MusicVideos": "Clips musicaux",
|
"MusicVideos": "Clips musicaux",
|
||||||
"NameInstallFailed": "{0} échec de l'installation",
|
"NameInstallFailed": "{0} échec de l'installation",
|
||||||
"NameSeasonNumber": "Saison {0}",
|
"NameSeasonNumber": "Saison {0}",
|
||||||
"NameSeasonUnknown": "Saison Inconnue",
|
"NameSeasonUnknown": "Saison inconnue",
|
||||||
"NewVersionIsAvailable": "Une nouvelle version de Jellyfin Serveur est disponible au téléchargement.",
|
"NewVersionIsAvailable": "Une nouvelle version de Jellyfin Serveur est disponible au téléchargement.",
|
||||||
"NotificationOptionApplicationUpdateAvailable": "Mise à jour de l'application disponible",
|
"NotificationOptionApplicationUpdateAvailable": "Mise à jour de l'application disponible",
|
||||||
"NotificationOptionApplicationUpdateInstalled": "Mise à jour de l'application installée",
|
"NotificationOptionApplicationUpdateInstalled": "Mise à jour de l'application installée",
|
||||||
"NotificationOptionAudioPlayback": "Lecture audio démarrée",
|
"NotificationOptionAudioPlayback": "Lecture audio démarrée",
|
||||||
"NotificationOptionAudioPlaybackStopped": "Lecture audio arrêtée",
|
"NotificationOptionAudioPlaybackStopped": "Lecture audio arrêtée",
|
||||||
"NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a été transférée",
|
"NotificationOptionCameraImageUploaded": "L'image de l'appareil photo a été téléversée",
|
||||||
"NotificationOptionInstallationFailed": "Échec de l'installation",
|
"NotificationOptionInstallationFailed": "Échec de l'installation",
|
||||||
"NotificationOptionNewLibraryContent": "Nouveau contenu ajouté",
|
"NotificationOptionNewLibraryContent": "Nouveau contenu ajouté",
|
||||||
"NotificationOptionPluginError": "Erreur d'extension",
|
"NotificationOptionPluginError": "Erreur d'extension",
|
||||||
|
@ -71,7 +71,7 @@
|
||||||
"ScheduledTaskStartedWithName": "{0} a démarré",
|
"ScheduledTaskStartedWithName": "{0} a démarré",
|
||||||
"ServerNameNeedsToBeRestarted": "{0} doit être redémarré",
|
"ServerNameNeedsToBeRestarted": "{0} doit être redémarré",
|
||||||
"Shows": "Séries",
|
"Shows": "Séries",
|
||||||
"Songs": "Chansons",
|
"Songs": "Titres",
|
||||||
"StartupEmbyServerIsLoading": "Le serveur Jellyfin est en cours de chargement. Veuillez réessayer dans quelques instants.",
|
"StartupEmbyServerIsLoading": "Le serveur Jellyfin est en cours de chargement. Veuillez réessayer dans quelques instants.",
|
||||||
"SubtitleDownloadFailureForItem": "Le téléchargement des sous-titres pour {0} a échoué.",
|
"SubtitleDownloadFailureForItem": "Le téléchargement des sous-titres pour {0} a échoué.",
|
||||||
"SubtitleDownloadFailureFromForItem": "Échec du téléchargement des sous-titres depuis {0} pour {1}",
|
"SubtitleDownloadFailureFromForItem": "Échec du téléchargement des sous-titres depuis {0} pour {1}",
|
||||||
|
@ -92,34 +92,34 @@
|
||||||
"ValueHasBeenAddedToLibrary": "{0} a été ajouté à votre médiathèque",
|
"ValueHasBeenAddedToLibrary": "{0} a été ajouté à votre médiathèque",
|
||||||
"ValueSpecialEpisodeName": "Spécial - {0}",
|
"ValueSpecialEpisodeName": "Spécial - {0}",
|
||||||
"VersionNumber": "Version {0}",
|
"VersionNumber": "Version {0}",
|
||||||
"TasksChannelsCategory": "Chaines en ligne",
|
"TasksChannelsCategory": "Chaînes en ligne",
|
||||||
"TaskDownloadMissingSubtitlesDescription": "Recherche les sous-titres manquants sur internet en se basant sur la configuration des métadonnées.",
|
"TaskDownloadMissingSubtitlesDescription": "Recherche les sous-titres manquants sur Internet en se basant sur la configuration des métadonnées.",
|
||||||
"TaskDownloadMissingSubtitles": "Télécharger les sous-titres manquants",
|
"TaskDownloadMissingSubtitles": "Télécharger les sous-titres manquants",
|
||||||
"TaskRefreshChannelsDescription": "Rafraîchit les informations des chaines en ligne.",
|
"TaskRefreshChannelsDescription": "Actualise les informations des chaînes en ligne.",
|
||||||
"TaskRefreshChannels": "Rafraîchir les chaines",
|
"TaskRefreshChannels": "Actualiser les chaînes",
|
||||||
"TaskCleanTranscodeDescription": "Supprime les fichiers transcodés de plus d'un jour.",
|
"TaskCleanTranscodeDescription": "Supprime les fichiers transcodés de plus d'un jour.",
|
||||||
"TaskCleanTranscode": "Nettoyer les dossier des transcodages",
|
"TaskCleanTranscode": "Nettoyer le dossier des transcodages",
|
||||||
"TaskUpdatePluginsDescription": "Télécharge et installe les mises à jours des extensions configurées pour être mises à jour automatiquement.",
|
"TaskUpdatePluginsDescription": "Télécharge et installe les mises à jours des extensions configurées pour être mises à jour automatiquement.",
|
||||||
"TaskUpdatePlugins": "Mettre à jour les extensions",
|
"TaskUpdatePlugins": "Mettre à jour les extensions",
|
||||||
"TaskRefreshPeopleDescription": "Met à jour les métadonnées pour les acteurs et réalisateurs dans votre bibliothèque.",
|
"TaskRefreshPeopleDescription": "Met à jour les métadonnées pour les acteurs et réalisateurs dans votre médiathèque.",
|
||||||
"TaskRefreshPeople": "Rafraîchir les acteurs",
|
"TaskRefreshPeople": "Actualiser les acteurs",
|
||||||
"TaskCleanLogsDescription": "Supprime les journaux de plus de {0} jours.",
|
"TaskCleanLogsDescription": "Supprime les journaux de plus de {0} jours.",
|
||||||
"TaskCleanLogs": "Nettoyer le répertoire des journaux",
|
"TaskCleanLogs": "Nettoyer le répertoire des journaux",
|
||||||
"TaskRefreshLibraryDescription": "Scanne votre médiathèque pour trouver les nouveaux fichiers et rafraîchit les métadonnées.",
|
"TaskRefreshLibraryDescription": "Scanne votre médiathèque pour trouver les nouveaux fichiers et actualise les métadonnées.",
|
||||||
"TaskRefreshLibrary": "Scanner la médiathèque",
|
"TaskRefreshLibrary": "Scanner la médiathèque",
|
||||||
"TaskRefreshChapterImagesDescription": "Crée des vignettes pour les vidéos ayant des chapitres.",
|
"TaskRefreshChapterImagesDescription": "Crée des vignettes pour les vidéos ayant des chapitres.",
|
||||||
"TaskRefreshChapterImages": "Extraire les images de chapitre",
|
"TaskRefreshChapterImages": "Extraire les images de chapitre",
|
||||||
"TaskCleanCacheDescription": "Supprime les fichiers de cache dont le système n'a plus besoin.",
|
"TaskCleanCacheDescription": "Supprime les fichiers de cache dont le système n'a plus besoin.",
|
||||||
"TaskCleanCache": "Vider le répertoire cache",
|
"TaskCleanCache": "Vider le répertoire cache",
|
||||||
"TasksApplicationCategory": "Application",
|
"TasksApplicationCategory": "Application",
|
||||||
"TasksLibraryCategory": "Bibliothèque",
|
"TasksLibraryCategory": "Médiathèque",
|
||||||
"TasksMaintenanceCategory": "Maintenance",
|
"TasksMaintenanceCategory": "Maintenance",
|
||||||
"TaskCleanActivityLogDescription": "Supprime les entrées du journal d'activité antérieures à l'âge configuré.",
|
"TaskCleanActivityLogDescription": "Supprime les entrées du journal d'activité antérieures à l'âge configuré.",
|
||||||
"TaskCleanActivityLog": "Nettoyer le journal d'activité",
|
"TaskCleanActivityLog": "Nettoyer le journal d'activité",
|
||||||
"Undefined": "Non défini",
|
"Undefined": "Non défini",
|
||||||
"Forced": "Forcé",
|
"Forced": "Forcé",
|
||||||
"Default": "Par défaut",
|
"Default": "Par défaut",
|
||||||
"TaskOptimizeDatabaseDescription": "Réduit les espaces vides/inutiles et compacte la base de données. Utiliser cette fonction après une mise à jour de la bibliothèque ou toute autre modification de la base de données peut améliorer les performances du serveur.",
|
"TaskOptimizeDatabaseDescription": "Réduit les espaces vides ou inutiles et compacte la base de données. Utiliser cette fonction après une mise à jour de la médiathèque ou toute autre modification de la base de données peut améliorer les performances du serveur.",
|
||||||
"TaskOptimizeDatabase": "Optimiser la base de données",
|
"TaskOptimizeDatabase": "Optimiser la base de données",
|
||||||
"TaskKeyframeExtractorDescription": "Extrait les images clés des fichiers vidéo pour créer des listes de lecture HLS plus précises. Cette tâche peut durer très longtemps.",
|
"TaskKeyframeExtractorDescription": "Extrait les images clés des fichiers vidéo pour créer des listes de lecture HLS plus précises. Cette tâche peut durer très longtemps.",
|
||||||
"TaskKeyframeExtractor": "Extracteur d'image clé",
|
"TaskKeyframeExtractor": "Extracteur d'image clé",
|
||||||
|
|
|
@ -39,7 +39,7 @@
|
||||||
"MixedContent": "Mixed content",
|
"MixedContent": "Mixed content",
|
||||||
"Movies": "Filmai",
|
"Movies": "Filmai",
|
||||||
"Music": "Muzika",
|
"Music": "Muzika",
|
||||||
"MusicVideos": "Muzikiniai klipai",
|
"MusicVideos": "Muzikiniai vaizdo įrašai",
|
||||||
"NameInstallFailed": "{0} diegimo klaida",
|
"NameInstallFailed": "{0} diegimo klaida",
|
||||||
"NameSeasonNumber": "Sezonas {0}",
|
"NameSeasonNumber": "Sezonas {0}",
|
||||||
"NameSeasonUnknown": "Sezonas neatpažintas",
|
"NameSeasonUnknown": "Sezonas neatpažintas",
|
||||||
|
|
|
@ -61,7 +61,7 @@
|
||||||
"NotificationOptionVideoPlayback": "Ulangmain video bermula",
|
"NotificationOptionVideoPlayback": "Ulangmain video bermula",
|
||||||
"NotificationOptionVideoPlaybackStopped": "Ulangmain video dihentikan",
|
"NotificationOptionVideoPlaybackStopped": "Ulangmain video dihentikan",
|
||||||
"Photos": "Gambar-gambar",
|
"Photos": "Gambar-gambar",
|
||||||
"Playlists": "Senarai main",
|
"Playlists": "Senarai ulangmain",
|
||||||
"Plugin": "Plugin",
|
"Plugin": "Plugin",
|
||||||
"PluginInstalledWithName": "{0} telah dipasang",
|
"PluginInstalledWithName": "{0} telah dipasang",
|
||||||
"PluginUninstalledWithName": "{0} telah dinyahpasang",
|
"PluginUninstalledWithName": "{0} telah dinyahpasang",
|
||||||
|
|
|
@ -31,7 +31,7 @@
|
||||||
"ItemRemovedWithName": "{0} - изъято из медиатеки",
|
"ItemRemovedWithName": "{0} - изъято из медиатеки",
|
||||||
"LabelIpAddressValue": "IP-адрес: {0}",
|
"LabelIpAddressValue": "IP-адрес: {0}",
|
||||||
"LabelRunningTimeValue": "Длительность: {0}",
|
"LabelRunningTimeValue": "Длительность: {0}",
|
||||||
"Latest": "Крайнее",
|
"Latest": "Новое",
|
||||||
"MessageApplicationUpdated": "Jellyfin Server был обновлён",
|
"MessageApplicationUpdated": "Jellyfin Server был обновлён",
|
||||||
"MessageApplicationUpdatedTo": "Jellyfin Server был обновлён до {0}",
|
"MessageApplicationUpdatedTo": "Jellyfin Server был обновлён до {0}",
|
||||||
"MessageNamedServerConfigurationUpdatedWithValue": "Конфигурация сервера (раздел {0}) была обновлена",
|
"MessageNamedServerConfigurationUpdatedWithValue": "Конфигурация сервера (раздел {0}) была обновлена",
|
||||||
|
|
|
@ -120,5 +120,7 @@
|
||||||
"Default": "Подразумевано",
|
"Default": "Подразумевано",
|
||||||
"TaskOptimizeDatabase": "Оптимизуј датабазу",
|
"TaskOptimizeDatabase": "Оптимизуј датабазу",
|
||||||
"TaskOptimizeDatabaseDescription": "Сажима базу података и скраћује слободан простор. Покретање овог задатка након скенирања библиотеке или других промена које подразумевају измене базе података које могу побољшати перформансе.",
|
"TaskOptimizeDatabaseDescription": "Сажима базу података и скраћује слободан простор. Покретање овог задатка након скенирања библиотеке или других промена које подразумевају измене базе података које могу побољшати перформансе.",
|
||||||
"External": "Спољно"
|
"External": "Спољно",
|
||||||
|
"TaskKeyframeExtractorDescription": "Екстрактује кљулне сличице из видео датотека да би креирао више преицзну HLS плеј-листу. Овај задатак може да потраје дуже време.",
|
||||||
|
"TaskKeyframeExtractor": "Екстрактор кључних сличица"
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,19 +10,19 @@
|
||||||
"ItemAddedWithName": "{0} додано до медіатеки",
|
"ItemAddedWithName": "{0} додано до медіатеки",
|
||||||
"HeaderNextUp": "Наступний",
|
"HeaderNextUp": "Наступний",
|
||||||
"HeaderLiveTV": "Ефірне ТБ",
|
"HeaderLiveTV": "Ефірне ТБ",
|
||||||
"HeaderFavoriteSongs": "Улюблені пісні",
|
"HeaderFavoriteSongs": "Обрані пісні",
|
||||||
"HeaderFavoriteShows": "Улюблені шоу",
|
"HeaderFavoriteShows": "Обрані шоу",
|
||||||
"HeaderFavoriteEpisodes": "Улюблені серії",
|
"HeaderFavoriteEpisodes": "Обрані епізоди",
|
||||||
"HeaderFavoriteArtists": "Улюблені виконавці",
|
"HeaderFavoriteArtists": "Обрані виконавці",
|
||||||
"HeaderFavoriteAlbums": "Улюблені альбоми",
|
"HeaderFavoriteAlbums": "Обрані альбоми",
|
||||||
"HeaderContinueWatching": "Продовжити перегляд",
|
"HeaderContinueWatching": "Продовжити перегляд",
|
||||||
"HeaderAlbumArtists": "Виконавці альбому",
|
"HeaderAlbumArtists": "Виконавці альбому",
|
||||||
"Genres": "Жанри",
|
"Genres": "Жанри",
|
||||||
"Folders": "Каталоги",
|
"Folders": "Каталоги",
|
||||||
"Favorites": "Улюблені",
|
"Favorites": "Обрані",
|
||||||
"DeviceOnlineWithName": "Пристрій {0} підключився",
|
"DeviceOnlineWithName": "Пристрій {0} підключився",
|
||||||
"DeviceOfflineWithName": "Пристрій {0} відключився",
|
"DeviceOfflineWithName": "Пристрій {0} відключився",
|
||||||
"Collections": "Колекції",
|
"Collections": "Добірки",
|
||||||
"ChapterNameValue": "Розділ {0}",
|
"ChapterNameValue": "Розділ {0}",
|
||||||
"Channels": "Канали",
|
"Channels": "Канали",
|
||||||
"CameraImageUploadedFrom": "Нова фотографія завантажена з {0}",
|
"CameraImageUploadedFrom": "Нова фотографія завантажена з {0}",
|
||||||
|
@ -119,7 +119,7 @@
|
||||||
"Undefined": "Не визначено",
|
"Undefined": "Не визначено",
|
||||||
"Default": "За замовчуванням",
|
"Default": "За замовчуванням",
|
||||||
"TaskOptimizeDatabase": "Оптимізувати базу даних",
|
"TaskOptimizeDatabase": "Оптимізувати базу даних",
|
||||||
"TaskOptimizeDatabaseDescription": "Стиснення бази даних та збільшення вільного простору. Виконання цього завдання після сканування бібліотеки або внесення інших змін, які передбачають модифікацію бази даних, може покращити продуктивність.",
|
"TaskOptimizeDatabaseDescription": "Стискає базу даних та збільшує вільний простір. Виконання цього завдання після сканування медіатеки або внесення інших змін, які передбачають модифікацію бази даних може покращити продуктивність.",
|
||||||
"TaskKeyframeExtractorDescription": "Витягує ключові кадри з відеофайлів для створення більш точних списків відтворення HLS. Це завдання може виконуватися протягом тривалого часу.",
|
"TaskKeyframeExtractorDescription": "Витягує ключові кадри з відеофайлів для створення більш точних списків відтворення HLS. Це завдання може виконуватися протягом тривалого часу.",
|
||||||
"TaskKeyframeExtractor": "Екстрактор ключових кадрів",
|
"TaskKeyframeExtractor": "Екстрактор ключових кадрів",
|
||||||
"External": "Зовнішній"
|
"External": "Зовнішній"
|
||||||
|
|
|
@ -14,7 +14,7 @@ using Microsoft.Extensions.Logging;
|
||||||
|
|
||||||
namespace Emby.Server.Implementations.Session
|
namespace Emby.Server.Implementations.Session
|
||||||
{
|
{
|
||||||
public sealed class WebSocketController : ISessionController, IDisposable
|
public sealed class WebSocketController : ISessionController, IAsyncDisposable, IDisposable
|
||||||
{
|
{
|
||||||
private readonly ILogger<WebSocketController> _logger;
|
private readonly ILogger<WebSocketController> _logger;
|
||||||
private readonly ISessionManager _sessionManager;
|
private readonly ISessionManager _sessionManager;
|
||||||
|
@ -99,6 +99,23 @@ namespace Emby.Server.Implementations.Session
|
||||||
foreach (var socket in _sockets)
|
foreach (var socket in _sockets)
|
||||||
{
|
{
|
||||||
socket.Closed -= OnConnectionClosed;
|
socket.Closed -= OnConnectionClosed;
|
||||||
|
socket.Dispose();
|
||||||
|
}
|
||||||
|
|
||||||
|
_disposed = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
if (_disposed)
|
||||||
|
{
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var socket in _sockets)
|
||||||
|
{
|
||||||
|
socket.Closed -= OnConnectionClosed;
|
||||||
|
await socket.DisposeAsync().ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
_disposed = true;
|
_disposed = true;
|
||||||
|
|
|
@ -1790,7 +1790,8 @@ namespace Jellyfin.Api.Controllers
|
||||||
|| string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
|
|| string.Equals(codec, "hevc", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
if (EncodingHelper.IsCopyCodec(codec)
|
if (EncodingHelper.IsCopyCodec(codec)
|
||||||
&& (string.Equals(state.VideoStream.CodecTag, "dovi", StringComparison.OrdinalIgnoreCase)
|
&& (string.Equals(state.VideoStream.VideoRangeType, "DOVI", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(state.VideoStream.CodecTag, "dovi", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(state.VideoStream.CodecTag, "dvh1", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(state.VideoStream.CodecTag, "dvh1", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(state.VideoStream.CodecTag, "dvhe", StringComparison.OrdinalIgnoreCase)))
|
|| string.Equals(state.VideoStream.CodecTag, "dvhe", StringComparison.OrdinalIgnoreCase)))
|
||||||
{
|
{
|
||||||
|
|
|
@ -282,16 +282,19 @@ namespace Jellyfin.Api.Controllers
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
var success = await _userManager.AuthenticateUser(
|
if (!HttpContext.User.IsInRole(UserRoles.Administrator))
|
||||||
user.Username,
|
|
||||||
request.CurrentPw,
|
|
||||||
request.CurrentPw,
|
|
||||||
HttpContext.GetNormalizedRemoteIp().ToString(),
|
|
||||||
false).ConfigureAwait(false);
|
|
||||||
|
|
||||||
if (success == null)
|
|
||||||
{
|
{
|
||||||
return StatusCode(StatusCodes.Status403Forbidden, "Invalid user or password entered.");
|
var success = await _userManager.AuthenticateUser(
|
||||||
|
user.Username,
|
||||||
|
request.CurrentPw,
|
||||||
|
request.CurrentPw,
|
||||||
|
HttpContext.GetNormalizedRemoteIp().ToString(),
|
||||||
|
false).ConfigureAwait(false);
|
||||||
|
|
||||||
|
if (success == null)
|
||||||
|
{
|
||||||
|
return StatusCode(StatusCodes.Status403Forbidden, "Invalid user or password entered.");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
await _userManager.ChangePassword(user, request.NewPw).ConfigureAwait(false);
|
await _userManager.ChangePassword(user, request.NewPw).ConfigureAwait(false);
|
||||||
|
|
|
@ -17,7 +17,7 @@
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Authorization" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
<PackageReference Include="Swashbuckle.AspNetCore" Version="6.2.3" />
|
||||||
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.3.1" />
|
<PackageReference Include="Swashbuckle.AspNetCore.ReDoc" Version="6.3.1" />
|
||||||
|
|
|
@ -18,7 +18,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Data</PackageId>
|
<PackageId>Jellyfin.Data</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -18,8 +18,8 @@
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="BlurHashSharp" Version="1.2.0" />
|
<PackageReference Include="BlurHashSharp" Version="1.2.0" />
|
||||||
<PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.2.0" />
|
<PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.2.0" />
|
||||||
<PackageReference Include="SkiaSharp" Version="2.88.1-preview.71" />
|
<PackageReference Include="SkiaSharp" Version="2.88.1-preview.79" />
|
||||||
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.71" />
|
<PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.1-preview.79" />
|
||||||
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
|
<PackageReference Include="SkiaSharp.Svg" Version="1.60.0" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
|
|
|
@ -27,13 +27,13 @@
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
<PackageReference Include="System.Linq.Async" Version="6.0.1" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.6" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.6" />
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.6">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.7">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.6">
|
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.7">
|
||||||
<PrivateAssets>all</PrivateAssets>
|
<PrivateAssets>all</PrivateAssets>
|
||||||
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
|
||||||
</PackageReference>
|
</PackageReference>
|
||||||
|
|
|
@ -37,8 +37,8 @@
|
||||||
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
<PackageReference Include="CommandLineParser" Version="2.9.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.6" />
|
<PackageReference Include="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="6.0.7" />
|
||||||
<PackageReference Include="prometheus-net" Version="6.0.0" />
|
<PackageReference Include="prometheus-net" Version="6.0.0" />
|
||||||
<PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
|
<PackageReference Include="prometheus-net.AspNetCore" Version="6.0.0" />
|
||||||
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
|
<PackageReference Include="Serilog.AspNetCore" Version="4.1.0" />
|
||||||
|
|
|
@ -243,7 +243,7 @@ namespace Jellyfin.Server
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
appHost.Dispose();
|
await appHost.DisposeAsync().ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (_restartOnShutdown)
|
if (_restartOnShutdown)
|
||||||
|
|
|
@ -32,7 +32,7 @@ namespace MediaBrowser.Common.Configuration
|
||||||
var transcodingTempPath = configurationManager.GetEncodingOptions().TranscodingTempPath;
|
var transcodingTempPath = configurationManager.GetEncodingOptions().TranscodingTempPath;
|
||||||
if (string.IsNullOrEmpty(transcodingTempPath))
|
if (string.IsNullOrEmpty(transcodingTempPath))
|
||||||
{
|
{
|
||||||
transcodingTempPath = Path.Combine(configurationManager.CommonApplicationPaths.ProgramDataPath, "transcodes");
|
transcodingTempPath = Path.Combine(configurationManager.CommonApplicationPaths.CachePath, "transcodes");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Make sure the directory exists
|
// Make sure the directory exists
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Common</PackageId>
|
<PackageId>Jellyfin.Common</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -169,8 +169,8 @@ namespace MediaBrowser.Controller.Entities.Audio
|
||||||
|
|
||||||
var childUpdateType = ItemUpdateType.None;
|
var childUpdateType = ItemUpdateType.None;
|
||||||
|
|
||||||
// Refresh songs
|
// Refresh songs only and not m3u files in album folder
|
||||||
foreach (var item in items)
|
foreach (var item in items.OfType<Audio>())
|
||||||
{
|
{
|
||||||
cancellationToken.ThrowIfCancellationRequested();
|
cancellationToken.ThrowIfCancellationRequested();
|
||||||
|
|
||||||
|
|
|
@ -184,6 +184,11 @@ namespace MediaBrowser.Controller.Entities.TV
|
||||||
list.Insert(0, key);
|
list.Insert(0, key);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (this.TryGetProviderId(MetadataProvider.Custom, out key))
|
||||||
|
{
|
||||||
|
list.Insert(0, key);
|
||||||
|
}
|
||||||
|
|
||||||
return list;
|
return list;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,14 +263,10 @@ namespace MediaBrowser.Controller.Entities.TV
|
||||||
SeriesPresentationUniqueKey = seriesKey,
|
SeriesPresentationUniqueKey = seriesKey,
|
||||||
IncludeItemTypes = new[] { BaseItemKind.Episode, BaseItemKind.Season },
|
IncludeItemTypes = new[] { BaseItemKind.Episode, BaseItemKind.Season },
|
||||||
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
|
OrderBy = new[] { (ItemSortBy.SortName, SortOrder.Ascending) },
|
||||||
DtoOptions = options
|
DtoOptions = options,
|
||||||
|
IsMissing = user?.DisplayMissingEpisodes
|
||||||
};
|
};
|
||||||
|
|
||||||
if (!user.DisplayMissingEpisodes)
|
|
||||||
{
|
|
||||||
query.IsMissing = false;
|
|
||||||
}
|
|
||||||
|
|
||||||
var allItems = LibraryManager.GetItemList(query);
|
var allItems = LibraryManager.GetItemList(query);
|
||||||
|
|
||||||
var allSeriesEpisodes = allItems.OfType<Episode>().ToList();
|
var allSeriesEpisodes = allItems.OfType<Episode>().ToList();
|
||||||
|
|
|
@ -570,5 +570,13 @@ namespace MediaBrowser.Controller.Library
|
||||||
Task RunMetadataSavers(BaseItem item, ItemUpdateType updateReason);
|
Task RunMetadataSavers(BaseItem item, ItemUpdateType updateReason);
|
||||||
|
|
||||||
BaseItem GetParentItem(Guid? parentId, Guid? userId);
|
BaseItem GetParentItem(Guid? parentId, Guid? userId);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Queue a library scan.
|
||||||
|
/// </summary>
|
||||||
|
/// <remarks>
|
||||||
|
/// This exists so plugins can trigger a library scan.
|
||||||
|
/// </remarks>
|
||||||
|
void QueueLibraryScan();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Controller</PackageId>
|
<PackageId>Jellyfin.Controller</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -35,6 +35,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
private readonly IMediaEncoder _mediaEncoder;
|
private readonly IMediaEncoder _mediaEncoder;
|
||||||
private readonly ISubtitleEncoder _subtitleEncoder;
|
private readonly ISubtitleEncoder _subtitleEncoder;
|
||||||
private readonly IConfiguration _config;
|
private readonly IConfiguration _config;
|
||||||
|
private readonly Version _minKernelVersioni915Hang = new Version(5, 18);
|
||||||
|
|
||||||
private static readonly string[] _videoProfilesH264 = new[]
|
private static readonly string[] _videoProfilesH264 = new[]
|
||||||
{
|
{
|
||||||
|
@ -930,6 +931,13 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
arg.Append(" -i \"").Append(state.AudioStream.Path).Append('"');
|
arg.Append(" -i \"").Append(state.AudioStream.Path).Append('"');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Disable auto inserted SW scaler for HW decoders in case of changed resolution.
|
||||||
|
var isSwDecoder = string.IsNullOrEmpty(GetHardwareVideoDecoder(state, options));
|
||||||
|
if (!isSwDecoder)
|
||||||
|
{
|
||||||
|
arg.Append(" -autoscale 0");
|
||||||
|
}
|
||||||
|
|
||||||
return arg.ToString();
|
return arg.ToString();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1302,6 +1310,10 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
// which will reduce overhead in performance intensive tasks such as 4k transcoding and tonemapping.
|
// which will reduce overhead in performance intensive tasks such as 4k transcoding and tonemapping.
|
||||||
var intelLowPowerHwEncoding = false;
|
var intelLowPowerHwEncoding = false;
|
||||||
|
|
||||||
|
// Workaround for linux 5.18+ i915 hang at cost of performance.
|
||||||
|
// https://github.com/intel/media-driver/issues/1456
|
||||||
|
var enableWaFori915Hang = false;
|
||||||
|
|
||||||
if (string.Equals(encodingOptions.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(encodingOptions.HardwareAccelerationType, "vaapi", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
var isIntelVaapiDriver = _mediaEncoder.IsVaapiDeviceInteliHD || _mediaEncoder.IsVaapiDeviceInteli965;
|
var isIntelVaapiDriver = _mediaEncoder.IsVaapiDeviceInteliHD || _mediaEncoder.IsVaapiDeviceInteli965;
|
||||||
|
@ -1317,6 +1329,20 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
}
|
}
|
||||||
else if (string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
|
else if (string.Equals(encodingOptions.HardwareAccelerationType, "qsv", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
|
if (OperatingSystem.IsLinux() && Environment.OSVersion.Version >= _minKernelVersioni915Hang)
|
||||||
|
{
|
||||||
|
var vidDecoder = GetHardwareVideoDecoder(state, encodingOptions) ?? string.Empty;
|
||||||
|
var isIntelDecoder = vidDecoder.Contains("qsv", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| vidDecoder.Contains("vaapi", StringComparison.OrdinalIgnoreCase);
|
||||||
|
var doOclTonemap = _mediaEncoder.SupportsHwaccel("qsv")
|
||||||
|
&& IsVaapiSupported(state)
|
||||||
|
&& IsOpenclFullSupported()
|
||||||
|
&& !IsVaapiVppTonemapAvailable(state, encodingOptions)
|
||||||
|
&& IsHwTonemapAvailable(state, encodingOptions);
|
||||||
|
|
||||||
|
enableWaFori915Hang = isIntelDecoder && doOclTonemap;
|
||||||
|
}
|
||||||
|
|
||||||
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(videoEncoder, "h264_qsv", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
intelLowPowerHwEncoding = encodingOptions.EnableIntelLowPowerH264HwEncoder;
|
intelLowPowerHwEncoding = encodingOptions.EnableIntelLowPowerH264HwEncoder;
|
||||||
|
@ -1325,6 +1351,10 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
intelLowPowerHwEncoding = encodingOptions.EnableIntelLowPowerHevcHwEncoder;
|
intelLowPowerHwEncoding = encodingOptions.EnableIntelLowPowerHevcHwEncoder;
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
enableWaFori915Hang = false;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (intelLowPowerHwEncoding)
|
if (intelLowPowerHwEncoding)
|
||||||
|
@ -1332,6 +1362,11 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
param += " -low_power 1";
|
param += " -low_power 1";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (enableWaFori915Hang)
|
||||||
|
{
|
||||||
|
param += " -async_depth 1";
|
||||||
|
}
|
||||||
|
|
||||||
var isVc1 = string.Equals(state.VideoStream?.Codec, "vc1", StringComparison.OrdinalIgnoreCase);
|
var isVc1 = string.Equals(state.VideoStream?.Codec, "vc1", StringComparison.OrdinalIgnoreCase);
|
||||||
var isLibX265 = string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase);
|
var isLibX265 = string.Equals(videoEncoder, "libx265", StringComparison.OrdinalIgnoreCase);
|
||||||
|
|
||||||
|
@ -1713,6 +1748,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
// Can't stream copy if we're burning in subtitles
|
// Can't stream copy if we're burning in subtitles
|
||||||
if (request.SubtitleStreamIndex.HasValue
|
if (request.SubtitleStreamIndex.HasValue
|
||||||
|
&& request.SubtitleStreamIndex.Value >= 0
|
||||||
&& state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
|
&& state.SubtitleDeliveryMethod == SubtitleDeliveryMethod.Encode)
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
@ -1760,7 +1796,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
}
|
}
|
||||||
|
|
||||||
var requestedRangeTypes = state.GetRequestedRangeTypes(videoStream.Codec);
|
var requestedRangeTypes = state.GetRequestedRangeTypes(videoStream.Codec);
|
||||||
if (requestedProfiles.Length > 0)
|
if (requestedRangeTypes.Length > 0)
|
||||||
{
|
{
|
||||||
if (string.IsNullOrEmpty(videoStream.VideoRangeType))
|
if (string.IsNullOrEmpty(videoStream.VideoRangeType))
|
||||||
{
|
{
|
||||||
|
@ -2026,6 +2062,8 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
{
|
{
|
||||||
if (string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase)
|
if (string.Equals(audioCodec, "aac", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(audioCodec, "mp3", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(audioCodec, "opus", StringComparison.OrdinalIgnoreCase)
|
||||||
|
|| string.Equals(audioCodec, "vorbis", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase)
|
|| string.Equals(audioCodec, "ac3", StringComparison.OrdinalIgnoreCase)
|
||||||
|| string.Equals(audioCodec, "eac3", StringComparison.OrdinalIgnoreCase))
|
|| string.Equals(audioCodec, "eac3", StringComparison.OrdinalIgnoreCase))
|
||||||
{
|
{
|
||||||
|
@ -4503,7 +4541,9 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
if (isD3d11Supported && isCodecAvailable)
|
if (isD3d11Supported && isCodecAvailable)
|
||||||
{
|
{
|
||||||
return " -hwaccel d3d11va" + (outputHwSurface ? " -hwaccel_output_format d3d11" : string.Empty) + (isAv1 ? " -c:v av1" : string.Empty);
|
// set -threads 3 to intel d3d11va decoder explicitly. Lower threads may result in dead lock.
|
||||||
|
// on newer devices such as Xe, the larger the init_pool_size, the longer the initialization time for opencl to derive from d3d11.
|
||||||
|
return " -hwaccel d3d11va" + (outputHwSurface ? " -hwaccel_output_format d3d11" : string.Empty) + " -threads 3" + (isAv1 ? " -c:v av1" : string.Empty);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -4967,7 +5007,7 @@ namespace MediaBrowser.Controller.MediaEncoding
|
||||||
|
|
||||||
if (state.InputProtocol == MediaProtocol.Rtsp)
|
if (state.InputProtocol == MediaProtocol.Rtsp)
|
||||||
{
|
{
|
||||||
inputModifier += " -rtsp_transport tcp -rtsp_transport udp -rtsp_flags prefer_tcp";
|
inputModifier += " -rtsp_transport tcp+udp -rtsp_flags prefer_tcp";
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!string.IsNullOrEmpty(state.InputAudioSync))
|
if (!string.IsNullOrEmpty(state.InputAudioSync))
|
||||||
|
|
|
@ -10,7 +10,7 @@ using Microsoft.AspNetCore.Http;
|
||||||
|
|
||||||
namespace MediaBrowser.Controller.Net
|
namespace MediaBrowser.Controller.Net
|
||||||
{
|
{
|
||||||
public interface IWebSocketConnection
|
public interface IWebSocketConnection : IAsyncDisposable, IDisposable
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Occurs when [closed].
|
/// Occurs when [closed].
|
||||||
|
|
|
@ -7,6 +7,7 @@ using System.Collections.Generic;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Text.Json.Serialization;
|
using System.Text.Json.Serialization;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.Entities;
|
using MediaBrowser.Controller.Entities;
|
||||||
using MediaBrowser.Model.Dto;
|
using MediaBrowser.Model.Dto;
|
||||||
using MediaBrowser.Model.Session;
|
using MediaBrowser.Model.Session;
|
||||||
|
@ -17,7 +18,7 @@ namespace MediaBrowser.Controller.Session
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Class SessionInfo.
|
/// Class SessionInfo.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public sealed class SessionInfo : IDisposable
|
public sealed class SessionInfo : IAsyncDisposable, IDisposable
|
||||||
{
|
{
|
||||||
// 1 second
|
// 1 second
|
||||||
private const long ProgressIncrement = 10000000;
|
private const long ProgressIncrement = 10000000;
|
||||||
|
@ -380,10 +381,28 @@ namespace MediaBrowser.Controller.Session
|
||||||
{
|
{
|
||||||
if (controller is IDisposable disposable)
|
if (controller is IDisposable disposable)
|
||||||
{
|
{
|
||||||
_logger.LogDebug("Disposing session controller {0}", disposable.GetType().Name);
|
_logger.LogDebug("Disposing session controller synchronously {TypeName}", disposable.GetType().Name);
|
||||||
disposable.Dispose();
|
disposable.Dispose();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public async ValueTask DisposeAsync()
|
||||||
|
{
|
||||||
|
_disposed = true;
|
||||||
|
|
||||||
|
StopAutomaticProgress();
|
||||||
|
|
||||||
|
var controllers = SessionControllers.ToList();
|
||||||
|
|
||||||
|
foreach (var controller in controllers)
|
||||||
|
{
|
||||||
|
if (controller is IAsyncDisposable disposableAsync)
|
||||||
|
{
|
||||||
|
_logger.LogDebug("Disposing session controller asynchronously {TypeName}", disposableAsync.GetType().Name);
|
||||||
|
await disposableAsync.DisposeAsync().ConfigureAwait(false);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -30,7 +30,7 @@
|
||||||
<PackageReference Include="libse" Version="3.6.5" />
|
<PackageReference Include="libse" Version="3.6.5" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
|
||||||
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
|
<PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
|
||||||
<PackageReference Include="UTF.Unknown" Version="2.5.0" />
|
<PackageReference Include="UTF.Unknown" Version="2.5.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<!-- Code Analyzers-->
|
<!-- Code Analyzers-->
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Subtitles
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Advanced SubStation Alpha subtitle parser.
|
|
||||||
/// </summary>
|
|
||||||
public class AssParser : SubtitleEditParser<AdvancedSubStationAlpha>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="AssParser"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="logger">The logger.</param>
|
|
||||||
public AssParser(ILogger logger) : base(logger)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,7 +1,6 @@
|
||||||
#pragma warning disable CS1591
|
#pragma warning disable CS1591
|
||||||
|
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Threading;
|
|
||||||
using MediaBrowser.Model.MediaInfo;
|
using MediaBrowser.Model.MediaInfo;
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Subtitles
|
namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
|
@ -12,8 +11,15 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
/// Parses the specified stream.
|
/// Parses the specified stream.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="stream">The stream.</param>
|
/// <param name="stream">The stream.</param>
|
||||||
/// <param name="cancellationToken">The cancellation token.</param>
|
/// <param name="fileExtension">The file extension.</param>
|
||||||
/// <returns>SubtitleTrackInfo.</returns>
|
/// <returns>SubtitleTrackInfo.</returns>
|
||||||
SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken);
|
SubtitleTrackInfo Parse(Stream stream, string fileExtension);
|
||||||
|
|
||||||
|
/// <summary>
|
||||||
|
/// Determines whether the file extension is supported by the parser.
|
||||||
|
/// </summary>
|
||||||
|
/// <param name="fileExtension">The file extension.</param>
|
||||||
|
/// <returns>A value indicating whether the file extension is supported.</returns>
|
||||||
|
bool SupportsFileExtension(string fileExtension);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,19 +0,0 @@
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Subtitles
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// SubRip subtitle parser.
|
|
||||||
/// </summary>
|
|
||||||
public class SrtParser : SubtitleEditParser<SubRip>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="SrtParser"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="logger">The logger.</param>
|
|
||||||
public SrtParser(ILogger logger) : base(logger)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,19 +0,0 @@
|
||||||
using Microsoft.Extensions.Logging;
|
|
||||||
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Subtitles
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// SubStation Alpha subtitle parser.
|
|
||||||
/// </summary>
|
|
||||||
public class SsaParser : SubtitleEditParser<SubStationAlpha>
|
|
||||||
{
|
|
||||||
/// <summary>
|
|
||||||
/// Initializes a new instance of the <see cref="SsaParser"/> class.
|
|
||||||
/// </summary>
|
|
||||||
/// <param name="logger">The logger.</param>
|
|
||||||
public SsaParser(ILogger logger) : base(logger)
|
|
||||||
{
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
|
@ -1,12 +1,14 @@
|
||||||
|
using System;
|
||||||
|
using System.Collections.Generic;
|
||||||
using System.Globalization;
|
using System.Globalization;
|
||||||
using System.IO;
|
using System.IO;
|
||||||
using System.Linq;
|
using System.Linq;
|
||||||
using System.Threading;
|
using System.Reflection;
|
||||||
using Jellyfin.Extensions;
|
using Jellyfin.Extensions;
|
||||||
using MediaBrowser.Model.MediaInfo;
|
using MediaBrowser.Model.MediaInfo;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Nikse.SubtitleEdit.Core.Common;
|
using Nikse.SubtitleEdit.Core.Common;
|
||||||
using ILogger = Microsoft.Extensions.Logging.ILogger;
|
using Nikse.SubtitleEdit.Core.SubtitleFormats;
|
||||||
using SubtitleFormat = Nikse.SubtitleEdit.Core.SubtitleFormats.SubtitleFormat;
|
using SubtitleFormat = Nikse.SubtitleEdit.Core.SubtitleFormats.SubtitleFormat;
|
||||||
|
|
||||||
namespace MediaBrowser.MediaEncoding.Subtitles
|
namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
|
@ -14,31 +16,57 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// SubStation Alpha subtitle parser.
|
/// SubStation Alpha subtitle parser.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <typeparam name="T">The <see cref="SubtitleFormat" />.</typeparam>
|
public class SubtitleEditParser : ISubtitleParser
|
||||||
public abstract class SubtitleEditParser<T> : ISubtitleParser
|
|
||||||
where T : SubtitleFormat, new()
|
|
||||||
{
|
{
|
||||||
private readonly ILogger _logger;
|
private readonly ILogger<SubtitleEditParser> _logger;
|
||||||
|
private readonly Dictionary<string, SubtitleFormat[]> _subtitleFormats;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Initializes a new instance of the <see cref="SubtitleEditParser{T}"/> class.
|
/// Initializes a new instance of the <see cref="SubtitleEditParser"/> class.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
/// <param name="logger">The logger.</param>
|
/// <param name="logger">The logger.</param>
|
||||||
protected SubtitleEditParser(ILogger logger)
|
public SubtitleEditParser(ILogger<SubtitleEditParser> logger)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
|
_subtitleFormats = GetSubtitleFormats()
|
||||||
|
.Where(subtitleFormat => !string.IsNullOrEmpty(subtitleFormat.Extension))
|
||||||
|
.GroupBy(subtitleFormat => subtitleFormat.Extension.TrimStart('.'), StringComparer.OrdinalIgnoreCase)
|
||||||
|
.ToDictionary(g => g.Key, g => g.ToArray(), StringComparer.OrdinalIgnoreCase);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <inheritdoc />
|
/// <inheritdoc />
|
||||||
public SubtitleTrackInfo Parse(Stream stream, CancellationToken cancellationToken)
|
public SubtitleTrackInfo Parse(Stream stream, string fileExtension)
|
||||||
{
|
{
|
||||||
var subtitle = new Subtitle();
|
var subtitle = new Subtitle();
|
||||||
var subRip = new T();
|
|
||||||
var lines = stream.ReadAllLines().ToList();
|
var lines = stream.ReadAllLines().ToList();
|
||||||
subRip.LoadSubtitle(subtitle, lines, "untitled");
|
|
||||||
if (subRip.ErrorCount > 0)
|
if (!_subtitleFormats.TryGetValue(fileExtension, out var subtitleFormats))
|
||||||
{
|
{
|
||||||
_logger.LogError("{ErrorCount} errors encountered while parsing subtitle", subRip.ErrorCount);
|
throw new ArgumentException($"Unsupported file extension: {fileExtension}", nameof(fileExtension));
|
||||||
|
}
|
||||||
|
|
||||||
|
foreach (var subtitleFormat in subtitleFormats)
|
||||||
|
{
|
||||||
|
_logger.LogDebug(
|
||||||
|
"Trying to parse '{FileExtension}' subtitle using the {SubtitleFormatParser} format parser",
|
||||||
|
fileExtension,
|
||||||
|
subtitleFormat.Name);
|
||||||
|
subtitleFormat.LoadSubtitle(subtitle, lines, fileExtension);
|
||||||
|
if (subtitleFormat.ErrorCount == 0)
|
||||||
|
{
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
_logger.LogError(
|
||||||
|
"{ErrorCount} errors encountered while parsing '{FileExtension}' subtitle using the {SubtitleFormatParser} format parser",
|
||||||
|
subtitleFormat.ErrorCount,
|
||||||
|
fileExtension,
|
||||||
|
subtitleFormat.Name);
|
||||||
|
}
|
||||||
|
|
||||||
|
if (subtitle.Paragraphs.Count == 0)
|
||||||
|
{
|
||||||
|
throw new ArgumentException("Unsupported format: " + fileExtension);
|
||||||
}
|
}
|
||||||
|
|
||||||
var trackInfo = new SubtitleTrackInfo();
|
var trackInfo = new SubtitleTrackInfo();
|
||||||
|
@ -57,5 +85,36 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
trackInfo.TrackEvents = trackEvents;
|
trackInfo.TrackEvents = trackEvents;
|
||||||
return trackInfo;
|
return trackInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// <inheritdoc />
|
||||||
|
public bool SupportsFileExtension(string fileExtension)
|
||||||
|
=> _subtitleFormats.ContainsKey(fileExtension);
|
||||||
|
|
||||||
|
private IEnumerable<SubtitleFormat> GetSubtitleFormats()
|
||||||
|
{
|
||||||
|
var subtitleFormats = new List<SubtitleFormat>();
|
||||||
|
var assembly = typeof(SubtitleFormat).Assembly;
|
||||||
|
|
||||||
|
foreach (var type in assembly.GetTypes())
|
||||||
|
{
|
||||||
|
if (!type.IsSubclassOf(typeof(SubtitleFormat)) || type.IsAbstract)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
try
|
||||||
|
{
|
||||||
|
// It shouldn't be null, but the exception is caught if it is
|
||||||
|
var subtitleFormat = (SubtitleFormat)Activator.CreateInstance(type, true)!;
|
||||||
|
subtitleFormats.Add(subtitleFormat);
|
||||||
|
}
|
||||||
|
catch (Exception ex)
|
||||||
|
{
|
||||||
|
_logger.LogWarning(ex, "Failed to create instance of the subtitle format {SubtitleFormatType}", type.Name);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return subtitleFormats;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -35,6 +35,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
private readonly IMediaEncoder _mediaEncoder;
|
private readonly IMediaEncoder _mediaEncoder;
|
||||||
private readonly IHttpClientFactory _httpClientFactory;
|
private readonly IHttpClientFactory _httpClientFactory;
|
||||||
private readonly IMediaSourceManager _mediaSourceManager;
|
private readonly IMediaSourceManager _mediaSourceManager;
|
||||||
|
private readonly ISubtitleParser _subtitleParser;
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The _semaphoreLocks.
|
/// The _semaphoreLocks.
|
||||||
|
@ -48,7 +49,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
IFileSystem fileSystem,
|
IFileSystem fileSystem,
|
||||||
IMediaEncoder mediaEncoder,
|
IMediaEncoder mediaEncoder,
|
||||||
IHttpClientFactory httpClientFactory,
|
IHttpClientFactory httpClientFactory,
|
||||||
IMediaSourceManager mediaSourceManager)
|
IMediaSourceManager mediaSourceManager,
|
||||||
|
ISubtitleParser subtitleParser)
|
||||||
{
|
{
|
||||||
_logger = logger;
|
_logger = logger;
|
||||||
_appPaths = appPaths;
|
_appPaths = appPaths;
|
||||||
|
@ -56,6 +58,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
_mediaEncoder = mediaEncoder;
|
_mediaEncoder = mediaEncoder;
|
||||||
_httpClientFactory = httpClientFactory;
|
_httpClientFactory = httpClientFactory;
|
||||||
_mediaSourceManager = mediaSourceManager;
|
_mediaSourceManager = mediaSourceManager;
|
||||||
|
_subtitleParser = subtitleParser;
|
||||||
}
|
}
|
||||||
|
|
||||||
private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
|
private string SubtitleCachePath => Path.Combine(_appPaths.DataPath, "subtitles");
|
||||||
|
@ -73,8 +76,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
|
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
var reader = GetReader(inputFormat);
|
var trackInfo = _subtitleParser.Parse(stream, inputFormat);
|
||||||
var trackInfo = reader.Parse(stream, cancellationToken);
|
|
||||||
|
|
||||||
FilterEvents(trackInfo, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
|
FilterEvents(trackInfo, startTimeTicks, endTimeTicks, preserveOriginalTimestamps);
|
||||||
|
|
||||||
|
@ -233,7 +235,8 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
var currentFormat = (Path.GetExtension(subtitleStream.Path) ?? subtitleStream.Codec)
|
var currentFormat = (Path.GetExtension(subtitleStream.Path) ?? subtitleStream.Codec)
|
||||||
.TrimStart('.');
|
.TrimStart('.');
|
||||||
|
|
||||||
if (!TryGetReader(currentFormat, out _))
|
// Fallback to ffmpeg conversion
|
||||||
|
if (!_subtitleParser.SupportsFileExtension(currentFormat))
|
||||||
{
|
{
|
||||||
// Convert
|
// Convert
|
||||||
var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, ".srt");
|
var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, ".srt");
|
||||||
|
@ -243,44 +246,10 @@ namespace MediaBrowser.MediaEncoding.Subtitles
|
||||||
return new SubtitleInfo(outputPath, MediaProtocol.File, "srt", true);
|
return new SubtitleInfo(outputPath, MediaProtocol.File, "srt", true);
|
||||||
}
|
}
|
||||||
|
|
||||||
// It's possbile that the subtitleStream and mediaSource don't share the same protocol (e.g. .STRM file with local subs)
|
// It's possible that the subtitleStream and mediaSource don't share the same protocol (e.g. .STRM file with local subs)
|
||||||
return new SubtitleInfo(subtitleStream.Path, _mediaSourceManager.GetPathProtocol(subtitleStream.Path), currentFormat, true);
|
return new SubtitleInfo(subtitleStream.Path, _mediaSourceManager.GetPathProtocol(subtitleStream.Path), currentFormat, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
private bool TryGetReader(string format, [NotNullWhen(true)] out ISubtitleParser? value)
|
|
||||||
{
|
|
||||||
if (string.Equals(format, SubtitleFormat.SRT, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
value = new SrtParser(_logger);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(format, SubtitleFormat.SSA, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
value = new SsaParser(_logger);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (string.Equals(format, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))
|
|
||||||
{
|
|
||||||
value = new AssParser(_logger);
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
value = null;
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ISubtitleParser GetReader(string format)
|
|
||||||
{
|
|
||||||
if (TryGetReader(format, out var reader))
|
|
||||||
{
|
|
||||||
return reader;
|
|
||||||
}
|
|
||||||
|
|
||||||
throw new ArgumentException("Unsupported format: " + format);
|
|
||||||
}
|
|
||||||
|
|
||||||
private bool TryGetWriter(string format, [NotNullWhen(true)] out ISubtitleWriter? value)
|
private bool TryGetWriter(string format, [NotNullWhen(true)] out ISubtitleWriter? value)
|
||||||
{
|
{
|
||||||
if (string.Equals(format, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))
|
if (string.Equals(format, SubtitleFormat.ASS, StringComparison.OrdinalIgnoreCase))
|
||||||
|
|
|
@ -588,15 +588,22 @@ namespace MediaBrowser.Model.Entities
|
||||||
|
|
||||||
return Width switch
|
return Width switch
|
||||||
{
|
{
|
||||||
<= 720 when Height <= 480 => IsInterlaced ? "480i" : "480p",
|
// 256x144 (16:9 square pixel format)
|
||||||
// 720x576 (PAL) (768 when rescaled for square pixels)
|
<= 256 when Height <= 144 => IsInterlaced ? "144i" : "144p",
|
||||||
<= 768 when Height <= 576 => IsInterlaced ? "576i" : "576p",
|
// 426x240 (16:9 square pixel format)
|
||||||
// 960x540 (sometimes 544 which is multiple of 16)
|
<= 426 when Height <= 240 => IsInterlaced ? "240i" : "240p",
|
||||||
|
// 640x360 (16:9 square pixel format)
|
||||||
|
<= 640 when Height <= 360 => IsInterlaced ? "360i" : "360p",
|
||||||
|
// 854x480 (16:9 square pixel format)
|
||||||
|
<= 854 when Height <= 480 => IsInterlaced ? "480i" : "480p",
|
||||||
|
// 960x544 (16:9 square pixel format)
|
||||||
<= 960 when Height <= 544 => IsInterlaced ? "540i" : "540p",
|
<= 960 when Height <= 544 => IsInterlaced ? "540i" : "540p",
|
||||||
|
// 1024x576 (16:9 square pixel format)
|
||||||
|
<= 1024 when Height <= 576 => IsInterlaced ? "576i" : "576p",
|
||||||
// 1280x720
|
// 1280x720
|
||||||
<= 1280 when Height <= 962 => IsInterlaced ? "720i" : "720p",
|
<= 1280 when Height <= 962 => IsInterlaced ? "720i" : "720p",
|
||||||
// 1920x1080
|
// 2560x1080 (FHD ultra wide 21:9) using 1440px width to accomodate WQHD
|
||||||
<= 1920 when Height <= 1440 => IsInterlaced ? "1080i" : "1080p",
|
<= 2560 when Height <= 1440 => IsInterlaced ? "1080i" : "1080p",
|
||||||
// 4K
|
// 4K
|
||||||
<= 4096 when Height <= 3072 => "4K",
|
<= 4096 when Height <= 3072 => "4K",
|
||||||
// 8K
|
// 8K
|
||||||
|
|
|
@ -7,6 +7,12 @@ namespace MediaBrowser.Model.Entities
|
||||||
/// </summary>
|
/// </summary>
|
||||||
public enum MetadataProvider
|
public enum MetadataProvider
|
||||||
{
|
{
|
||||||
|
/// <summary>
|
||||||
|
/// This metadata provider is for users and/or plugins to override the
|
||||||
|
/// default merging behaviour.
|
||||||
|
/// </summary>
|
||||||
|
Custom = 0,
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// The imdb.
|
/// The imdb.
|
||||||
/// </summary>
|
/// </summary>
|
||||||
|
|
|
@ -8,7 +8,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Model</PackageId>
|
<PackageId>Jellyfin.Model</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -8,6 +8,7 @@ using System.Linq;
|
||||||
using System.Threading;
|
using System.Threading;
|
||||||
using System.Threading.Tasks;
|
using System.Threading.Tasks;
|
||||||
using MediaBrowser.Controller.Configuration;
|
using MediaBrowser.Controller.Configuration;
|
||||||
|
using MediaBrowser.Controller.Dto;
|
||||||
using MediaBrowser.Controller.Entities.TV;
|
using MediaBrowser.Controller.Entities.TV;
|
||||||
using MediaBrowser.Controller.Library;
|
using MediaBrowser.Controller.Library;
|
||||||
using MediaBrowser.Controller.Providers;
|
using MediaBrowser.Controller.Providers;
|
||||||
|
@ -40,6 +41,7 @@ namespace MediaBrowser.Providers.TV
|
||||||
{
|
{
|
||||||
await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
|
await base.AfterMetadataRefresh(item, refreshOptions, cancellationToken).ConfigureAwait(false);
|
||||||
|
|
||||||
|
RemoveObsoleteEpisodes(item);
|
||||||
RemoveObsoleteSeasons(item);
|
RemoveObsoleteSeasons(item);
|
||||||
await FillInMissingSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
|
await FillInMissingSeasonsAsync(item, cancellationToken).ConfigureAwait(false);
|
||||||
}
|
}
|
||||||
|
@ -121,6 +123,61 @@ namespace MediaBrowser.Providers.TV
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private void RemoveObsoleteEpisodes(Series series)
|
||||||
|
{
|
||||||
|
var episodes = series.GetEpisodes(null, new DtoOptions()).OfType<Episode>().ToList();
|
||||||
|
var numberOfEpisodes = episodes.Count;
|
||||||
|
// TODO: O(n^2), but can it be done faster without overcomplicating it?
|
||||||
|
for (var i = 0; i < numberOfEpisodes; i++)
|
||||||
|
{
|
||||||
|
var currentEpisode = episodes[i];
|
||||||
|
// The outer loop only examines virtual episodes
|
||||||
|
if (!currentEpisode.IsVirtualItem)
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Virtual episodes without an episode number are practically orphaned and should be deleted
|
||||||
|
if (!currentEpisode.IndexNumber.HasValue)
|
||||||
|
{
|
||||||
|
DeleteEpisode(currentEpisode);
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (var j = i + 1; j < numberOfEpisodes; j++)
|
||||||
|
{
|
||||||
|
var comparisonEpisode = episodes[j];
|
||||||
|
// The inner loop is only for "physical" episodes
|
||||||
|
if (comparisonEpisode.IsVirtualItem
|
||||||
|
|| currentEpisode.ParentIndexNumber != comparisonEpisode.ParentIndexNumber
|
||||||
|
|| !comparisonEpisode.ContainsEpisodeNumber(currentEpisode.IndexNumber.Value))
|
||||||
|
{
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
|
||||||
|
DeleteEpisode(currentEpisode);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private void DeleteEpisode(Episode episode)
|
||||||
|
{
|
||||||
|
Logger.LogInformation(
|
||||||
|
"Removing virtual episode S{SeasonNumber}E{EpisodeNumber} in series {SeriesName}",
|
||||||
|
episode.ParentIndexNumber,
|
||||||
|
episode.IndexNumber,
|
||||||
|
episode.SeriesName);
|
||||||
|
|
||||||
|
LibraryManager.DeleteItem(
|
||||||
|
episode,
|
||||||
|
new DeleteOptions
|
||||||
|
{
|
||||||
|
DeleteFileLocation = true
|
||||||
|
},
|
||||||
|
false);
|
||||||
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
/// Creates seasons for all episodes that aren't in a season folder.
|
/// Creates seasons for all episodes that aren't in a season folder.
|
||||||
/// If no season number can be determined, a dummy season will be created.
|
/// If no season number can be determined, a dummy season will be created.
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
using System.Reflection;
|
using System.Reflection;
|
||||||
|
|
||||||
[assembly: AssemblyVersion("10.8.0")]
|
[assembly: AssemblyVersion("10.9.0")]
|
||||||
[assembly: AssemblyFileVersion("10.8.0")]
|
[assembly: AssemblyFileVersion("10.9.0")]
|
||||||
|
|
|
@ -1,7 +1,7 @@
|
||||||
---
|
---
|
||||||
# We just wrap `build` so this is really it
|
# We just wrap `build` so this is really it
|
||||||
name: "jellyfin"
|
name: "jellyfin"
|
||||||
version: "10.8.0"
|
version: "10.9.0"
|
||||||
packages:
|
packages:
|
||||||
- debian.amd64
|
- debian.amd64
|
||||||
- debian.arm64
|
- debian.arm64
|
||||||
|
|
|
@ -1,3 +1,9 @@
|
||||||
|
jellyfin-server (10.9.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
|
* New upstream version 10.9.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.9.0
|
||||||
|
|
||||||
|
-- Jellyfin Packaging Team <packaging@jellyfin.org> Wed, 13 Jul 2022 20:58:08 -0600
|
||||||
|
|
||||||
jellyfin-server (10.8.0-1) unstable; urgency=medium
|
jellyfin-server (10.8.0-1) unstable; urgency=medium
|
||||||
|
|
||||||
* Forthcoming stable release
|
* Forthcoming stable release
|
||||||
|
|
|
@ -30,8 +30,4 @@ Defaults!RESTARTSERVER_INITD !requiretty
|
||||||
Defaults!STARTSERVER_INITD !requiretty
|
Defaults!STARTSERVER_INITD !requiretty
|
||||||
Defaults!STOPSERVER_INITD !requiretty
|
Defaults!STOPSERVER_INITD !requiretty
|
||||||
|
|
||||||
#Allow the server to mount iso images
|
|
||||||
jellyfin ALL=(ALL) NOPASSWD: /bin/mount
|
|
||||||
jellyfin ALL=(ALL) NOPASSWD: /bin/umount
|
|
||||||
|
|
||||||
Defaults:jellyfin !requiretty
|
Defaults:jellyfin !requiretty
|
||||||
|
|
|
@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
|
||||||
Standards-Version: 3.9.2
|
Standards-Version: 3.9.2
|
||||||
|
|
||||||
Package: jellyfin
|
Package: jellyfin
|
||||||
Version: 10.8.0
|
Version: 10.9.0
|
||||||
Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
|
Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
|
||||||
Depends: jellyfin-server, jellyfin-web
|
Depends: jellyfin-server, jellyfin-web
|
||||||
Description: Provides the Jellyfin Free Software Media System
|
Description: Provides the Jellyfin Free Software Media System
|
||||||
|
|
|
@ -13,7 +13,7 @@ RUN yum update -yq \
|
||||||
&& yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget
|
&& yum install -yq @buildsys-build rpmdevtools yum-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel git wget
|
||||||
|
|
||||||
# Install DotNET SDK
|
# Install DotNET SDK
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -12,7 +12,7 @@ RUN dnf update -yq \
|
||||||
&& dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget make
|
&& dnf install -yq @buildsys-build rpmdevtools git dnf-plugins-core libcurl-devel fontconfig-devel freetype-devel openssl-devel glibc-devel libicu-devel systemd wget make
|
||||||
|
|
||||||
# Install DotNET SDK
|
# Install DotNET SDK
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -17,7 +17,7 @@ RUN apt-get update -yqq \
|
||||||
libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
|
libfreetype6-dev libssl-dev libssl1.1 liblttng-ust0
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -16,7 +16,7 @@ RUN apt-get update -yqq \
|
||||||
mmv build-essential lsb-release
|
mmv build-essential lsb-release
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -16,7 +16,7 @@ RUN apt-get update -yqq \
|
||||||
mmv build-essential lsb-release
|
mmv build-essential lsb-release
|
||||||
|
|
||||||
# Install dotnet repository
|
# Install dotnet repository
|
||||||
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/77d472e5-194c-421e-992d-e4ca1d08e6cc/56c61ac303ddf1b12026151f4f000a2b/dotnet-sdk-6.0.301-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
RUN wget -q https://download.visualstudio.microsoft.com/download/pr/0e83f50a-0619-45e6-8f16-dc4f41d1bb16/e0de908b2f070ef9e7e3b6ddea9d268c/dotnet-sdk-6.0.302-linux-x64.tar.gz -O dotnet-sdk.tar.gz \
|
||||||
&& mkdir -p dotnet-sdk \
|
&& mkdir -p dotnet-sdk \
|
||||||
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
&& tar -xzf dotnet-sdk.tar.gz -C dotnet-sdk \
|
||||||
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
&& ln -s $( pwd )/dotnet-sdk/dotnet /usr/bin/dotnet
|
||||||
|
|
|
@ -18,14 +18,6 @@ $ sudo dnf install https://download1.rpmfusion.org/free/fedora/rpmfusion-free-re
|
||||||
$ sudo yum localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm
|
$ sudo yum localinstall --nogpgcheck https://download1.rpmfusion.org/free/el/rpmfusion-free-release-7.noarch.rpm
|
||||||
```
|
```
|
||||||
|
|
||||||
## ISO mounting
|
|
||||||
|
|
||||||
To allow Jellyfin to mount/umount ISO files uncomment these two lines in `/etc/sudoers.d/jellyfin-sudoers`
|
|
||||||
```
|
|
||||||
# %jellyfin ALL=(ALL) NOPASSWD: /bin/mount
|
|
||||||
# %jellyfin ALL=(ALL) NOPASSWD: /bin/umount
|
|
||||||
```
|
|
||||||
|
|
||||||
## Building with dotnet
|
## Building with dotnet
|
||||||
|
|
||||||
Jellyfin is build with `--self-contained` so no dotnet required for runtime.
|
Jellyfin is build with `--self-contained` so no dotnet required for runtime.
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
Name: jellyfin
|
Name: jellyfin
|
||||||
Version: 10.8.0
|
Version: 10.9.0
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
Summary: The Free Software Media System
|
Summary: The Free Software Media System
|
||||||
License: GPLv2
|
License: GPLv2
|
||||||
|
@ -176,6 +176,8 @@ fi
|
||||||
%systemd_postun_with_restart jellyfin.service
|
%systemd_postun_with_restart jellyfin.service
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jul 13 2022 Jellyfin Packaging Team <packaging@jellyfin.org>
|
||||||
|
- New upstream version 10.9.0; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.9.0
|
||||||
* Mon Nov 29 2021 Brian J. Murrell <brian@interlinx.bc.ca>
|
* Mon Nov 29 2021 Brian J. Murrell <brian@interlinx.bc.ca>
|
||||||
- Add jellyfin-server-lowports.service drop-in in a server-lowports
|
- Add jellyfin-server-lowports.service drop-in in a server-lowports
|
||||||
subpackage to allow binding to low ports
|
subpackage to allow binding to low ports
|
||||||
|
|
|
@ -11,8 +11,4 @@ Defaults!RESTARTSERVER_SYSTEMD !requiretty
|
||||||
Defaults!STARTSERVER_SYSTEMD !requiretty
|
Defaults!STARTSERVER_SYSTEMD !requiretty
|
||||||
Defaults!STOPSERVER_SYSTEMD !requiretty
|
Defaults!STOPSERVER_SYSTEMD !requiretty
|
||||||
|
|
||||||
# Allow the server to mount iso images
|
|
||||||
jellyfin ALL=(ALL) NOPASSWD: /bin/mount
|
|
||||||
jellyfin ALL=(ALL) NOPASSWD: /bin/umount
|
|
||||||
|
|
||||||
Defaults:jellyfin !requiretty
|
Defaults:jellyfin !requiretty
|
||||||
|
|
|
@ -13,7 +13,7 @@
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<Authors>Jellyfin Contributors</Authors>
|
<Authors>Jellyfin Contributors</Authors>
|
||||||
<PackageId>Jellyfin.Extensions</PackageId>
|
<PackageId>Jellyfin.Extensions</PackageId>
|
||||||
<VersionPrefix>10.8.0</VersionPrefix>
|
<VersionPrefix>10.9.0</VersionPrefix>
|
||||||
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
<RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
|
||||||
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
<PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
using (var stream = File.OpenRead("Test Data/example.ass"))
|
using (var stream = File.OpenRead("Test Data/example.ass"))
|
||||||
{
|
{
|
||||||
var parsed = new AssParser(new NullLogger<AssParser>()).Parse(stream, CancellationToken.None);
|
var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, "ass");
|
||||||
Assert.Single(parsed.TrackEvents);
|
Assert.Single(parsed.TrackEvents);
|
||||||
var trackEvent = parsed.TrackEvents[0];
|
var trackEvent = parsed.TrackEvents[0];
|
||||||
|
|
||||||
|
|
|
@ -15,7 +15,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
using (var stream = File.OpenRead("Test Data/example.srt"))
|
using (var stream = File.OpenRead("Test Data/example.srt"))
|
||||||
{
|
{
|
||||||
var parsed = new SrtParser(new NullLogger<SrtParser>()).Parse(stream, CancellationToken.None);
|
var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, "srt");
|
||||||
Assert.Equal(2, parsed.TrackEvents.Count);
|
Assert.Equal(2, parsed.TrackEvents.Count);
|
||||||
|
|
||||||
var trackEvent1 = parsed.TrackEvents[0];
|
var trackEvent1 = parsed.TrackEvents[0];
|
||||||
|
@ -37,7 +37,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
using (var stream = File.OpenRead("Test Data/example2.srt"))
|
using (var stream = File.OpenRead("Test Data/example2.srt"))
|
||||||
{
|
{
|
||||||
var parsed = new SrtParser(new NullLogger<SrtParser>()).Parse(stream, CancellationToken.None);
|
var parsed = new SubtitleEditParser(new NullLogger<SubtitleEditParser>()).Parse(stream, "srt");
|
||||||
Assert.Equal(2, parsed.TrackEvents.Count);
|
Assert.Equal(2, parsed.TrackEvents.Count);
|
||||||
|
|
||||||
var trackEvent1 = parsed.TrackEvents[0];
|
var trackEvent1 = parsed.TrackEvents[0];
|
||||||
|
|
|
@ -13,7 +13,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
public class SsaParserTests
|
public class SsaParserTests
|
||||||
{
|
{
|
||||||
private readonly SsaParser _parser = new SsaParser(new NullLogger<AssParser>());
|
private readonly SubtitleEditParser _parser = new SubtitleEditParser(new NullLogger<SubtitleEditParser>());
|
||||||
|
|
||||||
[Theory]
|
[Theory]
|
||||||
[MemberData(nameof(Parse_MultipleDialogues_TestData))]
|
[MemberData(nameof(Parse_MultipleDialogues_TestData))]
|
||||||
|
@ -21,7 +21,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
using (Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(ssa)))
|
using (Stream stream = new MemoryStream(Encoding.UTF8.GetBytes(ssa)))
|
||||||
{
|
{
|
||||||
SubtitleTrackInfo subtitleTrackInfo = _parser.Parse(stream, CancellationToken.None);
|
SubtitleTrackInfo subtitleTrackInfo = _parser.Parse(stream, "ssa");
|
||||||
|
|
||||||
Assert.Equal(expectedSubtitleTrackEvents.Count, subtitleTrackInfo.TrackEvents.Count);
|
Assert.Equal(expectedSubtitleTrackEvents.Count, subtitleTrackInfo.TrackEvents.Count);
|
||||||
|
|
||||||
|
@ -76,7 +76,7 @@ namespace Jellyfin.MediaEncoding.Subtitles.Tests
|
||||||
{
|
{
|
||||||
using (var stream = File.OpenRead("Test Data/example.ssa"))
|
using (var stream = File.OpenRead("Test Data/example.ssa"))
|
||||||
{
|
{
|
||||||
var parsed = _parser.Parse(stream, CancellationToken.None);
|
var parsed = _parser.Parse(stream, "ssa");
|
||||||
Assert.Single(parsed.TrackEvents);
|
Assert.Single(parsed.TrackEvents);
|
||||||
var trackEvent = parsed.TrackEvents[0];
|
var trackEvent = parsed.TrackEvents[0];
|
||||||
|
|
||||||
|
|
|
@ -109,26 +109,37 @@ namespace Jellyfin.Model.Tests.Entities
|
||||||
[InlineData(null, null, false, null)]
|
[InlineData(null, null, false, null)]
|
||||||
[InlineData(null, 0, false, null)]
|
[InlineData(null, 0, false, null)]
|
||||||
[InlineData(0, null, false, null)]
|
[InlineData(0, null, false, null)]
|
||||||
[InlineData(640, 480, false, "480p")]
|
[InlineData(256, 144, false, "144p")]
|
||||||
[InlineData(640, 480, true, "480i")]
|
[InlineData(256, 144, true, "144i")]
|
||||||
[InlineData(720, 576, false, "576p")]
|
[InlineData(426, 240, false, "240p")]
|
||||||
[InlineData(720, 576, true, "576i")]
|
[InlineData(426, 240, true, "240i")]
|
||||||
|
[InlineData(640, 360, false, "360p")]
|
||||||
|
[InlineData(640, 360, true, "360i")]
|
||||||
|
[InlineData(854, 480, false, "480p")]
|
||||||
|
[InlineData(854, 480, true, "480i")]
|
||||||
[InlineData(960, 540, false, "540p")]
|
[InlineData(960, 540, false, "540p")]
|
||||||
[InlineData(960, 540, true, "540i")]
|
[InlineData(960, 540, true, "540i")]
|
||||||
|
[InlineData(1024, 576, false, "576p")]
|
||||||
|
[InlineData(1024, 576, true, "576i")]
|
||||||
[InlineData(1280, 720, false, "720p")]
|
[InlineData(1280, 720, false, "720p")]
|
||||||
[InlineData(1280, 720, true, "720i")]
|
[InlineData(1280, 720, true, "720i")]
|
||||||
[InlineData(1920, 1080, false, "1080p")]
|
[InlineData(2560, 1080, false, "1080p")]
|
||||||
[InlineData(1920, 1080, true, "1080i")]
|
[InlineData(2560, 1080, true, "1080i")]
|
||||||
[InlineData(4096, 3072, false, "4K")]
|
[InlineData(4096, 3072, false, "4K")]
|
||||||
[InlineData(8192, 6144, false, "8K")]
|
[InlineData(8192, 6144, false, "8K")]
|
||||||
[InlineData(512, 384, false, "480p")]
|
[InlineData(512, 384, false, "480p")]
|
||||||
[InlineData(576, 336, false, "480p")]
|
[InlineData(576, 336, false, "360p")]
|
||||||
[InlineData(624, 352, false, "480p")]
|
[InlineData(576, 336, true, "360i")]
|
||||||
[InlineData(640, 352, false, "480p")]
|
[InlineData(624, 352, false, "360p")]
|
||||||
|
[InlineData(640, 352, false, "360p")]
|
||||||
|
[InlineData(640, 480, false, "480p")]
|
||||||
[InlineData(704, 396, false, "480p")]
|
[InlineData(704, 396, false, "480p")]
|
||||||
[InlineData(720, 404, false, "480p")]
|
[InlineData(720, 404, false, "480p")]
|
||||||
[InlineData(720, 480, false, "480p")]
|
[InlineData(720, 480, false, "480p")]
|
||||||
|
[InlineData(720, 576, false, "576p")]
|
||||||
[InlineData(768, 576, false, "576p")]
|
[InlineData(768, 576, false, "576p")]
|
||||||
|
[InlineData(960, 544, false, "540p")]
|
||||||
|
[InlineData(960, 544, true, "540i")]
|
||||||
[InlineData(960, 720, false, "720p")]
|
[InlineData(960, 720, false, "720p")]
|
||||||
[InlineData(1280, 528, false, "720p")]
|
[InlineData(1280, 528, false, "720p")]
|
||||||
[InlineData(1280, 532, false, "720p")]
|
[InlineData(1280, 532, false, "720p")]
|
||||||
|
@ -140,6 +151,11 @@ namespace Jellyfin.Model.Tests.Entities
|
||||||
[InlineData(1280, 696, false, "720p")]
|
[InlineData(1280, 696, false, "720p")]
|
||||||
[InlineData(1280, 716, false, "720p")]
|
[InlineData(1280, 716, false, "720p")]
|
||||||
[InlineData(1280, 718, false, "720p")]
|
[InlineData(1280, 718, false, "720p")]
|
||||||
|
[InlineData(1920, 1080, false, "1080p")]
|
||||||
|
[InlineData(1440, 1070, false, "1080p")]
|
||||||
|
[InlineData(1440, 1072, false, "1080p")]
|
||||||
|
[InlineData(1440, 1080, false, "1080p")]
|
||||||
|
[InlineData(1440, 1440, false, "1080p")]
|
||||||
[InlineData(1912, 792, false, "1080p")]
|
[InlineData(1912, 792, false, "1080p")]
|
||||||
[InlineData(1916, 1076, false, "1080p")]
|
[InlineData(1916, 1076, false, "1080p")]
|
||||||
[InlineData(1918, 1080, false, "1080p")]
|
[InlineData(1918, 1080, false, "1080p")]
|
||||||
|
@ -153,14 +169,16 @@ namespace Jellyfin.Model.Tests.Entities
|
||||||
[InlineData(1920, 960, false, "1080p")]
|
[InlineData(1920, 960, false, "1080p")]
|
||||||
[InlineData(1920, 1024, false, "1080p")]
|
[InlineData(1920, 1024, false, "1080p")]
|
||||||
[InlineData(1920, 1040, false, "1080p")]
|
[InlineData(1920, 1040, false, "1080p")]
|
||||||
|
[InlineData(1920, 1070, false, "1080p")]
|
||||||
[InlineData(1920, 1072, false, "1080p")]
|
[InlineData(1920, 1072, false, "1080p")]
|
||||||
[InlineData(1440, 1072, false, "1080p")]
|
[InlineData(1920, 1440, false, "1080p")]
|
||||||
[InlineData(1440, 1080, false, "1080p")]
|
|
||||||
[InlineData(3840, 1600, false, "4K")]
|
[InlineData(3840, 1600, false, "4K")]
|
||||||
[InlineData(3840, 1606, false, "4K")]
|
[InlineData(3840, 1606, false, "4K")]
|
||||||
[InlineData(3840, 1608, false, "4K")]
|
[InlineData(3840, 1608, false, "4K")]
|
||||||
[InlineData(3840, 2160, false, "4K")]
|
[InlineData(3840, 2160, false, "4K")]
|
||||||
|
[InlineData(4090, 3070, false, "4K")]
|
||||||
[InlineData(7680, 4320, false, "8K")]
|
[InlineData(7680, 4320, false, "8K")]
|
||||||
|
[InlineData(8190, 6140, false, "8K")]
|
||||||
public void GetResolutionText_Valid(int? width, int? height, bool interlaced, string expected)
|
public void GetResolutionText_Valid(int? width, int? height, bool interlaced, string expected)
|
||||||
{
|
{
|
||||||
var mediaStream = new MediaStream()
|
var mediaStream = new MediaStream()
|
||||||
|
|
|
@ -9,7 +9,7 @@
|
||||||
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
<PackageReference Include="AutoFixture" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.AutoMoq" Version="4.17.0" />
|
||||||
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
<PackageReference Include="AutoFixture.Xunit2" Version="4.17.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.6" />
|
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.7" />
|
||||||
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
<PackageReference Include="Microsoft.Extensions.Options" Version="6.0.0" />
|
||||||
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.2.0" />
|
||||||
<PackageReference Include="xunit" Version="2.4.1" />
|
<PackageReference Include="xunit" Version="2.4.1" />
|
||||||
|
|
Loading…
Reference in New Issue