aboutsummaryrefslogtreecommitdiff
path: root/MediaBrowser.Server.Implementations/Library/Resolvers/TV
diff options
context:
space:
mode:
authorLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-02 22:13:03 -0500
committerLuke Pulverenti <luke.pulverenti@gmail.com>2014-12-02 22:13:03 -0500
commit56f6b0335ce40aeab275f1038b96a8ecc642f18f (patch)
tree92d8a4c47dec99f1be6e1aca0bb59bd64b48911b /MediaBrowser.Server.Implementations/Library/Resolvers/TV
parentc48458f215bd5ea1da3ef3636f801a4652e77aa0 (diff)
updated nuget
Diffstat (limited to 'MediaBrowser.Server.Implementations/Library/Resolvers/TV')
-rw-r--r--MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs34
1 files changed, 5 insertions, 29 deletions
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index 839b14a9e1..112490ccd3 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Controller.Entities.TV;
+using System;
+using MediaBrowser.Controller.Entities.TV;
using MediaBrowser.Controller.Library;
using MediaBrowser.Controller.Resolvers;
using MediaBrowser.Model.Entities;
@@ -41,39 +42,14 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
// If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
if (season != null || parent is Series || parent.Parents.OfType<Series>().Any())
{
- Episode episode = null;
-
- if (args.IsDirectory)
+ if (args.IsDirectory && args.Path.IndexOf("dead like me", StringComparison.OrdinalIgnoreCase) != -1)
{
- if (args.ContainsFileSystemEntryByName("video_ts"))
- {
- episode = new Episode
- {
- Path = args.Path,
- VideoType = VideoType.Dvd
- };
- }
- if (args.ContainsFileSystemEntryByName("bdmv"))
- {
- episode = new Episode
- {
- Path = args.Path,
- VideoType = VideoType.BluRay
- };
- }
- }
-
- if (episode == null)
- {
- episode = base.Resolve(args);
+ var b = true;
}
+ var episode = ResolveVideo<Episode>(args, false);
if (episode != null)
{
- // The base video resolver is going to fill these in, so null them out
- episode.ProductionYear = null;
- episode.Name = null;
-
if (season != null)
{
episode.ParentIndexNumber = season.IndexNumber;