starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-16 05:53:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Convert NullReferenceException to ResourceNotFoundException

Browse Source
This commit is contained in:
crobibero
2020-11-13 11:14:44 -07:00
parent be312f992d
commit 5f52a58e78
18 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Jellyfin.Api/Controllers/DynamicHlsController.cs
View File

@@ -14,6 +14,7 @@ using Jellyfin.Api.Helpers;
using Jellyfin.Api.Models.PlaybackDtos;
using Jellyfin.Api.Models.StreamingDtos;
using MediaBrowser.Common.Configuration;
using MediaBrowser.Common.Extensions;
using MediaBrowser.Controller.Configuration;
using MediaBrowser.Controller.Devices;
using MediaBrowser.Controller.Dlna;
@@ -1350,7 +1351,7 @@ namespace Jellyfin.Api.Controllers
var directory = Path.GetDirectoryName(outputPath);
if (directory == null)
{
throw new NullReferenceException(nameof(directory));
throw new ResourceNotFoundException(nameof(directory));
}
var outputTsArg = Path.Combine(directory, Path.GetFileNameWithoutExtension(outputPath)) + "%d" + GetSegmentFileExtension(state.Request.SegmentContainer);
@@ -1574,7 +1575,7 @@ namespace Jellyfin.Api.Controllers
var folder = Path.GetDirectoryName(playlist);
if (folder == null)
{
throw new NullReferenceException(nameof(folder));
throw new ResourceNotFoundException(nameof(folder));
}
var filename = Path.GetFileNameWithoutExtension(playlist);