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

add null checks to video methods

Browse Source
This commit is contained in:
Luke Pulverenti
2014-01-02 16:21:47 -05:00
parent 8369f16d66
commit b50fc351a1
2 changed files with 32 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
MediaBrowser.Controller/Entities/Video.cs
View File

@@ -225,11 +225,25 @@ namespace MediaBrowser.Controller.Entities
{
IEnumerable<FileSystemInfo> files;
var path = Path;
if (string.IsNullOrEmpty(path))
{
throw new ApplicationException(string.Format("Item {0} has a null path.", Name ?? Id.ToString()));
}
if (VideoType == VideoType.BluRay || VideoType == VideoType.Dvd)
{
files = new DirectoryInfo(System.IO.Path.GetDirectoryName(Path))
var parentPath = System.IO.Path.GetDirectoryName(path);
if (string.IsNullOrEmpty(parentPath))
{
throw new ApplicationException("Unable to get parent path info from " + path);
}
files = new DirectoryInfo(parentPath)
.EnumerateDirectories()
.Where(i => !string.Equals(i.FullName, Path, StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsMultiPartFile(i.Name));
.Where(i => !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsMultiPartFile(i.Name));
}
else
{
@@ -240,7 +254,7 @@ namespace MediaBrowser.Controller.Entities
return false;
}
return !string.Equals(i.FullName, Path, StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsVideoFile(i.FullName) && EntityResolutionHelper.IsMultiPartFile(i.Name);
return !string.Equals(i.FullName, path, StringComparison.OrdinalIgnoreCase) && EntityResolutionHelper.IsVideoFile(i.FullName) && EntityResolutionHelper.IsMultiPartFile(i.Name);
});
}