michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 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
Show Stats 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; 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) 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() .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 else
{ {
@ -240,7 +254,7 @@ namespace MediaBrowser.Controller.Entities
return false; 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);
}); });
} }

15
MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs
View File

@ -66,6 +66,11 @@ namespace MediaBrowser.Controller.Resolvers
/// <returns><c>true</c> if [is multi part file] [the specified path]; otherwise, <c>false</c>.</returns> /// <returns><c>true</c> if [is multi part file] [the specified path]; otherwise, <c>false</c>.</returns>
public static bool IsMultiPartFile(string path) public static bool IsMultiPartFile(string path)
{ {
if (string.IsNullOrEmpty(path))
{
throw new ArgumentNullException("path");
}
return MultiFileRegex.Match(path).Success || MultiFolderRegex.Match(path).Success; return MultiFileRegex.Match(path).Success || MultiFolderRegex.Match(path).Success;
} }
@ -97,6 +102,11 @@ namespace MediaBrowser.Controller.Resolvers
/// <returns><c>true</c> if [is audio file] [the specified args]; otherwise, <c>false</c>.</returns> /// <returns><c>true</c> if [is audio file] [the specified args]; otherwise, <c>false</c>.</returns>
public static bool IsAudioFile(string path) public static bool IsAudioFile(string path)
{ {
if (string.IsNullOrEmpty(path))
{
throw new ArgumentNullException("path");
}
var extension = Path.GetExtension(path); var extension = Path.GetExtension(path);
if (string.IsNullOrEmpty(extension)) if (string.IsNullOrEmpty(extension))
@ -114,6 +124,11 @@ namespace MediaBrowser.Controller.Resolvers
/// <returns><c>true</c> if [is video file] [the specified path]; otherwise, <c>false</c>.</returns> /// <returns><c>true</c> if [is video file] [the specified path]; otherwise, <c>false</c>.</returns>
public static bool IsVideoFile(string path) public static bool IsVideoFile(string path)
{ {
if (string.IsNullOrEmpty(path))
{
throw new ArgumentNullException("path");
}
var extension = Path.GetExtension(path); var extension = Path.GetExtension(path);
if (string.IsNullOrEmpty(extension)) if (string.IsNullOrEmpty(extension))