Merge with default

1 files changed, 14 insertions, 4 deletions

diff --git a/MediaBrowser.Controller/Entities/BaseItem.cs b/MediaBrowser.Controller/Entities/BaseItem.cs
index 68a192065..984584e9a 100644
--- a/MediaBrowser.Controller/Entities/BaseItem.cs
+++ b/MediaBrowser.Controller/Entities/BaseItem.cs
@@ -1,4 +1,6 @@
 using MediaBrowser.Model.Entities;

+using MediaBrowser.Controller.Library;

+using MediaBrowser.Controller.IO;

 using System;

 using System.Collections.Generic;

 using System.Linq;

@@ -14,10 +16,6 @@ namespace MediaBrowser.Controller.Entities
         /// </summary>

         public DateTime? PremiereDate { get; set; }

 

-        public string Path { get; set; }

-

-        public Folder Parent { get; set; }

-

         public string LogoImagePath { get; set; }

 

         public string ArtImagePath { get; set; }

@@ -135,6 +133,18 @@ namespace MediaBrowser.Controller.Entities
         }

 

         /// <summary>

+        /// Determine if we have changed vs the passed in copy

+        /// </summary>

+        /// <param name="original"></param>

+        /// <returns></returns>

+        public virtual bool IsChanged(BaseItem original)

+        {

+            bool changed = original.DateModified != this.DateModified;

+            changed |= original.DateCreated != this.DateCreated;

+            return changed;

+        }

+

+        /// <summary>

         /// Determines if the item is considered new based on user settings

         /// </summary>

         public bool IsRecentlyAdded(User user)