Skip to content

Commit

Permalink
Fix warning: The nullable warning suppression expression is redundant (
Browse files Browse the repository at this point in the history
  • Loading branch information
KonH committed Oct 3, 2021
1 parent 531efc3 commit 7c282ec
Show file tree
Hide file tree
Showing 13 changed files with 27 additions and 27 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
{
if (user.SyncPlayAccess == SyncPlayUserAccessType.CreateAndJoinGroups
|| user.SyncPlayAccess == SyncPlayUserAccessType.JoinGroups
|| _syncPlayManager.IsUserActive(userId!.Value))
|| _syncPlayManager.IsUserActive(userId.Value))
{
context.Succeed(requirement);
}
Expand Down Expand Up @@ -85,7 +85,7 @@ protected override Task HandleRequirementAsync(AuthorizationHandlerContext conte
}
else if (requirement.RequiredAccess == SyncPlayAccessRequirementType.IsInGroup)
{
if (_syncPlayManager.IsUserActive(userId!.Value))
if (_syncPlayManager.IsUserActive(userId.Value))
{
context.Succeed(requirement);
}
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/DashboardController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ public class DashboardController : BaseJellyfinApiController

if (enableInMainMenu.HasValue)
{
configPages = configPages.Where(p => p!.EnableInMainMenu == enableInMainMenu.Value).ToList();
configPages = configPages.Where(p => p.EnableInMainMenu == enableInMainMenu.Value).ToList();
}

return configPages;
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/DynamicHlsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1709,7 +1709,7 @@ private ActionResult GetSegmentResult(StreamState state, string segmentPath, int
return Task.CompletedTask;
});

return FileStreamResponseHelpers.GetStaticFileResult(segmentPath, MimeTypes.GetMimeType(segmentPath)!, false, HttpContext);
return FileStreamResponseHelpers.GetStaticFileResult(segmentPath, MimeTypes.GetMimeType(segmentPath), false, HttpContext);
}

private long GetEndPositionTicks(StreamState state, int requestedIndex)
Expand Down
4 changes: 2 additions & 2 deletions Jellyfin.Api/Controllers/HlsSegmentController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ public ActionResult GetHlsAudioSegmentLegacy([FromRoute, Required] string itemId
return BadRequest("Invalid segment.");
}

return FileStreamResponseHelpers.GetStaticFileResult(file, MimeTypes.GetMimeType(file)!, false, HttpContext);
return FileStreamResponseHelpers.GetStaticFileResult(file, MimeTypes.GetMimeType(file), false, HttpContext);
}

/// <summary>
Expand Down Expand Up @@ -186,7 +186,7 @@ private ActionResult GetFileResult(string path, string playlistPath)
return Task.CompletedTask;
});

return FileStreamResponseHelpers.GetStaticFileResult(path, MimeTypes.GetMimeType(path)!, false, HttpContext);
return FileStreamResponseHelpers.GetStaticFileResult(path, MimeTypes.GetMimeType(path), false, HttpContext);
}
}
}
14 changes: 7 additions & 7 deletions Jellyfin.Api/Controllers/InstantMixController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -116,7 +116,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(album, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -152,7 +152,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(playlist, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -187,7 +187,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromGenres(new[] { name }, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -223,7 +223,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -259,7 +259,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down Expand Up @@ -332,7 +332,7 @@ public class InstantMixController : BaseJellyfinApiController
: null;
var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);
var items = _musicManager.GetInstantMixFromItem(item, user, dtoOptions);
return GetResult(items, user, limit, dtoOptions);
}
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/ItemsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -287,7 +287,7 @@ public class ItemsController : BaseJellyfinApiController

if ((recursive.HasValue && recursive.Value) || ids.Length != 0 || item is not UserRootFolder)
{
var query = new InternalItemsQuery(user!)
var query = new InternalItemsQuery(user)
{
IsPlayed = isPlayed,
MediaTypes = mediaTypes,
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/MediaInfoController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@ public async Task<ActionResult<PlaybackInfoResponse>> GetPlaybackInfo([FromRoute
audioStreamIndex,
subtitleStreamIndex,
maxAudioChannels,
info!.PlaySessionId!,
info.PlaySessionId!,
userId ?? Guid.Empty,
enableDirectPlay.Value,
enableDirectStream.Value,
Expand Down
8 changes: 4 additions & 4 deletions Jellyfin.Api/Controllers/TvShowsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ public class TvShowsController : BaseJellyfinApiController
{
var options = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes);

var result = _tvSeriesManager.GetNextUp(
new NextUpQuery
Expand Down Expand Up @@ -153,7 +153,7 @@ public class TvShowsController : BaseJellyfinApiController

var options = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImges, enableUserData, imageTypeLimit, enableImageTypes);

var itemsResult = _libraryManager.GetItemList(new InternalItemsQuery(user)
{
Expand Down Expand Up @@ -223,7 +223,7 @@ public class TvShowsController : BaseJellyfinApiController

var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

if (seasonId.HasValue) // Season id was supplied. Get episodes by season id.
{
Expand Down Expand Up @@ -350,7 +350,7 @@ public class TvShowsController : BaseJellyfinApiController

var dtoOptions = new DtoOptions { Fields = fields }
.AddClientFields(Request)
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes!);
.AddAdditionalDtoOptions(enableImages, enableUserData, imageTypeLimit, enableImageTypes);

var returnItems = _dtoService.GetBaseItemDtos(seasons, dtoOptions, user);

Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/UniversalAudioController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ public class UniversalAudioController : BaseJellyfinApiController
null,
null,
maxAudioChannels,
info!.PlaySessionId!,
info.PlaySessionId!,
userId ?? Guid.Empty,
true,
true,
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Controllers/VideosController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ public async Task<ActionResult> MergeVersions([FromQuery, Required, ModelBinder(

var liveStream = new ProgressiveFileStream(liveStreamInfo.GetStream());
// TODO (moved from MediaBrowser.Api): Don't hardcode contentType
return File(liveStream, MimeTypes.GetMimeType("file.ts")!);
return File(liveStream, MimeTypes.GetMimeType("file.ts"));
}

// Static remote stream
Expand Down
8 changes: 4 additions & 4 deletions Jellyfin.Api/Helpers/TranscodingJobHelper.cs
Original file line number Diff line number Diff line change
Expand Up @@ -86,8 +86,8 @@ public class TranscodingJobHelper : IDisposable

DeleteEncodedMediaCache();

sessionManager!.PlaybackProgress += OnPlaybackProgress;
sessionManager!.PlaybackStart += OnPlaybackProgress;
sessionManager.PlaybackProgress += OnPlaybackProgress;
sessionManager.PlaybackStart += OnPlaybackProgress;
}

/// <summary>
Expand Down Expand Up @@ -878,8 +878,8 @@ protected virtual void Dispose(bool disposing)
if (disposing)
{
_loggerFactory.Dispose();
_sessionManager!.PlaybackProgress -= OnPlaybackProgress;
_sessionManager!.PlaybackStart -= OnPlaybackProgress;
_sessionManager.PlaybackProgress -= OnPlaybackProgress;
_sessionManager.PlaybackStart -= OnPlaybackProgress;
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion Jellyfin.Api/Models/StreamingDtos/StreamState.cs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ public StreamingRequestDto Request
/// <summary>
/// Gets the video request.
/// </summary>
public VideoRequestDto? VideoRequest => Request! as VideoRequestDto;
public VideoRequestDto? VideoRequest => Request as VideoRequestDto;

/// <summary>
/// Gets or sets the direct stream provicer.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ public Task<AuthorizationInfo> GetAuthorizationInfo(HttpContext requestContext)
{
if (requestContext.Request.HttpContext.Items.TryGetValue("AuthorizationInfo", out var cached) && cached != null)
{
return Task.FromResult((AuthorizationInfo)cached!); // Cache should never contain null
return Task.FromResult((AuthorizationInfo)cached); // Cache should never contain null
}

return GetAuthorization(requestContext);
Expand Down

0 comments on commit 7c282ec

Please sign in to comment.