removed excess hashing in providers and made user data key-based

3 files changed, 21 insertions, 47 deletions

diff --git a/MediaBrowser.Controller/Entities/TV/Episode.cs b/MediaBrowser.Controller/Entities/TV/Episode.cs
index 7588e4e692..dd1434cea6 100644
--- a/MediaBrowser.Controller/Entities/TV/Episode.cs
+++ b/MediaBrowser.Controller/Entities/TV/Episode.cs
@@ -49,27 +49,19 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         /// <summary>
-        /// Override to use the provider Ids + season and episode number so it will be portable
+        /// Gets the user data key.
         /// </summary>
-        /// <value>The user data id.</value>
-        [IgnoreDataMember]
-        public override Guid UserDataId
+        /// <returns>System.String.</returns>
+        public override string GetUserDataKey()
         {
-            get
+            if (Series != null)
             {
-                if (_userDataId == Guid.Empty)
-                {
-                    var baseId = Series != null ? Series.GetProviderId(MetadataProviders.Tvdb) ?? Series.GetProviderId(MetadataProviders.Tvcom) : null;
-                    if (baseId != null)
-                    {
-                        var seasonNo = Season != null ? Season.IndexNumber ?? 0 : 0;
-                        var epNo = IndexNumber ?? 0;
-                        baseId = baseId + seasonNo.ToString("000") + epNo.ToString("000");
-                    }
-                    _userDataId = baseId != null ? baseId.GetMD5() : Id;
-                }
-                return _userDataId;
+                var seasonNo = Season != null ? Season.IndexNumber ?? 0 : 0;
+                var epNo = IndexNumber ?? 0;
+                return Series.GetUserDataKey() + seasonNo.ToString("000") + epNo.ToString("000");
             }
+
+            return base.GetUserDataKey();
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Season.cs b/MediaBrowser.Controller/Entities/TV/Season.cs
index 2f2bee1721..2f3f7387ca 100644
--- a/MediaBrowser.Controller/Entities/TV/Season.cs
+++ b/MediaBrowser.Controller/Entities/TV/Season.cs
@@ -67,27 +67,18 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         /// <summary>
-        /// Override to use the provider Ids + season number so it will be portable
+        /// Gets the user data key.
         /// </summary>
-        /// <value>The user data id.</value>
-        [IgnoreDataMember]
-        public override Guid UserDataId
+        /// <returns>System.String.</returns>
+        public override string GetUserDataKey()
         {
-            get
+            if (Series != null)
             {
-                if (_userDataId == Guid.Empty)
-                {
-                    var baseId = Series != null ? Series.GetProviderId(MetadataProviders.Tvdb) ?? Series.GetProviderId(MetadataProviders.Tvcom) : null;
-                    if (baseId != null)
-                    {
-                        var seasonNo = IndexNumber ?? 0;
-                        baseId =  baseId + seasonNo.ToString("000");
-                    }
-        
-                    _userDataId = baseId != null ? baseId.GetMD5() : Id;
-                }
-                return _userDataId;
+                var seasonNo = IndexNumber ?? 0;
+                return Series.GetUserDataKey() + seasonNo.ToString("000");
             }
+
+            return base.GetUserDataKey();
         }
 
         /// <summary>
diff --git a/MediaBrowser.Controller/Entities/TV/Series.cs b/MediaBrowser.Controller/Entities/TV/Series.cs
index 8a56e45cdc..15b97f694b 100644
--- a/MediaBrowser.Controller/Entities/TV/Series.cs
+++ b/MediaBrowser.Controller/Entities/TV/Series.cs
@@ -44,21 +44,12 @@ namespace MediaBrowser.Controller.Entities.TV
         }
 
         /// <summary>
-        /// Override to use the provider Ids so it will be portable
+        /// Gets the user data key.
         /// </summary>
-        /// <value>The user data id.</value>
-        [IgnoreDataMember]
-        public override Guid UserDataId
+        /// <returns>System.String.</returns>
+        public override string GetUserDataKey()
         {
-            get
-            {
-                if (_userDataId == Guid.Empty)
-                {
-                    var baseId = this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Tvcom);
-                    _userDataId = baseId != null ? baseId.GetMD5() : Id;
-                }
-                return _userDataId;
-            }
+            return this.GetProviderId(MetadataProviders.Tvdb) ?? this.GetProviderId(MetadataProviders.Tvcom) ?? base.GetUserDataKey();
         }
 
         // Studio, Genre and Rating will all be the same so makes no sense to index by these