update tag saving

MediaBrowser.Api/FilterService.cs

@@ -80,7 +80,7 @@ namespace MediaBrowser.Api
                 .OrderBy(i => i)
                 .ToArray();
 
-            result.Tags = items.OfType<IHasTags>()
+            result.Tags = items
                 .SelectMany(i => i.Tags)
                 .Distinct(StringComparer.OrdinalIgnoreCase)
                 .OrderBy(i => i)

MediaBrowser.Api/ItemUpdateService.cs

@@ -280,11 +280,7 @@ namespace MediaBrowser.Api
                 episode.AbsoluteEpisodeNumber = request.AbsoluteEpisodeNumber;
             }
 
-            var hasTags = item as IHasTags;
+            item.Tags = request.Tags;
-            if (hasTags != null)
-            {
-                hasTags.Tags = request.Tags;
-            }
 
             var hasTaglines = item as IHasTaglines;
             if (hasTaglines != null)

MediaBrowser.Api/SimilarItemsHelper.cs

@@ -116,13 +116,7 @@ namespace MediaBrowser.Api
 
         private static IEnumerable<string> GetTags(BaseItem item)
         {
-            var hasTags = item as IHasTags;
+            return item.Tags;
-            if (hasTags != null)
-            {
-                return hasTags.Tags;
-            }
-
-            return new List<string>();
         }
 
         private static IEnumerable<string> GetKeywords(BaseItem item)

MediaBrowser.Api/UserLibrary/BaseItemsByNameService.cs

@@ -333,12 +333,7 @@ namespace MediaBrowser.Api.UserLibrary
                 var tags = request.GetTags();
                 if (tags.Length > 0)
                 {
-                    var hasTags = i as IHasTags;
+                    if (!tags.Any(v => i.Tags.Contains(v, StringComparer.OrdinalIgnoreCase)))
-                    if (hasTags == null)
-                    {
-                        return false;
-                    }
-                    if (!tags.Any(v => hasTags.Tags.Contains(v, StringComparer.OrdinalIgnoreCase)))
                     {
                         return false;
                     }

MediaBrowser.Controller/Entities/Audio/Audio.cs

@@ -20,7 +20,6 @@ namespace MediaBrowser.Controller.Entities.Audio
         IHasArtist,
         IHasMusicGenres,
         IHasLookupInfo<SongInfo>,
-        IHasTags,
         IHasMediaSources,
         IThemeMedia,
         IArchivable

MediaBrowser.Controller/Entities/BaseItem.cs

@@ -1397,15 +1397,10 @@ namespace MediaBrowser.Controller.Entities
 
         private bool IsVisibleViaTags(User user)
         {
-            var hasTags = this as IHasTags;
+            var policy = user.Policy;
-
+            if (policy.BlockedTags.Any(i => Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
-            if (hasTags != null)
             {
-                var policy = user.Policy;
+                return false;
-                if (policy.BlockedTags.Any(i => hasTags.Tags.Contains(i, StringComparer.OrdinalIgnoreCase)))
-                {
-                    return false;
-                }
             }
 
             return true;

MediaBrowser.Controller/Entities/Book.cs

@@ -6,7 +6,7 @@ using MediaBrowser.Model.Entities;
 
 namespace MediaBrowser.Controller.Entities
 {
-    public class Book : BaseItem, IHasTags, IHasLookupInfo<BookInfo>, IHasSeries
+    public class Book : BaseItem, IHasLookupInfo<BookInfo>, IHasSeries
     {
         [IgnoreDataMember]
         public override string MediaType

MediaBrowser.Controller/Entities/Folder.cs

@@ -20,7 +20,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Folder
     /// </summary>
-    public class Folder : BaseItem, IHasThemeMedia, IHasTags
+    public class Folder : BaseItem, IHasThemeMedia
     {
         public static IUserManager UserManager { get; set; }
         public static IUserViewManager UserViewManager { get; set; }

MediaBrowser.Controller/Entities/Game.cs

@@ -7,7 +7,7 @@ using System.Linq;
 
 namespace MediaBrowser.Controller.Entities
 {
-    public class Game : BaseItem, IHasTrailers, IHasThemeMedia, IHasTags, IHasScreenshots, ISupportsPlaceHolders, IHasLookupInfo<GameInfo>
+    public class Game : BaseItem, IHasTrailers, IHasThemeMedia, IHasScreenshots, ISupportsPlaceHolders, IHasLookupInfo<GameInfo>
     {
         public List<Guid> ThemeSongIds { get; set; }
         public List<Guid> ThemeVideoIds { get; set; }

MediaBrowser.Controller/Entities/Photo.cs

@@ -5,7 +5,7 @@ using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities
 {
-    public class Photo : BaseItem, IHasTags, IHasTaglines
+    public class Photo : BaseItem, IHasTaglines
     {
         public List<string> Taglines { get; set; }
 

MediaBrowser.Controller/Entities/Studio.cs

@@ -8,7 +8,7 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class Studio
     /// </summary>
-    public class Studio : BaseItem, IItemByName, IHasTags
+    public class Studio : BaseItem, IItemByName
     {
         public override List<string> GetUserDataKeys()
         {

MediaBrowser.Controller/Entities/TagExtensions.cs

@@ -1,24 +1,11 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 
 namespace MediaBrowser.Controller.Entities
 {
-    /// <summary>
-    /// Interface IHasTags
-    /// </summary>
-    public interface IHasTags
-    {
-        /// <summary>
-        /// Gets or sets the tags.
-        /// </summary>
-        /// <value>The tags.</value>
-        List<string> Tags { get; set; }
-    }
-
     public static class TagExtensions
     {
-        public static void AddTag(this IHasTags item, string name)
+        public static void AddTag(this BaseItem item, string name)
         {
             if (string.IsNullOrWhiteSpace(name))
             {

MediaBrowser.Controller/Entities/UserViewBuilder.cs

@@ -1646,12 +1646,7 @@ namespace MediaBrowser.Controller.Entities
             var tags = query.Tags;
             if (tags.Length > 0)
             {
-                var hasTags = item as IHasTags;
+                if (!tags.Any(v => item.Tags.Contains(v, StringComparer.OrdinalIgnoreCase)))
-                if (hasTags == null)
-                {
-                    return false;
-                }
-                if (!tags.Any(v => hasTags.Tags.Contains(v, StringComparer.OrdinalIgnoreCase)))
                 {
                     return false;
                 }

MediaBrowser.Controller/Entities/Video.cs

@@ -21,7 +21,6 @@ namespace MediaBrowser.Controller.Entities
     /// </summary>
     public class Video : BaseItem,
         IHasAspectRatio,
-        IHasTags,
         ISupportsPlaceHolders,
         IHasMediaSources,
         IHasShortOverview,

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -154,7 +154,6 @@
     <Compile Include="Entities\IHasSpecialFeatures.cs" />
     <Compile Include="Entities\IHasStartDate.cs" />
     <Compile Include="Entities\IHasTaglines.cs" />
-    <Compile Include="Entities\IHasTags.cs" />
     <Compile Include="Entities\IHasThemeMedia.cs" />
     <Compile Include="Entities\IHasTrailers.cs" />
     <Compile Include="Entities\IHasUserData.cs" />
@@ -177,6 +176,7 @@
     <Compile Include="Entities\PhotoAlbum.cs" />
     <Compile Include="Entities\Share.cs" />
     <Compile Include="Entities\SourceType.cs" />
+    <Compile Include="Entities\TagExtensions.cs" />
     <Compile Include="Entities\UserView.cs" />
     <Compile Include="Entities\UserViewBuilder.cs" />
     <Compile Include="FileOrganization\IFileOrganizationService.cs" />

MediaBrowser.Controller/Providers/BaseItemXmlParser.cs

@@ -803,11 +803,7 @@ namespace MediaBrowser.Controller.Providers
                     {
                         using (var subtree = reader.ReadSubtree())
                         {
-                            var hasTags = item as IHasTags;
+                            FetchFromTagsNode(subtree, item);
-                            if (hasTags != null)
-                            {
-                                FetchFromTagsNode(subtree, hasTags);
-                            }
                         }
                         break;
                     }
@@ -1066,7 +1062,7 @@ namespace MediaBrowser.Controller.Providers
             }
         }
 
-        private void FetchFromTagsNode(XmlReader reader, IHasTags item)
+        private void FetchFromTagsNode(XmlReader reader, BaseItem item)
         {
             reader.MoveToContent();
 

MediaBrowser.LocalMetadata/Savers/XmlSaverHelpers.cs

@@ -593,20 +593,16 @@ namespace MediaBrowser.LocalMetadata.Savers
                 builder.Append("</Studios>");
             }
 
-            var hasTags = item as IHasTags;
+            if (item.Tags.Count > 0)
-            if (hasTags != null)
             {
-                if (hasTags.Tags.Count > 0)
+                builder.Append("<Tags>");
+
+                foreach (var tag in item.Tags)
                 {
-                    builder.Append("<Tags>");
+                    builder.Append("<Tag>" + SecurityElement.Escape(tag) + "</Tag>");
-
-                    foreach (var tag in hasTags.Tags)
-                    {
-                        builder.Append("<Tag>" + SecurityElement.Escape(tag) + "</Tag>");
-                    }
-
-                    builder.Append("</Tags>");
                 }
+
+                builder.Append("</Tags>");
             }
 
             if (item.Keywords.Count > 0)

MediaBrowser.Providers/Manager/ProviderUtils.cs

@@ -151,15 +151,9 @@ namespace MediaBrowser.Providers.Manager
 
             if (!lockedFields.Contains(MetadataFields.Tags))
             {
-                var sourceHasTags = source as IHasTags;
+                if (replaceData || target.Tags.Count == 0)
-                var targetHasTags = target as IHasTags;
-
-                if (sourceHasTags != null && targetHasTags != null)
                 {
-                    if (replaceData || targetHasTags.Tags.Count == 0)
+                    target.Tags = source.Tags;
-                    {
-                        targetHasTags.Tags = sourceHasTags.Tags;
-                    }
                 }
             }
 

MediaBrowser.Server.Implementations/Dto/DtoService.cs

@@ -969,16 +969,7 @@ namespace MediaBrowser.Server.Implementations.Dto
 
             if (fields.Contains(ItemFields.Tags))
             {
-                var hasTags = item as IHasTags;
+                dto.Tags = item.Tags;
-                if (hasTags != null)
-                {
-                    dto.Tags = hasTags.Tags;
-                }
-
-                if (dto.Tags == null)
-                {
-                    dto.Tags = new List<string>();
-                }
             }
 
             if (fields.Contains(ItemFields.Keywords))

MediaBrowser.XbmcMetadata/Parsers/BaseNfoParser.cs

@@ -919,11 +919,7 @@ namespace MediaBrowser.XbmcMetadata.Parsers
                         var val = reader.ReadElementContentAsString();
                         if (!string.IsNullOrWhiteSpace(val))
                         {
-                            var hasTags = item as IHasTags;
+                            item.AddTag(val);
-                            if (hasTags != null)
-                            {
-                                hasTags.AddTag(val);
-                            }
                         }
                         break;
                     }

MediaBrowser.XbmcMetadata/Savers/BaseNfoSaver.cs

@@ -736,19 +736,15 @@ namespace MediaBrowser.XbmcMetadata.Savers
                 writer.WriteElementString("studio", studio);
             }
 
-            var hasTags = item as IHasTags;
+            foreach (var tag in item.Tags)
-            if (hasTags != null)
             {
-                foreach (var tag in hasTags.Tags)
+                if (item is MusicAlbum || item is MusicArtist)
                 {
-                    if (item is MusicAlbum || item is MusicArtist)
+                    writer.WriteElementString("style", tag);
-                    {
+                }
-                        writer.WriteElementString("style", tag);
+                else
-                    }
+                {
-                    else
+                    writer.WriteElementString("tag", tag);
-                    {
-                        writer.WriteElementString("tag", tag);
-                    }
                 }
             }