From ee1a746031f15bdfc5c5e38fab704f5fcb9b67ee Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Thu, 21 Nov 2013 11:02:49 -0500
Subject: use string.equals

---
 .../Library/Resolvers/Movies/MovieResolver.cs               | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/Resolvers')

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 0f87b9d337..07beabb832 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -345,18 +345,9 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         /// <returns><c>true</c> if [is DVD directory] [the specified directory name]; otherwise, <c>false</c>.</returns>
         private bool IsDvdDirectory(string directoryName)
         {
-            return directoryName.Equals("video_ts", StringComparison.OrdinalIgnoreCase);
+            return string.Equals(directoryName, "video_ts", StringComparison.OrdinalIgnoreCase);
         }
 
-        /// <summary>
-        /// Determines whether [is hd DVD directory] [the specified directory name].
-        /// </summary>
-        /// <param name="directoryName">Name of the directory.</param>
-        /// <returns><c>true</c> if [is hd DVD directory] [the specified directory name]; otherwise, <c>false</c>.</returns>
-        private bool IsHdDvdDirectory(string directoryName)
-        {
-            return directoryName.Equals("hvdvd_ts", StringComparison.OrdinalIgnoreCase);
-        }
         /// <summary>
         /// Determines whether [is blu ray directory] [the specified directory name].
         /// </summary>
@@ -364,7 +355,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         /// <returns><c>true</c> if [is blu ray directory] [the specified directory name]; otherwise, <c>false</c>.</returns>
         private bool IsBluRayDirectory(string directoryName)
         {
-            return directoryName.Equals("bdmv", StringComparison.OrdinalIgnoreCase);
+            return string.Equals(directoryName, "bdmv", StringComparison.OrdinalIgnoreCase);
         }
     }
 }
-- 
cgit v1.2.3


From e191836ea0405c5a152a742fc5526d8ceb5c5db5 Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Sun, 1 Dec 2013 13:58:06 -0500
Subject: fix tmdbid override for movies

---
 .../Library/Resolvers/Movies/MovieResolver.cs                           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'MediaBrowser.Server.Implementations/Library/Resolvers')

diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
index 07beabb832..03e29dd38f 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/Movies/MovieResolver.cs
@@ -172,7 +172,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.Movies
         private void SetProviderIdFromPath(Video item)
         {
             //we need to only look at the name of this actual item (not parents)
-            var justName = Path.GetFileName(item.Path);
+            var justName = item.IsInMixedFolder ? Path.GetFileName(item.Path) : Path.GetFileName(Path.GetDirectoryName(item.Path));
 
             var id = justName.GetAttributeValue("tmdbid");
 
-- 
cgit v1.2.3


From 6247929a62790ececc76864acc75f7ac47ee18aa Mon Sep 17 00:00:00 2001
From: Luke Pulverenti <luke.pulverenti@gmail.com>
Date: Tue, 3 Dec 2013 16:12:20 -0500
Subject: #643 - Support episodes directly in series folder

---
 MediaBrowser.Controller/Entities/TV/Episode.cs           | 16 +---------------
 MediaBrowser.Controller/Entities/TV/Series.cs            | 10 ++++++++++
 .../Library/Resolvers/TV/EpisodeResolver.cs              |  9 ++++++---
 3 files changed, 17 insertions(+), 18 deletions(-)

(limited to 'MediaBrowser.Server.Implementations/Library/Resolvers')

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 5eab1cae0c..40b999b02a 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -86,7 +86,7 @@ namespace MediaBrowser.Controller.Entities.TV
         {
             get
             {
-                return Season;
+                return FindParent<Season>();
             }
         }
 
@@ -178,20 +178,6 @@ namespace MediaBrowser.Controller.Entities.TV
             get { return _series ?? (_series = FindParent<Series>()); }
         }
 
-        /// <summary>
-        /// The _season
-        /// </summary>
-        private Season _season;
-        /// <summary>
-        /// This Episode's Season Instance
-        /// </summary>
-        /// <value>The season.</value>
-        [IgnoreDataMember]
-        public Season Season
-        {
-            get { return _season ?? (_season = FindParent<Season>()); }
-        }
-
         /// <summary>
         /// This is the ending episode number for double episodes.
         /// </summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index f3c7b088a7..b4a3fc811f 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -4,6 +4,7 @@ using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Linq;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities.TV
@@ -100,5 +101,14 @@ namespace MediaBrowser.Controller.Entities.TV
 
             return args;
         }
+
+        [IgnoreDataMember]
+        public bool ContainsEpisodesWithoutSeasonFolders
+        {
+            get
+            {
+                return Children.OfType<Video>().Any();
+            }
+        }
     }
 }
diff --git a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
index 0a6a72fc10..693594a20b 100644
--- a/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
+++ b/MediaBrowser.Server.Implementations/Library/Resolvers/TV/EpisodeResolver.cs
@@ -20,7 +20,7 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
             var season = args.Parent as Season;
 
             // If the parent is a Season or Series, then this is an Episode if the VideoResolver returns something
-            if (season != null)
+            if (season != null || args.Parent is Series)
             {
                 Episode episode = null;
 
@@ -51,8 +51,11 @@ namespace MediaBrowser.Server.Implementations.Library.Resolvers.TV
 
                 if (episode != null)
                 {
-                    episode.ParentIndexNumber = season.IndexNumber;
-                    
+                    if (season != null)
+                    {
+                        episode.ParentIndexNumber = season.IndexNumber;
+                    }
+
                     if (episode.ParentIndexNumber == null)
                     {
                         episode.ParentIndexNumber = TVUtils.GetSeasonNumberFromEpisodeFile(args.Path);
-- 
cgit v1.2.3