Skip to content

Commit

Permalink
Remove more warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
crobibero committed Dec 26, 2021
1 parent 78bb581 commit 4bf604a
Show file tree
Hide file tree
Showing 49 changed files with 225 additions and 276 deletions.
10 changes: 5 additions & 5 deletions Emby.Drawing/ImageProcessor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ public sealed class ImageProcessor : IImageProcessor, IDisposable
public async Task ProcessImage(ImageProcessingOptions options, Stream toStream)
{
var file = await ProcessImage(options).ConfigureAwait(false);
using (var fileStream = AsyncFile.OpenRead(file.path))
using (var fileStream = AsyncFile.OpenRead(file.Path))
{
await fileStream.CopyToAsync(toStream).ConfigureAwait(false);
}
Expand All @@ -116,7 +116,7 @@ public bool SupportsTransparency(string path)
=> _transparentImageTypes.Contains(Path.GetExtension(path));

/// <inheritdoc />
public async Task<(string path, string? mimeType, DateTime dateModified)> ProcessImage(ImageProcessingOptions options)
public async Task<(string Path, string? MimeType, DateTime DateModified)> ProcessImage(ImageProcessingOptions options)
{
ItemImageInfo originalImage = options.Image;
BaseItem item = options.Item;
Expand All @@ -135,14 +135,14 @@ public async Task<(string path, string? mimeType, DateTime dateModified)> Proces
}

var supportedImageInfo = await GetSupportedImage(originalImagePath, dateModified).ConfigureAwait(false);
originalImagePath = supportedImageInfo.path;
originalImagePath = supportedImageInfo.Path;

if (!File.Exists(originalImagePath))
{
return (originalImagePath, MimeTypes.GetMimeType(originalImagePath), dateModified);
}

dateModified = supportedImageInfo.dateModified;
dateModified = supportedImageInfo.DateModified;
bool requiresTransparency = _transparentImageTypes.Contains(Path.GetExtension(originalImagePath));

bool autoOrient = false;
Expand Down Expand Up @@ -436,7 +436,7 @@ public string GetImageCacheTag(BaseItem item, ChapterInfo chapter)
.ToString("N", CultureInfo.InvariantCulture);
}

private async Task<(string path, DateTime dateModified)> GetSupportedImage(string originalImagePath, DateTime dateModified)
private async Task<(string Path, DateTime DateModified)> GetSupportedImage(string originalImagePath, DateTime dateModified)
{
var inputFormat = Path.GetExtension(originalImagePath)
.TrimStart('.')
Expand Down
6 changes: 3 additions & 3 deletions Emby.Naming/TV/SeasonPathParser.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public static SeasonPathParserResult Parse(string path, bool supportSpecialAlias
/// <param name="supportSpecialAliases">if set to <c>true</c> [support special aliases].</param>
/// <param name="supportNumericSeasonFolders">if set to <c>true</c> [support numeric season folders].</param>
/// <returns>System.Nullable{System.Int32}.</returns>
private static (int? seasonNumber, bool isSeasonFolder) GetSeasonNumberFromPath(
private static (int? SeasonNumber, bool IsSeasonFolder) GetSeasonNumberFromPath(
string path,
bool supportSpecialAliases,
bool supportNumericSeasonFolders)
Expand Down Expand Up @@ -99,7 +99,7 @@ public static SeasonPathParserResult Parse(string path, bool supportSpecialAlias
if (filename.Contains(name, StringComparison.OrdinalIgnoreCase))
{
var result = GetSeasonNumberFromPathSubstring(filename.Replace(name, " ", StringComparison.OrdinalIgnoreCase));
if (result.seasonNumber.HasValue)
if (result.SeasonNumber.HasValue)
{
return result;
}
Expand Down Expand Up @@ -142,7 +142,7 @@ private static bool TryGetSeasonNumberFromPart(ReadOnlySpan<char> part, out int
/// </summary>
/// <param name="path">The path.</param>
/// <returns>System.Nullable{System.Int32}.</returns>
private static (int? seasonNumber, bool isSeasonFolder) GetSeasonNumberFromPathSubstring(ReadOnlySpan<char> path)
private static (int? SeasonNumber, bool IsSeasonFolder) GetSeasonNumberFromPathSubstring(ReadOnlySpan<char> path)
{
var numericStart = -1;
var length = 0;
Expand Down
8 changes: 3 additions & 5 deletions Emby.Server.Implementations/Channels/ChannelManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -130,16 +130,14 @@ public Task DeleteItem(BaseItem item)
var internalChannel = _libraryManager.GetItemById(item.ChannelId);
if (internalChannel == null)
{
throw new ArgumentException();
throw new ArgumentException(nameof(item.ChannelId));
}

var channel = Channels.FirstOrDefault(i => GetInternalChannelId(i.Name).Equals(internalChannel.Id));

var supportsDelete = channel as ISupportsDelete;

if (supportsDelete == null)
if (channel is not ISupportsDelete supportsDelete)
{
throw new ArgumentException();
throw new ArgumentException(nameof(channel));
}

return supportsDelete.DeleteItem(item.ExternalId, CancellationToken.None);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public async Task<BoxSet> CreateCollectionAsync(CollectionCreationOptions option

if (parentFolder == null)
{
throw new ArgumentException();
throw new ArgumentException(nameof(parentFolder));
}

var path = Path.Combine(parentFolder.Path, folderName);
Expand Down
Loading

0 comments on commit 4bf604a

Please sign in to comment.