diff options
5 files changed, 15 insertions, 2 deletions
diff --git a/MediaBrowser.Controller/IO/FileSystemHelper.cs b/MediaBrowser.Controller/IO/FileSystemHelper.cs index 0a80a4d97..cafd64fcf 100644 --- a/MediaBrowser.Controller/IO/FileSystemHelper.cs +++ b/MediaBrowser.Controller/IO/FileSystemHelper.cs @@ -66,6 +66,7 @@ namespace MediaBrowser.Controller.IO //filtered - see if it is one of our "indicator" folders and mark it now - no reason to search for it again
args.IsBDFolder |= file.cFileName.Equals("bdmv", StringComparison.OrdinalIgnoreCase);
args.IsDVDFolder |= file.cFileName.Equals("video_ts", StringComparison.OrdinalIgnoreCase);
+ args.IsHDDVDFolder |= file.cFileName.Equals("hvdvd_ts", StringComparison.OrdinalIgnoreCase);
}
}
}
diff --git a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs index 4194517be..0a7c29d06 100644 --- a/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs +++ b/MediaBrowser.Controller/Library/ItemResolveEventArgs.cs @@ -37,6 +37,7 @@ namespace MediaBrowser.Controller.Library public bool IsBDFolder { get; set; }
public bool IsDVDFolder { get; set; }
+ public bool IsHDDVDFolder { get; set; }
public WIN32_FIND_DATA? GetFileSystemEntry(string path)
{
diff --git a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs index 7a09139fe..5b1365c6d 100644 --- a/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs +++ b/MediaBrowser.Controller/Resolvers/EntityResolutionHelper.cs @@ -24,7 +24,9 @@ namespace MediaBrowser.Controller.Resolvers "video_ts",
"audio_ts",
"ps3_update",
- "ps3_vprm"
+ "ps3_vprm",
+ "adv_obj",
+ "hvdvd_ts"
};
/// <summary>
/// Determines whether a path should be resolved or ignored entirely - called before we even look at the contents
diff --git a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs index e29af64f8..825850b20 100644 --- a/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs +++ b/MediaBrowser.Controller/Resolvers/Movies/MovieResolver.cs @@ -79,6 +79,14 @@ namespace MediaBrowser.Controller.Resolvers.Movies VideoType = VideoType.BluRay
};
}
+ else if (args.IsHDDVDFolder)
+ {
+ return new Movie()
+ {
+ Path = args.Path,
+ VideoType = VideoType.HdDvd
+ };
+ }
// Loop through each child file/folder and see if we find a video
foreach (var child in args.FileSystemChildren)
diff --git a/MediaBrowser.Model/Entities/VideoType.cs b/MediaBrowser.Model/Entities/VideoType.cs index b30b14690..0d46ff770 100644 --- a/MediaBrowser.Model/Entities/VideoType.cs +++ b/MediaBrowser.Model/Entities/VideoType.cs @@ -6,6 +6,7 @@ namespace MediaBrowser.Model.Entities VideoFile,
Iso,
Dvd,
- BluRay
+ BluRay,
+ HdDvd
}
}
|
