Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-01 04:34:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix warning: Qualifier is redundant (#2149)

Browse Source
This commit is contained in:
KonH 2021-10-03 11:00:45 +07:00
parent b6bf43af45
commit e3fccd5ae6
6 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jellyfin.Api/Helpers/AudioHelper.cs
View File

@ -147,7 +147,7 @@ namespace Jellyfin.Api.Helpers
} }
var outputPath = state.OutputFilePath; var outputPath = state.OutputFilePath;
var outputPathExists = System.IO.File.Exists(outputPath); var outputPathExists = File.Exists(outputPath);
var transcodingJob = _transcodingJobHelper.GetTranscodingJob(outputPath, TranscodingJobType.Progressive); var transcodingJob = _transcodingJobHelper.GetTranscodingJob(outputPath, TranscodingJobType.Progressive);
var isTranscodeCached = outputPathExists && transcodingJob != null; var isTranscodeCached = outputPathExists && transcodingJob != null;

6
Jellyfin.Server/Program.cs
View File

@ -594,7 +594,7 @@ namespace Jellyfin.Server
try try
{ {
// Serilog.Log is used by SerilogLoggerFactory when no logger is specified // Serilog.Log is used by SerilogLoggerFactory when no logger is specified
Serilog.Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
.ReadFrom.Configuration(configuration) .ReadFrom.Configuration(configuration)
.Enrich.FromLogContext() .Enrich.FromLogContext()
.Enrich.WithThreadId() .Enrich.WithThreadId()
@ -602,7 +602,7 @@ namespace Jellyfin.Server
} }
catch (Exception ex) catch (Exception ex)
{ {
Serilog.Log.Logger = new LoggerConfiguration() Log.Logger = new LoggerConfiguration()
.WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}") .WriteTo.Console(outputTemplate: "[{Timestamp:HH:mm:ss}] [{Level:u3}] [{ThreadId}] {SourceContext}: {Message:lj}{NewLine}{Exception}")
.WriteTo.Async(x => x.File( .WriteTo.Async(x => x.File(
Path.Combine(appPaths.LogDirectoryPath, "log_.log"), Path.Combine(appPaths.LogDirectoryPath, "log_.log"),
@ -613,7 +613,7 @@ namespace Jellyfin.Server
.Enrich.WithThreadId() .Enrich.WithThreadId()
.CreateLogger(); .CreateLogger();
Serilog.Log.Logger.Fatal(ex, "Failed to create/read logger configuration"); Log.Logger.Fatal(ex, "Failed to create/read logger configuration");
} }
} }

2
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -2997,7 +2997,7 @@ namespace MediaBrowser.Controller.Entities
} }
/// <inheritdoc /> /// <inheritdoc />
public bool Equals(BaseItem other) => object.Equals(Id, other?.Id); public bool Equals(BaseItem other) => Equals(Id, other?.Id);
/// <inheritdoc /> /// <inheritdoc />
public override int GetHashCode() => HashCode.Combine(Id); public override int GetHashCode() => HashCode.Combine(Id);

2
MediaBrowser.Controller/Entities/BaseItemExtensions.cs
View File

@ -44,7 +44,7 @@ namespace MediaBrowser.Controller.Entities
/// <param name="file">The file.</param> /// <param name="file">The file.</param>
public static void SetImagePath(this BaseItem item, ImageType imageType, string file) public static void SetImagePath(this BaseItem item, ImageType imageType, string file)
{ {
if (file.StartsWith("http", System.StringComparison.OrdinalIgnoreCase)) if (file.StartsWith("http", StringComparison.OrdinalIgnoreCase))
{ {
item.SetImage( item.SetImage(
new ItemImageInfo new ItemImageInfo

2
MediaBrowser.MediaEncoding/BdInfo/BdInfoDirectoryInfo.cs
View File

@ -75,7 +75,7 @@ namespace MediaBrowser.MediaEncoding.BdInfo
x => new BdInfoFileInfo(x)); x => new BdInfoFileInfo(x));
} }
public static IDirectoryInfo FromFileSystemPath(Model.IO.IFileSystem fs, string path) public static IDirectoryInfo FromFileSystemPath(IFileSystem fs, string path)
{ {
return new BdInfoDirectoryInfo(fs, path); return new BdInfoDirectoryInfo(fs, path);
} }

2
RSSDP/SsdpCommunicationsServer.cs
View File

@ -395,7 +395,7 @@ namespace Rssdp.Infrastructure
// Strange cannot convert compiler error here if I don't explicitly // Strange cannot convert compiler error here if I don't explicitly
// assign or cast to Action first. Assignment is easier to read, // assign or cast to Action first. Assignment is easier to read,
// so went with that. // so went with that.
ProcessMessage(System.Text.UTF8Encoding.UTF8.GetString(result.Buffer, 0, result.ReceivedBytes), result.RemoteEndPoint, result.LocalIPAddress); ProcessMessage(UTF8Encoding.UTF8.GetString(result.Buffer, 0, result.ReceivedBytes), result.RemoteEndPoint, result.LocalIPAddress);
} }
} }
catch (ObjectDisposedException) catch (ObjectDisposedException)