Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-09-29 15:31:04 -04:00
Code Issues Packages Projects Releases Wiki Activity

Various cleanups (#14785)

Browse Source
This commit is contained in:
Bond-009 2025-09-12 21:58:23 +02:00 committed by GitHub
parent c02a24e32a
commit 8776a447d1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
9 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Emby.Server.Implementations/AppBase/BaseApplicationPaths.cs
View File

@ -108,7 +108,7 @@ namespace Emby.Server.Implementations.AppBase
private void CheckOrCreateMarker(string path, string markerName, bool recursive = false)
{
var otherMarkers = GetMarkers(path, recursive).FirstOrDefault(e => Path.GetFileName(e) != markerName);
if (otherMarkers != null)
if (otherMarkers is not null)
{
throw new InvalidOperationException($"Exepected to find only {markerName} but found marker for {otherMarkers}.");
}

2
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -657,7 +657,7 @@ namespace Emby.Server.Implementations.Library
}
catch (Exception ex)
{
_logger.LogDebug(ex, "_jsonSerializer.DeserializeFromFile threw an exception.");
_logger.LogDebug(ex, "Error parsing cached media info.");
}
finally
{

2
Jellyfin.Server.Implementations/FullSystemBackup/BackupService.cs
View File

@ -39,7 +39,7 @@ public class BackupService : IBackupService
ReferenceHandler = ReferenceHandler.IgnoreCycles,
};
private readonly Version _backupEngineVersion = Version.Parse("0.2.0");
private readonly Version _backupEngineVersion = new Version(0, 2, 0);
/// <summary>
/// Initializes a new instance of the <see cref="BackupService"/> class.

2
Jellyfin.Server/Filters/AdditionalModelFilter.cs
View File

@ -175,7 +175,7 @@ namespace Jellyfin.Server.Filters
// Manually generate sync play GroupUpdate messages.
var groupUpdateTypes = typeof(GroupUpdate<>).Assembly.GetTypes()
.Where(t => t.BaseType != null
.Where(t => t.BaseType is not null
&& t.BaseType.IsGenericType
&& t.BaseType.GetGenericTypeDefinition() == typeof(GroupUpdate<>))
.ToList();

6
Jellyfin.Server/Migrations/JellyfinMigrationService.cs
View File

@ -62,7 +62,7 @@ internal class JellyfinMigrationService
#pragma warning disable CS0618 // Type or member is obsolete
Migrations = [.. typeof(IMigrationRoutine).Assembly.GetTypes().Where(e => typeof(IMigrationRoutine).IsAssignableFrom(e) || typeof(IAsyncMigrationRoutine).IsAssignableFrom(e))
.Select(e => (Type: e, Metadata: e.GetCustomAttribute<JellyfinMigrationAttribute>(), Backup: e.GetCustomAttributes<JellyfinMigrationBackupAttribute>()))
.Where(e => e.Metadata != null)
.Where(e => e.Metadata is not null)
.GroupBy(e => e.Metadata!.Stage)
.Select(f =>
{
@ -137,7 +137,7 @@ internal class JellyfinMigrationService
var migrationOptions = File.Exists(migrationConfigPath)
? (MigrationOptions)xmlSerializer.DeserializeFromFile(typeof(MigrationOptions), migrationConfigPath)!
: null;
if (migrationOptions != null && migrationOptions.Applied.Count > 0)
if (migrationOptions is not null && migrationOptions.Applied.Count > 0)
{
logger.LogInformation("Old migration style migration.xml detected. Migrate now.");
try
@ -383,7 +383,7 @@ internal class JellyfinMigrationService
}
}
if (backupInstruction.JellyfinDb && _jellyfinDatabaseProvider != null)
if (backupInstruction.JellyfinDb && _jellyfinDatabaseProvider is not null)
{
logger.LogInformation("A migration will attempt to modify the jellyfin.db, will attempt to backup the file now.");
_backupKey = (_backupKey.LibraryDb, await _jellyfinDatabaseProvider.MigrationBackupFast(CancellationToken.None).ConfigureAwait(false), _backupKey.FullBackup);

2
Jellyfin.Server/Migrations/Routines/MigrateLibraryDb.cs
View File

@ -1189,7 +1189,7 @@ internal class MigrateLibraryDb : IDatabaseMigrationRoutine
ItemId = baseItemId,
Id = Guid.NewGuid(),
Path = e.Path,
Blurhash = e.BlurHash != null ? Encoding.UTF8.GetBytes(e.BlurHash) : null,
Blurhash = e.BlurHash is not null ? Encoding.UTF8.GetBytes(e.BlurHash) : null,
DateModified = e.DateModified,
Height = e.Height,
Width = e.Width,

2
Jellyfin.Server/ServerSetupApp/SetupServer.cs
View File

@ -98,7 +98,7 @@ public sealed class SetupServer : IDisposable
var maxLevel = logEntry.LogLevel;
var stack = new Stack<StartupLogTopic>(children);
while (maxLevel != LogLevel.Error && stack.Count > 0 && (logEntry = stack.Pop()) != null) // error is the highest inherted error level.
while (maxLevel != LogLevel.Error && stack.Count > 0 && (logEntry = stack.Pop()) is not null) // error is the highest inherted error level.
{
maxLevel = maxLevel < logEntry.LogLevel ? logEntry.LogLevel : maxLevel;
foreach (var child in logEntry.Children)

8
MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
View File

@ -932,12 +932,10 @@ namespace MediaBrowser.MediaEncoding.Probing
}
var frameInfo = frameInfoList?.FirstOrDefault(i => i.StreamIndex == stream.Index);
if (frameInfo?.SideDataList != null)
if (frameInfo?.SideDataList is not null
&& frameInfo.SideDataList.Any(data => string.Equals(data.SideDataType, "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)", StringComparison.OrdinalIgnoreCase)))
{
if (frameInfo.SideDataList.Any(data => string.Equals(data.SideDataType, "HDR Dynamic Metadata SMPTE2094-40 (HDR10+)", StringComparison.OrdinalIgnoreCase)))
{
stream.Hdr10PlusPresentFlag = true;
}
stream.Hdr10PlusPresentFlag = true;
}
}
else if (streamInfo.CodecType == CodecType.Data)

9
MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbMovieProvider.cs
View File

@ -213,15 +213,18 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
var releases = movieResult.Releases.Countries.Where(i => !string.IsNullOrWhiteSpace(i.Certification)).ToList();
var ourRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, info.MetadataCountryCode, StringComparison.OrdinalIgnoreCase));
var usRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
if (ourRelease is not null)
{
movie.OfficialRating = TmdbUtils.BuildParentalRating(ourRelease.Iso_3166_1, ourRelease.Certification);
}
else if (usRelease is not null)
else
{
movie.OfficialRating = usRelease.Certification;
var usRelease = releases.FirstOrDefault(c => string.Equals(c.Iso_3166_1, "US", StringComparison.OrdinalIgnoreCase));
if (usRelease is not null)
{
movie.OfficialRating = usRelease.Certification;
}
}
}